[xiph-commits] r11919 - in trunk/oggdsf/src/lib/codecs:
cmml/dsfCMMLDecoder cmml/dsfCMMLRawSource
flac/filters/dsfFLACEncoder flac/libs/libFLACHelper
illiminable at svn.xiph.org
illiminable at svn.xiph.org
Sun Oct 15 02:56:46 PDT 2006
Author: illiminable
Date: 2006-10-15 02:56:25 -0700 (Sun, 15 Oct 2006)
New Revision: 11919
Added:
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/IFLACEncodeSettings.h
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/PropsFLACEncoder.cpp
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/PropsFLACEncoder.h
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.aps
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.rc
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/resource.h
Modified:
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.vcproj
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeFilter.cpp
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeFilter.h
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.cpp
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.h
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.vcproj
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/flacencoderdllstuff.h
trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/stdafx.h
trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACEncoderSettings.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACEncoderSettings.h
Log:
* Expose flac encoder settings in a property page and COM interface
* COM interface exposes, LPCOrder, BlockSizes, midside coding, exhausteive search model, rice partition order.
* Property page currently only allows setting via the 0-8 encoder levels that flac.exe has
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.vcproj 2006-10-14 01:40:26 UTC (rev 11918)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.vcproj 2006-10-15 09:56:25 UTC (rev 11919)
@@ -189,12 +189,13 @@
/>
</Configuration>
<Configuration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
- IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -210,18 +211,24 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="0"
+ Optimization="2"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
+ OmitFramePointers="true"
AdditionalIncludeDirectories="..\..\..\core\directshow\BaseClasses;..;..\..\..\helper;..\..\..\core\directshow\dsfOggDemux2;..\..\..\core\ogg\"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFCMMLDECODER_EXPORTS"
- MinimalRebuild="true"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFCMMLDECODER_EXPORTS"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CallingConvention="2"
DisableSpecificWarnings="4251"
/>
<Tool
@@ -235,45 +242,48 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
+ AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib unicows.lib"
OutputFile="$(OutDir)/dsfCMMLDecoder.dll"
- LinkIncremental="2"
+ LinkIncremental="1"
AdditionalLibraryDirectories=""
ModuleDefinitionFile="CMMLDecoder.def"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/dsfCMMLDecoder.pdb"
SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ OptimizeForWindows98="1"
ImportLibrary="$(OutDir)/dsfCMMLDecoder.lib"
- TargetMachine="0"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
+ Name="VCManifestTool"
+ />
+ <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
- Name="VCCodeSignTool"
+ Name="VCFxCopTool"
/>
<Tool
- Name="VCPostBuildEventTool"
+ Name="VCAppVerifierTool"
/>
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
+ <Tool
+ Name="VCWebDeploymentTool"
/>
- <DebuggerTool
+ <Tool
+ Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ Name="Release|Pocket PC 2003 (ARMV4)"
+ OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+ IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
@@ -293,14 +303,15 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
+ ExecutionBucket="7"
Optimization="2"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
- OmitFramePointers="true"
AdditionalIncludeDirectories="..\..\..\core\directshow\BaseClasses;..;..\..\..\helper;..\..\..\core\directshow\dsfOggDemux2;..\..\..\core\ogg\"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFCMMLDECODER_EXPORTS"
StringPooling="true"
@@ -308,9 +319,7 @@
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
WarningLevel="4"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
- CallingConvention="2"
DisableSpecificWarnings="4251"
/>
<Tool
@@ -324,7 +333,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib unicows.lib"
+ AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
OutputFile="$(OutDir)/dsfCMMLDecoder.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""
@@ -335,41 +344,39 @@
EnableCOMDATFolding="2"
OptimizeForWindows98="1"
ImportLibrary="$(OutDir)/dsfCMMLDecoder.lib"
- TargetMachine="1"
+ TargetMachine="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
- Name="VCFxCopTool"
+ Name="VCCodeSignTool"
/>
<Tool
- Name="VCAppVerifierTool"
+ Name="VCPostBuildEventTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
/>
- <Tool
- Name="VCPostBuildEventTool"
+ <DebuggerTool
/>
</Configuration>
<Configuration
- Name="Release|Pocket PC 2003 (ARMV4)"
- OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
- IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+ Name="Debug_CE_ARM|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
- WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -385,23 +392,20 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="2"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
+ Optimization="0"
AdditionalIncludeDirectories="..\..\..\core\directshow\BaseClasses;..;..\..\..\helper;..\..\..\core\directshow\dsfOggDemux2;..\..\..\core\ogg\"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFCMMLDECODER_EXPORTS"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFCMMLDECODER_EXPORTS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="4"
- DebugInformationFormat="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ CallingConvention="2"
DisableSpecificWarnings="4251"
/>
<Tool
@@ -417,49 +421,47 @@
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
OutputFile="$(OutDir)/dsfCMMLDecoder.dll"
- LinkIncremental="1"
+ LinkIncremental="2"
AdditionalLibraryDirectories=""
ModuleDefinitionFile="CMMLDecoder.def"
GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/dsfCMMLDecoder.pdb"
SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
ImportLibrary="$(OutDir)/dsfCMMLDecoder.lib"
- TargetMachine="0"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
+ Name="VCManifestTool"
+ />
+ <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
- Name="VCCodeSignTool"
+ Name="VCFxCopTool"
/>
<Tool
- Name="VCPostBuildEventTool"
+ Name="VCAppVerifierTool"
/>
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
+ <Tool
+ Name="VCWebDeploymentTool"
/>
- <DebuggerTool
+ <Tool
+ Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
- IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ Name="Debug_CE_ARM|Pocket PC 2003 (ARMV4)"
+ OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+ IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
- WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -480,18 +482,13 @@
<Tool
Name="VCCLCompilerTool"
ExecutionBucket="7"
- Optimization="2"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
+ Optimization="0"
AdditionalIncludeDirectories="..\..\..\core\directshow\BaseClasses;..;..\..\..\helper;..\..\..\core\directshow\dsfOggDemux2;..\..\..\core\ogg\"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFCMMLDECODER_EXPORTS"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFCMMLDECODER_EXPORTS"
+ MinimalRebuild="true"
+ RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="4"
- DebugInformationFormat="3"
DisableSpecificWarnings="4251"
/>
<Tool
@@ -507,14 +504,12 @@
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
OutputFile="$(OutDir)/dsfCMMLDecoder.dll"
- LinkIncremental="1"
+ LinkIncremental="2"
AdditionalLibraryDirectories=""
ModuleDefinitionFile="CMMLDecoder.def"
GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/dsfCMMLDecoder.pdb"
SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
ImportLibrary="$(OutDir)/dsfCMMLDecoder.lib"
TargetMachine="0"
/>
@@ -543,7 +538,7 @@
/>
</Configuration>
<Configuration
- Name="Debug_CE_ARM|Win32"
+ Name="Debug_WM5_PPC_ARM|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
@@ -628,7 +623,7 @@
/>
</Configuration>
<Configuration
- Name="Debug_CE_ARM|Pocket PC 2003 (ARMV4)"
+ Name="Debug_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
ConfigurationType="2"
@@ -710,9 +705,9 @@
/>
</Configuration>
<Configuration
- Name="Debug_CE_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
- IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ Name="Release_WM5_PPC_ARM|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
@@ -731,18 +726,20 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
- ExecutionBucket="7"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\core\directshow\BaseClasses;..;..\..\..\helper;..\..\..\core\directshow\dsfOggDemux2;..\..\..\core\ogg\"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFCMMLDECODER_EXPORTS"
MinimalRebuild="true"
+ BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ CallingConvention="2"
DisableSpecificWarnings="4251"
/>
<Tool
@@ -765,36 +762,37 @@
ProgramDatabaseFile="$(OutDir)/dsfCMMLDecoder.pdb"
SubSystem="2"
ImportLibrary="$(OutDir)/dsfCMMLDecoder.lib"
- TargetMachine="0"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
+ Name="VCManifestTool"
+ />
+ <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
- Name="VCCodeSignTool"
+ Name="VCFxCopTool"
/>
<Tool
- Name="VCPostBuildEventTool"
+ Name="VCAppVerifierTool"
/>
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
+ <Tool
+ Name="VCWebDeploymentTool"
/>
- <DebuggerTool
+ <Tool
+ Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Debug_WM5_PPC_ARM|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="Release_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
+ OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+ IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
@@ -813,20 +811,18 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
+ ExecutionBucket="7"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\core\directshow\BaseClasses;..;..\..\..\helper;..\..\..\core\directshow\dsfOggDemux2;..\..\..\core\ogg\"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFCMMLDECODER_EXPORTS"
MinimalRebuild="true"
- BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="4"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- CallingConvention="2"
DisableSpecificWarnings="4251"
/>
<Tool
@@ -849,37 +845,36 @@
ProgramDatabaseFile="$(OutDir)/dsfCMMLDecoder.pdb"
SubSystem="2"
ImportLibrary="$(OutDir)/dsfCMMLDecoder.lib"
- TargetMachine="1"
+ TargetMachine="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
- Name="VCFxCopTool"
+ Name="VCCodeSignTool"
/>
<Tool
- Name="VCAppVerifierTool"
+ Name="VCPostBuildEventTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
/>
- <Tool
- Name="VCPostBuildEventTool"
+ <DebuggerTool
/>
</Configuration>
<Configuration
- Name="Debug_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
- OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
- IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
@@ -959,12 +954,13 @@
/>
</Configuration>
<Configuration
- Name="Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -985,14 +981,18 @@
<Tool
Name="VCCLCompilerTool"
ExecutionBucket="7"
- Optimization="0"
- AdditionalIncludeDirectories="..;..\..\..\helper;..\..\..\core\directshow\dsfOggDemux2;..\..\..\core\ogg\"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFCMMLDECODER_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
- MinimalRebuild="true"
- RuntimeLibrary="3"
- TreatWChar_tAsBuiltInType="false"
+ Optimization="2"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
+ AdditionalIncludeDirectories="..\..\..\core\directshow\BaseClasses;..;..\..\..\helper;..\..\..\core\directshow\dsfOggDemux2;..\..\..\core\ogg\"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFCMMLDECODER_EXPORTS"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
WarningLevel="4"
+ DebugInformationFormat="3"
DisableSpecificWarnings="4251"
/>
<Tool
@@ -1006,14 +1006,16 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="strmbase.lib strmiids.lib"
+ AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
OutputFile="$(OutDir)/dsfCMMLDecoder.dll"
- LinkIncremental="2"
+ LinkIncremental="1"
AdditionalLibraryDirectories=""
ModuleDefinitionFile="CMMLDecoder.def"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/dsfCMMLDecoder.pdb"
- SubSystem="9"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ OptimizeForWindows98="1"
ImportLibrary="$(OutDir)/dsfCMMLDecoder.lib"
TargetMachine="0"
/>
@@ -1042,9 +1044,9 @@
/>
</Configuration>
<Configuration
- Name="Release_WM5_PPC_ARM|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="Debug_CE_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
@@ -1063,20 +1065,18 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
+ ExecutionBucket="7"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\core\directshow\BaseClasses;..;..\..\..\helper;..\..\..\core\directshow\dsfOggDemux2;..\..\..\core\ogg\"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFCMMLDECODER_EXPORTS"
MinimalRebuild="true"
- BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="4"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- CallingConvention="2"
DisableSpecificWarnings="4251"
/>
<Tool
@@ -1099,37 +1099,36 @@
ProgramDatabaseFile="$(OutDir)/dsfCMMLDecoder.pdb"
SubSystem="2"
ImportLibrary="$(OutDir)/dsfCMMLDecoder.lib"
- TargetMachine="1"
+ TargetMachine="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
- Name="VCFxCopTool"
+ Name="VCCodeSignTool"
/>
<Tool
- Name="VCAppVerifierTool"
+ Name="VCPostBuildEventTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
/>
- <Tool
- Name="VCPostBuildEventTool"
+ <DebuggerTool
/>
</Configuration>
<Configuration
- Name="Release_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
- OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
- IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+ Name="Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
@@ -1154,10 +1153,11 @@
Name="VCCLCompilerTool"
ExecutionBucket="7"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\core\directshow\BaseClasses;..;..\..\..\helper;..\..\..\core\directshow\dsfOggDemux2;..\..\..\core\ogg\"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFCMMLDECODER_EXPORTS"
+ AdditionalIncludeDirectories="..;..\..\..\helper;..\..\..\core\directshow\dsfOggDemux2;..\..\..\core\ogg\"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFCMMLDECODER_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
MinimalRebuild="true"
RuntimeLibrary="3"
+ TreatWChar_tAsBuiltInType="false"
UsePrecompiledHeader="2"
WarningLevel="4"
DisableSpecificWarnings="4251"
@@ -1173,14 +1173,14 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
+ AdditionalDependencies="strmbase.lib strmiids.lib"
OutputFile="$(OutDir)/dsfCMMLDecoder.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""
ModuleDefinitionFile="CMMLDecoder.def"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/dsfCMMLDecoder.pdb"
- SubSystem="2"
+ SubSystem="9"
ImportLibrary="$(OutDir)/dsfCMMLDecoder.lib"
TargetMachine="0"
/>
@@ -1335,7 +1335,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1343,7 +1343,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1351,7 +1351,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Pocket PC 2003 (ARMV4)"
+ Name="Debug_CE_ARM|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1359,7 +1359,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Debug_CE_ARM|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1367,7 +1367,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_CE_ARM|Win32"
+ Name="Debug_WM5_PPC_ARM|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1375,7 +1375,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_CE_ARM|Pocket PC 2003 (ARMV4)"
+ Name="Debug_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1383,7 +1383,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_CE_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Release_WM5_PPC_ARM|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1391,7 +1391,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_WM5_PPC_ARM|Win32"
+ Name="Release_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1399,7 +1399,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1407,7 +1407,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1415,7 +1415,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release_WM5_PPC_ARM|Win32"
+ Name="Debug_CE_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1423,7 +1423,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
+ Name="Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp 2006-10-14 01:40:26 UTC (rev 11918)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp 2006-10-15 09:56:25 UTC (rev 11919)
@@ -59,7 +59,7 @@
CAutoLock locLock(m_pLock);
mFilterHR = S_OK;
//Set the delegate for seeking
- //((BasicSeekable*)(inReceivePin))->SetDelegate(this);
+
//This may cause issue if pins are disconnected and reconnected
//DELETE in DEStructor
mDataQueue = new COutputQueue (inReceivePin, &mFilterHR, FALSE, TRUE,1,TRUE, NUM_BUFFERS);
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeFilter.cpp 2006-10-14 01:40:26 UTC (rev 11918)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeFilter.cpp 2006-10-15 09:56:25 UTC (rev 11919)
@@ -41,6 +41,13 @@
FLACEncodeFilter::CreateInstance, // Method to create an instance of MyComponent
NULL, // Initialization function
NULL // Set-up information (for filters)
+ },
+ {
+ L"FLAC Encode Properties", // Name
+ &CLSID_PropsFLACEncoder, // CLSID
+ PropsFLACEncoder::CreateInstance, // Method to create an instance of MyComponent
+ NULL, // Initialization function
+ NULL // Set-up information (for filters)
}
};
@@ -58,6 +65,39 @@
return pNewObject;
}
+STDMETHODIMP FLACEncodeFilter::NonDelegatingQueryInterface(REFIID riid, void **ppv)
+{
+ if (riid == IID_IFLACEncodeSettings) {
+ *ppv = (IFLACEncodeSettings*)this;
+ ((IUnknown*)*ppv)->AddRef();
+ return NOERROR;
+ } else if (riid == IID_ISpecifyPropertyPages) {
+ *ppv = (ISpecifyPropertyPages*)this;
+ ((IUnknown*)*ppv)->AddRef();
+ return NOERROR;
+ }
+ return AbstractTransformFilter::NonDelegatingQueryInterface(riid, ppv);
+}
+
+//SpecifyPropertyPages Implementation
+STDMETHODIMP FLACEncodeFilter::GetPages(CAUUID* outPropPages)
+{
+ if (outPropPages == NULL) return E_POINTER;
+
+ const int NUM_PROP_PAGES = 1;
+ outPropPages->cElems = NUM_PROP_PAGES;
+ outPropPages->pElems = (GUID*)(CoTaskMemAlloc(sizeof(GUID) * NUM_PROP_PAGES));
+ if (outPropPages->pElems == NULL)
+ {
+ return E_OUTOFMEMORY;
+ }
+
+ outPropPages->pElems[0] = CLSID_PropsFLACEncoder;
+
+ return S_OK;
+
+}
+
FLACEncodeFilter::FLACEncodeFilter(void)
: AbstractTransformFilter(NAME("FLAC Encoder"), CLSID_FLACEncodeFilter)
{
@@ -102,4 +142,72 @@
mInputPin = new FLACEncodeInputPin(this, m_pLock, mOutputPin, locAcceptableTypes); //Deleted in base class filter destructor.
return true;
+}
+
+STDMETHODIMP_(bool) FLACEncodeFilter::canModifySettings()
+{
+ return true;
+
+}
+
+STDMETHODIMP_(bool) FLACEncodeFilter::setEncodingLevel(unsigned long inLevel)
+{
+ return ((FLACEncodeInputPin*)mInputPin)->mFLACEncoderSettings.setEncodingLevel(inLevel);
+}
+STDMETHODIMP_(bool) FLACEncodeFilter::setLPCOrder(unsigned long inLPCOrder)
+{
+ return ((FLACEncodeInputPin*)mInputPin)->mFLACEncoderSettings.setLPCOrder(inLPCOrder);
+}
+STDMETHODIMP_(bool) FLACEncodeFilter::setBlockSize(unsigned long inBlockSize)
+{
+ return ((FLACEncodeInputPin*)mInputPin)->mFLACEncoderSettings.setBlockSize(inBlockSize);
+}
+STDMETHODIMP_(bool) FLACEncodeFilter::useMidSideCoding(bool inUseMidSideCoding) //Only for 2 channels
+{
+ return ((FLACEncodeInputPin*)mInputPin)->mFLACEncoderSettings.useMidSideCoding(inUseMidSideCoding);
+}
+STDMETHODIMP_(bool) FLACEncodeFilter::useAdaptiveMidSideCoding(bool inUseAdaptiveMidSideCoding) //Only for 2 channels, overrides midside, is faster
+{
+ return ((FLACEncodeInputPin*)mInputPin)->mFLACEncoderSettings.useAdaptiveMidSideCoding(inUseAdaptiveMidSideCoding);
+}
+STDMETHODIMP_(bool) FLACEncodeFilter::useExhaustiveModelSearch(bool inUseExhaustiveModelSearch)
+{
+ return ((FLACEncodeInputPin*)mInputPin)->mFLACEncoderSettings.useExhaustiveModelSearch(inUseExhaustiveModelSearch);
+}
+STDMETHODIMP_(bool) FLACEncodeFilter::setRicePartitionOrder(unsigned long inMin, unsigned long inMax)
+{
+ return ((FLACEncodeInputPin*)mInputPin)->mFLACEncoderSettings.setRicePartitionOrder(inMin, inMax);
+}
+
+STDMETHODIMP_(long) FLACEncodeFilter::encoderLevel()
+{
+ return ((FLACEncodeInputPin*)mInputPin)->mFLACEncoderSettings.encoderLevel();
+}
+STDMETHODIMP_(unsigned long) FLACEncodeFilter::LPCOrder()
+{
+ return ((FLACEncodeInputPin*)mInputPin)->mFLACEncoderSettings.LPCOrder();
+}
+STDMETHODIMP_(unsigned long) FLACEncodeFilter::blockSize()
+{
+ return ((FLACEncodeInputPin*)mInputPin)->mFLACEncoderSettings.blockSize();
+}
+STDMETHODIMP_(unsigned long) FLACEncodeFilter::riceMin()
+{
+ return ((FLACEncodeInputPin*)mInputPin)->mFLACEncoderSettings.riceMin();
+}
+STDMETHODIMP_(unsigned long) FLACEncodeFilter::riceMax()
+{
+ return ((FLACEncodeInputPin*)mInputPin)->mFLACEncoderSettings.riceMax();
+}
+STDMETHODIMP_(bool) FLACEncodeFilter::isUsingMidSideCoding()
+{
+ return ((FLACEncodeInputPin*)mInputPin)->mFLACEncoderSettings.isUsingMidSideCoding();
+}
+STDMETHODIMP_(bool) FLACEncodeFilter::isUsingAdaptiveMidSideCoding()
+{
+ return ((FLACEncodeInputPin*)mInputPin)->mFLACEncoderSettings.isUsingAdaptiveMidSideCoding();
+}
+STDMETHODIMP_(bool) FLACEncodeFilter::isUsingExhaustiveModel()
+{
+ return ((FLACEncodeInputPin*)mInputPin)->mFLACEncoderSettings.isUsingExhaustiveModel();
}
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeFilter.h 2006-10-14 01:40:26 UTC (rev 11918)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeFilter.h 2006-10-15 09:56:25 UTC (rev 11919)
@@ -33,6 +33,8 @@
//Local Includes
#include "flacencoderdllstuff.h"
+#include "IFLACEncodeSettings.h"
+#include "PropsFLACEncoder.h"
//External Includes
#include "AbstractTransformFilter.h"
@@ -45,6 +47,8 @@
class FLACEncodeFilter
//Base Classes
: public AbstractTransformFilter
+ , public IFLACEncodeSettings
+ , public ISpecifyPropertyPages
{
public:
//Friend Classes
@@ -58,6 +62,34 @@
//COM Creator function
static CUnknown* WINAPI FLACEncodeFilter::CreateInstance(LPUNKNOWN pUnk, HRESULT *pHr);
+ //COM Initialisation
+ DECLARE_IUNKNOWN
+ STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void **ppv);
+
+ /// ISpecifyPropertyPages::GetPages Implementation
+ STDMETHODIMP GetPages(CAUUID* outPropPages);
+
+
+ //IFLACEncodeSettings Implementation
+
+ virtual STDMETHODIMP_(bool) canModifySettings();
+
+ virtual STDMETHODIMP_(bool) setEncodingLevel(unsigned long inLevel);
+ virtual STDMETHODIMP_(bool) setLPCOrder(unsigned long inLPCOrder);
+ virtual STDMETHODIMP_(bool) setBlockSize(unsigned long inBlockSize);
+ virtual STDMETHODIMP_(bool) useMidSideCoding(bool inUseMidSideCoding); //Only for 2 channels
+ virtual STDMETHODIMP_(bool) useAdaptiveMidSideCoding(bool inUseAdaptiveMidSideCoding); //Only for 2 channels, overrides midside, is faster
+ virtual STDMETHODIMP_(bool) useExhaustiveModelSearch(bool inUseExhaustiveModelSearch);
+ virtual STDMETHODIMP_(bool) setRicePartitionOrder(unsigned long inMin, unsigned long inMax);
+
+ virtual STDMETHODIMP_(long) encoderLevel();
+ virtual STDMETHODIMP_(unsigned long) LPCOrder();
+ virtual STDMETHODIMP_(unsigned long) blockSize();
+ virtual STDMETHODIMP_(unsigned long) riceMin();
+ virtual STDMETHODIMP_(unsigned long) riceMax();
+ virtual STDMETHODIMP_(bool) isUsingMidSideCoding();
+ virtual STDMETHODIMP_(bool) isUsingAdaptiveMidSideCoding();
+ virtual STDMETHODIMP_(bool) isUsingExhaustiveModel();
protected:
//Implementation from AbstractTransformFilter
virtual bool ConstructPins();
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.cpp 2006-10-14 01:40:26 UTC (rev 11918)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.cpp 2006-10-15 09:56:25 UTC (rev 11919)
@@ -61,12 +61,12 @@
HRESULT locHR = S_OK;
if (mBegun == false) {
- FLACEncoderSettings locSettings;
- locSettings.setAudioParameters( ((FLACEncodeFilter*)mParentFilter)->mFLACFormatBlock.numChannels
- , ((FLACEncodeFilter*)mParentFilter)->mFLACFormatBlock.sampleRate
- , ((FLACEncodeFilter*)mParentFilter)->mFLACFormatBlock.numBitsPerSample);
- locSettings.setEncodingLevel(5);
- const vector<StampedOggPacket*>& locHeaderPackets = mFLACEncoder.setupCodec(locSettings);
+ //FLACEncoderSettings locSettings;
+ //locSettings.setAudioParameters( ((FLACEncodeFilter*)mParentFilter)->mFLACFormatBlock.numChannels
+ // , ((FLACEncodeFilter*)mParentFilter)->mFLACFormatBlock.sampleRate
+ // , ((FLACEncodeFilter*)mParentFilter)->mFLACFormatBlock.numBitsPerSample);
+ //locSettings.setEncodingLevel(5);
+ const vector<StampedOggPacket*>& locHeaderPackets = mFLACEncoder.setupCodec(mFLACEncoderSettings);
if (locHeaderPackets.size() == 0) {
return E_FAIL;
}
@@ -156,4 +156,23 @@
ConstructCodec();
return CBaseInputPin::SetMediaType(inMediaType);
+}
+
+HRESULT FLACEncodeInputPin::CompleteConnect (IPin *inReceivePin)
+{
+ //This data is captured in setmedia type. We set it on the settings class
+ // here so that when we are setting options which depend on knowing audio
+ // parameters, ie some settings require stereo. This gets it ready
+ // before the user can touch it from a properties page
+
+ //Defaults
+ FLACEncoderSettings locSettings;
+ mFLACEncoderSettings = locSettings;
+
+ mFLACEncoderSettings.setAudioParameters( ((FLACEncodeFilter*)mParentFilter)->mFLACFormatBlock.numChannels
+ , ((FLACEncodeFilter*)mParentFilter)->mFLACFormatBlock.sampleRate
+ , ((FLACEncodeFilter*)mParentFilter)->mFLACFormatBlock.numBitsPerSample);
+
+ return AbstractTransformInputPin::CompleteConnect(inReceivePin);
+
}
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.h 2006-10-14 01:40:26 UTC (rev 11918)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/FLACEncodeInputPin.h 2006-10-15 09:56:25 UTC (rev 11919)
@@ -41,9 +41,9 @@
class FLACEncodeInputPin
: public AbstractTransformInputPin
- //, public Stream
{
public:
+ friend class FLACEncodeFilter;
FLACEncodeInputPin( AbstractTransformFilter* inParentFilter
, CCritSec* inFilterLock
, AbstractTransformOutputPin* inOutputPin
@@ -51,6 +51,7 @@
virtual ~FLACEncodeInputPin(void);
virtual HRESULT SetMediaType(const CMediaType* inMediaType);
+ virtual HRESULT CompleteConnect (IPin *inReceivePin);
//OVerrides
virtual STDMETHODIMP EndOfStream(void);
@@ -66,5 +67,7 @@
WAVEFORMATEX* mWaveFormat;
FLACEncoder mFLACEncoder;
+
+ FLACEncoderSettings mFLACEncoderSettings;
bool mBegun;
};
Added: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/IFLACEncodeSettings.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/IFLACEncodeSettings.h 2006-10-14 01:40:26 UTC (rev 11918)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/IFLACEncodeSettings.h 2006-10-15 09:56:25 UTC (rev 11919)
@@ -0,0 +1,45 @@
+#pragma once
+
+
+#ifndef __IFLACENCODESETTINGS__
+#define __IFLACENCODESETTINGS__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+DECLARE_INTERFACE_(IFLACEncodeSettings, IUnknown) {
+
+ virtual STDMETHODIMP_(bool) canModifySettings() PURE;
+
+ virtual STDMETHODIMP_(bool) setEncodingLevel(unsigned long inLevel) PURE;
+ virtual STDMETHODIMP_(bool) setLPCOrder(unsigned long inLPCOrder) PURE;
+ virtual STDMETHODIMP_(bool) setBlockSize(unsigned long inBlockSize) PURE;
+ virtual STDMETHODIMP_(bool) useMidSideCoding(bool inUseMidSideCoding) PURE; //Only for 2 channels
+ virtual STDMETHODIMP_(bool) useAdaptiveMidSideCoding(bool inUseAdaptiveMidSideCoding) PURE; //Only for 2 channels, overrides midside, is faster
+ virtual STDMETHODIMP_(bool) useExhaustiveModelSearch(bool inUseExhaustiveModelSearch) PURE;
+ virtual STDMETHODIMP_(bool) setRicePartitionOrder(unsigned long inMin, unsigned long inMax) PURE;
+
+ //const vector<unsigned long>& getValidBlockSizes();
+
+ //virtual STDMETHODIMP_(unsigned long) numChannels() PURE;
+ //virtual STDMETHODIMP_(unsigned long) sampleRate() PURE;
+ //virtual STDMETHODIMP_(unsigned long) bitsPerSample() PURE;
+
+ virtual STDMETHODIMP_(long) encoderLevel() PURE;
+ virtual STDMETHODIMP_(unsigned long) LPCOrder() PURE;
+ virtual STDMETHODIMP_(unsigned long) blockSize() PURE;
+ virtual STDMETHODIMP_(unsigned long) riceMin() PURE;
+ virtual STDMETHODIMP_(unsigned long) riceMax() PURE;
+ virtual STDMETHODIMP_(bool) isUsingMidSideCoding() PURE;
+ virtual STDMETHODIMP_(bool) isUsingAdaptiveMidSideCoding() PURE;
+ virtual STDMETHODIMP_(bool) isUsingExhaustiveModel() PURE;
+
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
\ No newline at end of file
Added: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/PropsFLACEncoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/PropsFLACEncoder.cpp 2006-10-14 01:40:26 UTC (rev 11918)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/PropsFLACEncoder.cpp 2006-10-15 09:56:25 UTC (rev 11919)
@@ -0,0 +1,264 @@
+#include "StdAfx.h"
+#include "PropsFLACEncoder.h"
+
+PropsFLACEncoder::PropsFLACEncoder( LPUNKNOWN inUnk
+ , HRESULT* outHR)
+ : CBasePropertyPage( NAME("illiminable FLAC Encoder")
+ , inUnk
+ , IDD_FLAC_ENCODE_SETTINGS
+ , IDS_FLAC_ENC_PROPS_STRING)
+ , mFLACEncodeSettings(NULL)
+{
+}
+
+PropsFLACEncoder::~PropsFLACEncoder(void)
+{
+}
+
+CUnknown* WINAPI PropsFLACEncoder::CreateInstance(LPUNKNOWN inUnk, HRESULT* outHR)
+{
+ return new PropsFLACEncoder(inUnk, outHR);
+}
+
+HRESULT PropsFLACEncoder::OnActivate(void)
+{
+ wstring locListString = L"0 - Fastest";
+ SendDlgItemMessage(m_Dlg, IDC_COMBO_ENCODER_LEVEL, CB_ADDSTRING, 0, (LPARAM)locListString.c_str());
+
+ locListString = L"1";
+ SendDlgItemMessage(m_Dlg, IDC_COMBO_ENCODER_LEVEL, CB_ADDSTRING, 0, (LPARAM)locListString.c_str());
+
+ locListString = L"2";
+ SendDlgItemMessage(m_Dlg, IDC_COMBO_ENCODER_LEVEL, CB_ADDSTRING, 0, (LPARAM)locListString.c_str());
+
+ locListString = L"3";
+ SendDlgItemMessage(m_Dlg, IDC_COMBO_ENCODER_LEVEL, CB_ADDSTRING, 0, (LPARAM)locListString.c_str());
+
+
+ locListString = L"4";
+ SendDlgItemMessage(m_Dlg, IDC_COMBO_ENCODER_LEVEL, CB_ADDSTRING, 0, (LPARAM)locListString.c_str());
+
+
+ locListString = L"5 - Default";
+ SendDlgItemMessage(m_Dlg, IDC_COMBO_ENCODER_LEVEL, CB_ADDSTRING, 0, (LPARAM)locListString.c_str());
+
+ locListString = L"6";
+ SendDlgItemMessage(m_Dlg, IDC_COMBO_ENCODER_LEVEL, CB_ADDSTRING, 0, (LPARAM)locListString.c_str());
+
+ locListString = L"7";
+ SendDlgItemMessage(m_Dlg, IDC_COMBO_ENCODER_LEVEL, CB_ADDSTRING, 0, (LPARAM)locListString.c_str());
+
+ locListString = L"8 - Smallest";
+ SendDlgItemMessage(m_Dlg, IDC_COMBO_ENCODER_LEVEL, CB_ADDSTRING, 0, (LPARAM)locListString.c_str());
+
+ long locEncoderLevel = mFLACEncodeSettings->encoderLevel();
+
+ if (locEncoderLevel < 0) {
+ //Not using standard level. Disable. (Noti mplemented yet)
+ } else {
+ SendDlgItemMessage(m_Dlg, IDC_COMBO_ENCODER_LEVEL, CB_SETCURSEL, (WPARAM)locEncoderLevel, 0);
+ }
+ return S_OK;
+
+ // //TODO::: Setup everything
+ // wchar_t* locStrBuff = new wchar_t[16];
+
+ // FLACEncodeSettings locSettings = mFLACEncodeSettings->getEncoderSettings();
+
+ // SendDlgItemMessage(m_Dlg, IDC_SLIDER_QUALITY, TBM_SETRANGE, TRUE, MAKELONG(0, 99));
+ // SendDlgItemMessage(m_Dlg, IDC_SLIDER_QUALITY, TBM_SETTICFREQ, 1, 0);
+ // SendDlgItemMessage(m_Dlg, IDC_SLIDER_QUALITY, TBM_SETPOS, 1, locSettings.mQuality);
+
+ // SendDlgItemMessage(m_Dlg, IDC_SLIDER_TARGET_BITRATE, TBM_SETRANGE, TRUE, MAKELONG(16, 1024));
+ // SendDlgItemMessage(m_Dlg, IDC_SLIDER_TARGET_BITRATE, TBM_SETTICFREQ, 16, 0);
+ // SendDlgItemMessage(m_Dlg, IDC_SLIDER_TARGET_BITRATE, TBM_SETPOS, 1, locSettings.mBitrate);
+
+ // SendDlgItemMessage(m_Dlg, IDC_SLIDER_MIN_BITRATE, TBM_SETRANGE, TRUE, MAKELONG(16, 1024));
+ // SendDlgItemMessage(m_Dlg, IDC_SLIDER_MIN_BITRATE, TBM_SETTICFREQ, 16, 0);
+ // SendDlgItemMessage(m_Dlg, IDC_SLIDER_MIN_BITRATE, TBM_SETPOS, 1, locSettings.mMinBitrate);
+
+ // SendDlgItemMessage(m_Dlg, IDC_SLIDER_MAX_BITRATE, TBM_SETRANGE, TRUE, MAKELONG(16, 1024));
+ // SendDlgItemMessage(m_Dlg, IDC_SLIDER_MAX_BITRATE, TBM_SETTICFREQ, 16, 0);
+ // SendDlgItemMessage(m_Dlg, IDC_SLIDER_MAX_BITRATE, TBM_SETPOS, 1, locSettings.mMaxBitrate);
+
+ ////Fill out the labels
+ // _itow(locSettings.mQuality, locStrBuff, 10);
+ // SendDlgItemMessage(m_Dlg, IDC_LABEL_Q_VALUE, WM_SETTEXT, 0, (LPARAM)locStrBuff);
+
+ // _itow(locSettings.mBitrate, locStrBuff, 10);
+ // SendDlgItemMessage(m_Dlg, IDC_LABEL_TARGET_BITRATE, WM_SETTEXT, 0, (LPARAM)locStrBuff);
+
+ // _itow(locSettings.mMinBitrate, locStrBuff, 10);
+ // SendDlgItemMessage(m_Dlg, IDC_LABEL_MIN_BITRATE, WM_SETTEXT, 0, (LPARAM)locStrBuff);
+
+ // _itow(locSettings.mMaxBitrate, locStrBuff, 10);
+ // SendDlgItemMessage(m_Dlg, IDC_LABEL_MAX_BITRATE, WM_SETTEXT, 0, (LPARAM)locStrBuff);
+
+ // SendDlgItemMessage(m_Dlg, IDC_CHECK_Q_MODE, BM_SETCHECK, (WPARAM)(locSettings.mIsQualitySet ? BST_CHECKED : BST_UNCHECKED), 0);
+ // setUsingQualityMode(locSettings.mIsQualitySet);
+
+ // delete[] locStrBuff;
+
+ // return S_OK;
+}
+
+//void PropsFLACEncoder::setUsingQualityMode(bool inIsUsingQualityMode)
+//{
+// if (inIsUsingQualityMode) {
+// EnableWindow(GetDlgItem(m_hwnd, IDC_SLIDER_QUALITY), TRUE);
+// EnableWindow(GetDlgItem(m_hwnd, IDC_LABEL_Q_VALUE), TRUE);
+// EnableWindow(GetDlgItem(m_hwnd, IDC_STATIC_Q_VALUE), TRUE);
+//
+// EnableWindow(GetDlgItem(m_hwnd, IDC_SLIDER_TARGET_BITRATE), FALSE);
+// EnableWindow(GetDlgItem(m_hwnd, IDC_LABEL_TARGET_BITRATE), FALSE);
+// EnableWindow(GetDlgItem(m_hwnd, IDC_STATIC_TARGET_BITRATE), FALSE);
+//
+// EnableWindow(GetDlgItem(m_hwnd, IDC_SLIDER_MIN_BITRATE), FALSE);
+// EnableWindow(GetDlgItem(m_hwnd, IDC_LABEL_MIN_BITRATE), FALSE);
+// EnableWindow(GetDlgItem(m_hwnd, IDC_STATIC_MIN_BITRATE), FALSE);
+//
+// EnableWindow(GetDlgItem(m_hwnd, IDC_SLIDER_MAX_BITRATE), FALSE);
+// EnableWindow(GetDlgItem(m_hwnd, IDC_LABEL_MAX_BITRATE), FALSE);
+// EnableWindow(GetDlgItem(m_hwnd, IDC_STATIC_MAX_BITRATE), FALSE);
+// } else {
+// EnableWindow(GetDlgItem(m_hwnd, IDC_SLIDER_QUALITY), FALSE);
+// EnableWindow(GetDlgItem(m_hwnd, IDC_LABEL_Q_VALUE), FALSE);
+// EnableWindow(GetDlgItem(m_hwnd, IDC_STATIC_Q_VALUE), FALSE);
+//
+// EnableWindow(GetDlgItem(m_hwnd, IDC_SLIDER_TARGET_BITRATE), TRUE);
+// EnableWindow(GetDlgItem(m_hwnd, IDC_LABEL_TARGET_BITRATE), TRUE);
+// EnableWindow(GetDlgItem(m_hwnd, IDC_STATIC_TARGET_BITRATE), TRUE);
+//
+// EnableWindow(GetDlgItem(m_hwnd, IDC_SLIDER_MIN_BITRATE), TRUE);
+// EnableWindow(GetDlgItem(m_hwnd, IDC_LABEL_MIN_BITRATE), TRUE);
+// EnableWindow(GetDlgItem(m_hwnd, IDC_STATIC_MIN_BITRATE), TRUE);
+//
+// EnableWindow(GetDlgItem(m_hwnd, IDC_SLIDER_MAX_BITRATE), TRUE);
+// EnableWindow(GetDlgItem(m_hwnd, IDC_LABEL_MAX_BITRATE), TRUE);
+// EnableWindow(GetDlgItem(m_hwnd, IDC_STATIC_MAX_BITRATE), TRUE);
+// }
+//}
+HRESULT PropsFLACEncoder::OnConnect(IUnknown *pUnk)
+{
+ if (mFLACEncodeSettings != NULL) {
+ mFLACEncodeSettings->Release();
+ mFLACEncodeSettings = NULL;
+ }
+
+ HRESULT locHR;
+ // Query pUnk for the filter's custom interface.
+ locHR = pUnk->QueryInterface(IID_IFLACEncodeSettings, (void**)(&mFLACEncodeSettings));
+ return locHR;
+}
+HRESULT PropsFLACEncoder::OnDisconnect(void)
+{
+ if (mFLACEncodeSettings != NULL) {
+ mFLACEncodeSettings->Release();
+ mFLACEncodeSettings = NULL;
+ }
+ return S_OK;
+}
+INT_PTR PropsFLACEncoder::OnReceiveMessage(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ //wchar_t locBuff[16];
+
+ switch (uMsg) {
+ case WM_COMMAND:
+
+ if (HIWORD(wParam) == CBN_SELCHANGE) {
+ if (HWND(lParam) == GetDlgItem(m_hwnd, IDC_COMBO_ENCODER_LEVEL)) {
+ SetDirty();
+ return (INT_PTR)TRUE;
+ }
+ }
+ break;
+ default:
+ break;
+ }
+
+ // Did not handle the message.
+ return CBasePropertyPage::OnReceiveMessage(hwnd, uMsg, wParam, lParam);
+
+
+ //
+ // switch (uMsg) {
+ // case WM_COMMAND:
+ // //TODO::: Need to check the high wparam ??
+ // if (HIWORD(wParam) == BN_CLICKED) {
+ // if (HWND(lParam) == GetDlgItem(m_hwnd, IDC_CHECK_Q_MODE)) {
+ // SetDirty();
+ // setUsingQualityMode(SendDlgItemMessage(m_hwnd,IDC_CHECK_Q_MODE, BM_GETCHECK, 0, 0));
+ // }
+ // }
+ // break;
+ // case WM_HSCROLL:
+ // if (HWND(lParam) == GetDlgItem(m_hwnd, IDC_SLIDER_QUALITY)) {
+ // SetDirty();
+ // _itow(SendDlgItemMessage(m_hwnd,IDC_SLIDER_QUALITY, TBM_GETPOS, 0, 0), locBuff, 10);
+ // SendDlgItemMessage(m_hwnd, IDC_LABEL_Q_VALUE, WM_SETTEXT, 0, (LPARAM)&locBuff);
+
+
+ // return (INT_PTR)TRUE;
+ // } else if (HWND(lParam) == GetDlgItem(m_hwnd, IDC_SLIDER_TARGET_BITRATE)) {
+ // SetDirty();
+ // _itow(SendDlgItemMessage(m_hwnd,IDC_SLIDER_TARGET_BITRATE, TBM_GETPOS, 0, 0), locBuff, 10);
+ // SendDlgItemMessage(m_hwnd, IDC_LABEL_TARGET_BITRATE, WM_SETTEXT, 0, (LPARAM)&locBuff);
+
+
+ // return (INT_PTR)TRUE;
+
+ // } else if (HWND(lParam) == GetDlgItem(m_hwnd, IDC_SLIDER_MIN_BITRATE)) {
+ // SetDirty();
+ // _itow(SendDlgItemMessage(m_hwnd,IDC_SLIDER_MIN_BITRATE, TBM_GETPOS, 0, 0), locBuff, 10);
+ // SendDlgItemMessage(m_hwnd, IDC_LABEL_MIN_BITRATE, WM_SETTEXT, 0, (LPARAM)&locBuff);
+
+
+ // return (INT_PTR)TRUE;
+
+ // } else if (HWND(lParam) == GetDlgItem(m_hwnd, IDC_SLIDER_MAX_BITRATE)) {
+ // SetDirty();
+ // _itow(SendDlgItemMessage(m_hwnd,IDC_SLIDER_MAX_BITRATE, TBM_GETPOS, 0, 0), locBuff, 10);
+ // SendDlgItemMessage(m_hwnd, IDC_LABEL_MAX_BITRATE, WM_SETTEXT, 0, (LPARAM)&locBuff);
+
+
+ // return (INT_PTR)TRUE;
+
+ // }
+ // break;
+ // default:
+ // break;
+ // }
+
+ //// Did not handle the message.
+ //return CBasePropertyPage::OnReceiveMessage(hwnd, uMsg, wParam, lParam);
+}
+HRESULT PropsFLACEncoder::OnApplyChanges(void)
+{
+ if (mFLACEncodeSettings == NULL) {
+ return E_POINTER;
+ }
+ // //TODO::: Apply the settings.
+
+ mFLACEncodeSettings->setEncodingLevel(SendDlgItemMessage(m_hwnd,IDC_COMBO_ENCODER_LEVEL, CB_GETCURSEL, 0, 0));
+
+ SetClean();
+ return S_OK;
+}
+
+void PropsFLACEncoder::SetDirty()
+{
+ m_bDirty = TRUE;
+ if (m_pPageSite)
+ {
+ m_pPageSite->OnStatusChange(PROPPAGESTATUS_DIRTY);
+ }
+}
+
+void PropsFLACEncoder::SetClean()
+{
+ m_bDirty = FALSE;
+ if (m_pPageSite)
+ {
+ m_pPageSite->OnStatusChange(PROPPAGESTATUS_CLEAN);
+ }
+}
\ No newline at end of file
Added: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/PropsFLACEncoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/PropsFLACEncoder.h 2006-10-14 01:40:26 UTC (rev 11918)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/PropsFLACEncoder.h 2006-10-15 09:56:25 UTC (rev 11919)
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "resource.h"
+
+#include <commctrl.h>
+
+class PropsFLACEncoder
+ : public CBasePropertyPage
+{
+public:
+ PropsFLACEncoder(LPUNKNOWN inUnk, HRESULT* outHR);
+ virtual ~PropsFLACEncoder(void);
+
+ static CUnknown* WINAPI CreateInstance(LPUNKNOWN inUnk, HRESULT* outHR);
+
+ //CBasePropertyPage Virtual Overrides
+ HRESULT OnActivate(void);
+ HRESULT OnConnect(IUnknown *pUnk);
+ HRESULT OnDisconnect(void);
+ INT_PTR OnReceiveMessage(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+ HRESULT OnApplyChanges(void);
+
+protected:
+ void SetDirty();
+ void SetClean();
+
+ IFLACEncodeSettings* mFLACEncodeSettings;
+
+
+};
Added: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.aps
===================================================================
(Binary files differ)
Property changes on: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.aps
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.rc
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.rc 2006-10-14 01:40:26 UTC (rev 11918)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.rc 2006-10-15 09:56:25 UTC (rev 11919)
@@ -0,0 +1,119 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_FLAC_ENCODE_SETTINGS DIALOGEX 0, 0, 196, 127
+STYLE DS_SETFONT | WS_CHILD | WS_BORDER
+FONT 8, "Microsoft Sans Serif", 400, 0, 0x0
+BEGIN
+ COMBOBOX IDC_COMBO_ENCODER_LEVEL,66,7,122,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Advanced",IDC_CHECK_ADVANCED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,53,14
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+ IDD_FLAC_ENCODE_SETTINGS, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 188
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 120
+ END
+END
+#endif // APSTUDIO_INVOKED
+
+#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (Australia) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENA)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE
+BEGIN
+ IDS_FLAC_ENC_PROPS_STRING "FLAC Encode Settings"
+END
+
+#endif // English (Australia) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.vcproj 2006-10-14 01:40:26 UTC (rev 11918)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/dsfFLACEncoder.vcproj 2006-10-15 09:56:25 UTC (rev 11919)
@@ -187,12 +187,13 @@
/>
</Configuration>
<Configuration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
- IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -208,18 +209,21 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="0"
+ Optimization="2"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
+ OmitFramePointers="true"
AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\libs\libflac\include;..\..\..\..\helper;..\..\libs\libFLACHelper"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFFLACENCODER_EXPORTS"
- MinimalRebuild="true"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFFLACENCODER_EXPORTS"
+ RuntimeLibrary="2"
UsePrecompiledHeader="2"
WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -232,45 +236,48 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
+ AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib unicows.lib"
OutputFile="$(OutDir)/dsfFLACEncoder.dll"
- LinkIncremental="2"
+ LinkIncremental="1"
AdditionalLibraryDirectories=""
ModuleDefinitionFile="flacencoder.def"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/dsfFLACEncoder.pdb"
SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ OptimizeForWindows98="1"
ImportLibrary="$(OutDir)/dsfFLACEncoder.lib"
- TargetMachine="0"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
+ Name="VCManifestTool"
+ />
+ <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
- Name="VCCodeSignTool"
+ Name="VCFxCopTool"
/>
<Tool
- Name="VCPostBuildEventTool"
+ Name="VCAppVerifierTool"
/>
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
+ <Tool
+ Name="VCWebDeploymentTool"
/>
- <DebuggerTool
+ <Tool
+ Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ Name="Release|Pocket PC 2003 (ARMV4)"
+ OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+ IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
@@ -290,20 +297,20 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
+ ExecutionBucket="7"
Optimization="2"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
- OmitFramePointers="true"
AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\libs\libflac\include;..\..\..\..\helper;..\..\libs\libFLACHelper"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFFLACENCODER_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
WarningLevel="4"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@@ -317,7 +324,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib unicows.lib"
+ AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
OutputFile="$(OutDir)/dsfFLACEncoder.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""
@@ -328,41 +335,39 @@
EnableCOMDATFolding="2"
OptimizeForWindows98="1"
ImportLibrary="$(OutDir)/dsfFLACEncoder.lib"
- TargetMachine="1"
+ TargetMachine="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
- Name="VCFxCopTool"
+ Name="VCCodeSignTool"
/>
<Tool
- Name="VCAppVerifierTool"
+ Name="VCPostBuildEventTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
/>
- <Tool
- Name="VCPostBuildEventTool"
+ <DebuggerTool
/>
</Configuration>
<Configuration
- Name="Release|Pocket PC 2003 (ARMV4)"
- OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
- IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+ Name="Debug_CE_ARM|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
- WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -378,21 +383,20 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="2"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
+ Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\libs\libflac\include;..\..\..\..\helper;..\..\libs\libFLACHelper"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFFLACENCODER_EXPORTS"
- RuntimeLibrary="2"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFFLACENCODER_EXPORTS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="4"
- DebugInformationFormat="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ CallingConvention="2"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -407,49 +411,47 @@
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
OutputFile="$(OutDir)/dsfFLACEncoder.dll"
- LinkIncremental="1"
+ LinkIncremental="2"
AdditionalLibraryDirectories=""
ModuleDefinitionFile="flacencoder.def"
GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/dsfFLACEncoder.pdb"
SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
ImportLibrary="$(OutDir)/dsfFLACEncoder.lib"
- TargetMachine="0"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
+ Name="VCManifestTool"
+ />
+ <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
- Name="VCCodeSignTool"
+ Name="VCFxCopTool"
/>
<Tool
- Name="VCPostBuildEventTool"
+ Name="VCAppVerifierTool"
/>
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
+ <Tool
+ Name="VCWebDeploymentTool"
/>
- <DebuggerTool
+ <Tool
+ Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
- IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ Name="Debug_CE_ARM|Pocket PC 2003 (ARMV4)"
+ OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+ IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
- WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -470,16 +472,13 @@
<Tool
Name="VCCLCompilerTool"
ExecutionBucket="7"
- Optimization="2"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
+ Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\libs\libflac\include;..\..\..\..\helper;..\..\libs\libFLACHelper"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFFLACENCODER_EXPORTS"
- RuntimeLibrary="2"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFFLACENCODER_EXPORTS"
+ MinimalRebuild="true"
+ RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="4"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -494,14 +493,12 @@
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
OutputFile="$(OutDir)/dsfFLACEncoder.dll"
- LinkIncremental="1"
+ LinkIncremental="2"
AdditionalLibraryDirectories=""
ModuleDefinitionFile="flacencoder.def"
GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/dsfFLACEncoder.pdb"
SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
ImportLibrary="$(OutDir)/dsfFLACEncoder.lib"
TargetMachine="0"
/>
@@ -530,7 +527,7 @@
/>
</Configuration>
<Configuration
- Name="Debug_CE_ARM|Win32"
+ Name="Debug_WM5_PPC_ARM|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
@@ -614,7 +611,7 @@
/>
</Configuration>
<Configuration
- Name="Debug_CE_ARM|Pocket PC 2003 (ARMV4)"
+ Name="Debug_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
ConfigurationType="2"
@@ -695,9 +692,9 @@
/>
</Configuration>
<Configuration
- Name="Debug_CE_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
- IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ Name="Release_WM5_PPC_ARM|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
@@ -716,18 +713,20 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
- ExecutionBucket="7"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\libs\libflac\include;..\..\..\..\helper;..\..\libs\libFLACHelper"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFFLACENCODER_EXPORTS"
MinimalRebuild="true"
+ BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ CallingConvention="2"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -749,36 +748,37 @@
ProgramDatabaseFile="$(OutDir)/dsfFLACEncoder.pdb"
SubSystem="2"
ImportLibrary="$(OutDir)/dsfFLACEncoder.lib"
- TargetMachine="0"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
+ Name="VCManifestTool"
+ />
+ <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
- Name="VCCodeSignTool"
+ Name="VCFxCopTool"
/>
<Tool
- Name="VCPostBuildEventTool"
+ Name="VCAppVerifierTool"
/>
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
+ <Tool
+ Name="VCWebDeploymentTool"
/>
- <DebuggerTool
+ <Tool
+ Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Debug_WM5_PPC_ARM|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="Release_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
+ OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+ IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
@@ -797,20 +797,18 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
+ ExecutionBucket="7"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\libs\libflac\include;..\..\..\..\helper;..\..\libs\libFLACHelper"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFFLACENCODER_EXPORTS"
MinimalRebuild="true"
- BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="4"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- CallingConvention="2"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -832,37 +830,36 @@
ProgramDatabaseFile="$(OutDir)/dsfFLACEncoder.pdb"
SubSystem="2"
ImportLibrary="$(OutDir)/dsfFLACEncoder.lib"
- TargetMachine="1"
+ TargetMachine="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
- Name="VCFxCopTool"
+ Name="VCCodeSignTool"
/>
<Tool
- Name="VCAppVerifierTool"
+ Name="VCPostBuildEventTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
/>
- <Tool
- Name="VCPostBuildEventTool"
+ <DebuggerTool
/>
</Configuration>
<Configuration
- Name="Debug_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
- OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
- IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
@@ -941,12 +938,13 @@
/>
</Configuration>
<Configuration
- Name="Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -967,13 +965,16 @@
<Tool
Name="VCCLCompilerTool"
ExecutionBucket="7"
- Optimization="0"
+ Optimization="2"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\libs\libflac\include;..\..\..\..\helper;..\..\libs\libFLACHelper"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFFLACENCODER_EXPORTS"
- MinimalRebuild="true"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFFLACENCODER_EXPORTS"
+ RuntimeLibrary="2"
UsePrecompiledHeader="2"
WarningLevel="4"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -988,12 +989,14 @@
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
OutputFile="$(OutDir)/dsfFLACEncoder.dll"
- LinkIncremental="2"
+ LinkIncremental="1"
AdditionalLibraryDirectories=""
ModuleDefinitionFile="flacencoder.def"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/dsfFLACEncoder.pdb"
SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ OptimizeForWindows98="1"
ImportLibrary="$(OutDir)/dsfFLACEncoder.lib"
TargetMachine="0"
/>
@@ -1022,9 +1025,9 @@
/>
</Configuration>
<Configuration
- Name="Release_WM5_PPC_ARM|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="Debug_CE_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
@@ -1043,20 +1046,18 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
+ ExecutionBucket="7"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\core\directshow\BaseClasses;..\..\..\..\core\directshow\libDirectshowAbstracts;..\..\..\..\core\ogg;..\..\libs\libflac\include;..\..\..\..\helper;..\..\libs\libFLACHelper"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFFLACENCODER_EXPORTS"
MinimalRebuild="true"
- BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="4"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- CallingConvention="2"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -1078,37 +1079,36 @@
ProgramDatabaseFile="$(OutDir)/dsfFLACEncoder.pdb"
SubSystem="2"
ImportLibrary="$(OutDir)/dsfFLACEncoder.lib"
- TargetMachine="1"
+ TargetMachine="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
- Name="VCFxCopTool"
+ Name="VCCodeSignTool"
/>
<Tool
- Name="VCAppVerifierTool"
+ Name="VCPostBuildEventTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
/>
- <Tool
- Name="VCPostBuildEventTool"
+ <DebuggerTool
/>
</Configuration>
<Configuration
- Name="Release_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
- OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
- IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+ Name="Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
@@ -1297,6 +1297,10 @@
>
</File>
<File
+ RelativePath=".\PropsFLACEncoder.cpp"
+ >
+ </File>
+ <File
RelativePath=".\stdafx.cpp"
>
<FileConfiguration
@@ -1316,7 +1320,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1324,7 +1328,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1332,7 +1336,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Pocket PC 2003 (ARMV4)"
+ Name="Debug_CE_ARM|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1340,7 +1344,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Debug_CE_ARM|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1348,7 +1352,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_CE_ARM|Win32"
+ Name="Debug_WM5_PPC_ARM|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1356,7 +1360,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_CE_ARM|Pocket PC 2003 (ARMV4)"
+ Name="Debug_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1364,7 +1368,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_CE_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Release_WM5_PPC_ARM|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1372,7 +1376,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_WM5_PPC_ARM|Win32"
+ Name="Release_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1380,7 +1384,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1388,7 +1392,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1396,7 +1400,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release_WM5_PPC_ARM|Win32"
+ Name="Debug_CE_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1404,7 +1408,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release_WM5_PPC_ARM|Pocket PC 2003 (ARMV4)"
+ Name="Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1443,6 +1447,18 @@
>
</File>
<File
+ RelativePath=".\IFLACEncodeSettings.h"
+ >
+ </File>
+ <File
+ RelativePath=".\PropsFLACEncoder.h"
+ >
+ </File>
+ <File
+ RelativePath=".\resource.h"
+ >
+ </File>
+ <File
RelativePath=".\stdafx.h"
>
</File>
@@ -1452,6 +1468,10 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
+ <File
+ RelativePath=".\dsfFLACEncoder.rc"
+ >
+ </File>
</Filter>
<File
RelativePath=".\ReadMe.txt"
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/flacencoderdllstuff.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/flacencoderdllstuff.h 2006-10-14 01:40:26 UTC (rev 11918)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/flacencoderdllstuff.h 2006-10-15 09:56:25 UTC (rev 11919)
@@ -51,7 +51,16 @@
#define LIBOOOGG_API __declspec(dllimport)
#endif
+// {EE66A998-4E5C-4e23-A0F3-97C40D87EC48}
+static const GUID CLSID_PropsFLACEncoder =
+{ 0xee66a998, 0x4e5c, 0x4e23, { 0xa0, 0xf3, 0x97, 0xc4, 0xd, 0x87, 0xec, 0x48 } };
+// {DF9C0DC3-1924-4bfe-8DC1-1084453A0F8F}
+static const GUID IID_IFLACEncodeSettings =
+{ 0xdf9c0dc3, 0x1924, 0x4bfe, { 0x8d, 0xc1, 0x10, 0x84, 0x45, 0x3a, 0xf, 0x8f } };
+
+
+
//// {3913F0AB-E7ED-41c4-979B-1D1FDD983C07}
//DEFINE_GUID(MEDIASUBTYPE_FLAC,
//0x3913f0ab, 0xe7ed, 0x41c4, 0x97, 0x9b, 0x1d, 0x1f, 0xdd, 0x98, 0x3c, 0x7);
Added: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/resource.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/resource.h 2006-10-14 01:40:26 UTC (rev 11918)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/resource.h 2006-10-15 09:56:25 UTC (rev 11919)
@@ -0,0 +1,19 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by dsfFLACEncoder.rc
+//
+#define IDS_FLAC_ENC_PROPS_STRING 101
+#define IDD_FLAC_ENCODE_SETTINGS 102
+#define IDC_COMBO_ENCODER_LEVEL 1001
+#define IDC_CHECK_ADVANCED 1002
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 103
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1003
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/stdafx.h 2006-10-14 01:40:26 UTC (rev 11918)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/stdafx.h 2006-10-15 09:56:25 UTC (rev 11919)
@@ -41,4 +41,6 @@
// Windows Header Files:
#include <windows.h>
+#include "flacencoderdllstuff.h"
+
// TODO: reference additional headers your program requires here
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACEncoderSettings.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACEncoderSettings.cpp 2006-10-14 01:40:26 UTC (rev 11918)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACEncoderSettings.cpp 2006-10-15 09:56:25 UTC (rev 11919)
@@ -5,6 +5,7 @@
: mNumChannels(0)
, mSampleRate(0)
, mBitsPerSample(0)
+ , mEncoderLevel(5)
, mLPCOrder(8)
, mBlockSize(4608)
, mRiceMin(3)
@@ -43,10 +44,10 @@
const sFLACDefaultSettings locDefaults[] = {
{ 0, 1152, 2, 2, false, false, false}, //0
- { 0, 1152, 2, 2, false, false, true}, //1
+ { 0, 1152, 2, 2, false, true, true}, //1
{ 0, 1152, 0, 3, false, true, false}, //2
{ 6, 4608, 3, 3, false, false, false}, //3
- { 8, 4608, 3, 3, false, false, true}, //4
+ { 8, 4608, 3, 3, false, true, true}, //4
{ 8, 4608, 3, 3, false, true, false}, //5
{ 8, 4608, 0, 4, false, true, false}, //6
{ 8, 4608, 0, 6, true, true, false}, //7
@@ -54,6 +55,7 @@
};
bool locISOK = true;
if (inLevel <= 8) {
+
locISOK = locISOK && setLPCOrder(locDefaults[inLevel].LPCOrder);
locISOK = locISOK && setBlockSize(locDefaults[inLevel].blockSize);
@@ -66,6 +68,7 @@
useMidSideCoding(false);
}
locISOK = locISOK && useExhaustiveModelSearch(locDefaults[inLevel].useExhaustive);
+ mEncoderLevel = inLevel;
return locISOK;
}
@@ -74,6 +77,7 @@
bool FLACEncoderSettings::setLPCOrder(unsigned long inLPCOrder)
{
if (inLPCOrder <= 32) {
+ mEncoderLevel = -1;
mLPCOrder = inLPCOrder;
return true;
}
@@ -82,6 +86,7 @@
bool FLACEncoderSettings::setBlockSize(unsigned long inBlockSize)
{
if (isValidBlockSize(inBlockSize)) {
+ mEncoderLevel = -1;
mBlockSize = inBlockSize;
return true;
}
@@ -90,7 +95,12 @@
bool FLACEncoderSettings::useMidSideCoding(bool inUseMidSideCoding)
{
if (mNumChannels == 2) {
+ mEncoderLevel = -1;
mUsingMidSide = inUseMidSideCoding;
+
+ if (!inUseMidSideCoding) {
+ mUsingAdaptiveMidSide = false;
+ }
return true;
} else {
mUsingMidSide = false;
@@ -100,7 +110,12 @@
bool FLACEncoderSettings::useAdaptiveMidSideCoding(bool inUseAdaptiveMidSideCoding)
{
if (mNumChannels == 2) {
+ mEncoderLevel = -1;
mUsingAdaptiveMidSide = inUseAdaptiveMidSideCoding;
+
+ if (inUseAdaptiveMidSideCoding) {
+ mUsingMidSide = true;
+ }
return true;
} else {
mUsingAdaptiveMidSide = false;
@@ -109,6 +124,7 @@
}
bool FLACEncoderSettings::useExhaustiveModelSearch(bool inUseExhaustiveModelSearch)
{
+ mEncoderLevel = -1;
mUsingExhaustiveModelSearch = inUseExhaustiveModelSearch;
return true;
}
@@ -117,6 +133,7 @@
if ( (inMin <= 16)
&& (inMax <= 16)
&& (inMin <= inMax)) {
+ mEncoderLevel = -1;
mRiceMin = inMin;
mRiceMax = inMax;
return true;
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACEncoderSettings.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACEncoderSettings.h 2006-10-14 01:40:26 UTC (rev 11918)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libFLACHelper/FLACEncoderSettings.h 2006-10-15 09:56:25 UTC (rev 11919)
@@ -21,6 +21,8 @@
const vector<unsigned long>& getValidBlockSizes();
+ ///Returns -1 if not a standard level
+ long encoderLevel() { return mEncoderLevel; }
unsigned long numChannels() { return mNumChannels; }
unsigned long sampleRate() { return mSampleRate; }
unsigned long bitsPerSample() { return mBitsPerSample; }
@@ -37,6 +39,8 @@
void makeValidBlockSizeList();
vector<unsigned long> mValidBlockSizes;
+ long mEncoderLevel;
+
unsigned long mNumChannels;
unsigned long mSampleRate;
unsigned long mBitsPerSample;
More information about the commits
mailing list