[xiph-commits] r11866 -
trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis
illiminable at svn.xiph.org
illiminable at svn.xiph.org
Sat Sep 30 02:45:59 PDT 2006
Author: illiminable
Date: 2006-09-30 02:45:51 -0700 (Sat, 30 Sep 2006)
New Revision: 11866
Added:
trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisEncodeSettings.cpp
trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisEncodeSettings.h
trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisEncoder.cpp
trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisEncoder.h
Modified:
trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisDecoder.cpp
trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisDecoder.h
trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/libOOVorbis.vcproj
Log:
* Start exposing vorbis encoder paramters
Modified: trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisDecoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisDecoder.cpp 2006-09-30 08:40:47 UTC (rev 11865)
+++ trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisDecoder.cpp 2006-09-30 09:45:51 UTC (rev 11866)
@@ -1,3 +1,34 @@
+//===========================================================================
+//Copyright (C) 2003-2006 Zentaro Kavanagh
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
#include "StdAfx.h"
#include "VorbisDecoder.h"
Modified: trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisDecoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisDecoder.h 2006-09-30 08:40:47 UTC (rev 11865)
+++ trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisDecoder.h 2006-09-30 09:45:51 UTC (rev 11866)
@@ -1,3 +1,33 @@
+//===========================================================================
+//Copyright (C) 2003-2006 Zentaro Kavanagh
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
#pragma once
#include <vorbis/codec.h>
Added: trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisEncodeSettings.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisEncodeSettings.cpp 2006-09-30 08:40:47 UTC (rev 11865)
+++ trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisEncodeSettings.cpp 2006-09-30 09:45:51 UTC (rev 11866)
@@ -0,0 +1,97 @@
+//===========================================================================
+//Copyright (C) 2003-2006 Zentaro Kavanagh
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
+#include "StdAfx.h"
+#include "VorbisEncodeSettings.h"
+
+VorbisEncodeSettings::VorbisEncodeSettings(void)
+{
+ setToDefaults();
+}
+
+VorbisEncodeSettings::~VorbisEncodeSettings(void)
+{
+}
+
+void VorbisEncodeSettings::setToDefaults()
+{
+ mIsManaged = false;
+ mBitrate = 0;
+ mMinBitrate = 0;
+ mMaxBitrate = 0;
+ mQuality = 30;
+ mIsQualitySet = true;
+
+ //Advanced
+ //double mBitrateAverageDamping;
+ //unsigned int mBitrateAverage;
+ //double mBitReservoirBias;
+ //unsigned int mBitReservoirBits;
+ //unsigned int mBitrateHardMin;
+ //unsigned int mBitrateHardMax;
+ //double mImpulseNoiseTune;
+ //double mLowpassFrequency;
+}
+
+bool VorbisEncodeSettings::setQuality(int inQuality)
+{
+ if ((inQuality >= MIN_QUALITY) && (inQuality <= MAX_QUALITY)) {
+ mQuality = inQuality;
+ mIsManaged = false;
+ mIsQualitySet = true;
+ return true;
+ }
+ return false;
+
+}
+
+bool VorbisEncodeSettings::setManaged(unsigned int inBitrate, unsigned int inMinBitrate, unsigned int inMaxBitrate)
+{
+ //TODO::: What other things to check?
+ if (inMinBitrate < inMaxBitrate) {
+ mBitrate = inBitrate;
+ mMinBitrate = inMinBitrate;
+ mMaxBitrate = inMaxBitrate;
+ mIsManaged = true;
+ mIsQualitySet = false;
+ }
+}
+
+bool VorbisEncodeSettings::setAudioParameters(unsigned int inNumChannels, unsigned int inSampleRate)
+{
+ //TODO::: What else to check?
+ if ((mNumChannels == 0) || (mSampleRate == 0)) {
+ return false;
+ }
+ mNumChannels = inNumChannels;
+ mSampleRate = inSampleRate;
+ return true;
+}
\ No newline at end of file
Added: trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisEncodeSettings.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisEncodeSettings.h 2006-09-30 08:40:47 UTC (rev 11865)
+++ trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisEncodeSettings.h 2006-09-30 09:45:51 UTC (rev 11866)
@@ -0,0 +1,76 @@
+//===========================================================================
+//Copyright (C) 2003-2006 Zentaro Kavanagh
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
+#pragma once
+
+class VorbisEncodeSettings
+{
+public:
+ VorbisEncodeSettings(void);
+ ~VorbisEncodeSettings(void);
+
+ static const int MIN_QUALITY = -20;
+ static const int MAX_QUALITY = 100;
+
+ void setToDefaults();
+
+ bool setQuality(int inQuality);
+ bool setManaged(unsigned int inBitrate, unsigned int inMinBitrate, unsigned int inMaxBitrate);
+ bool setAudioParameters(unsigned int inNumChannels, unsigned int inSampleRate);
+
+ unsigned int mNumChannels;
+ unsigned int mSampleRate;
+
+ bool mIsManaged;
+ unsigned int mBitrate;
+ unsigned int mMinBitrate;
+ unsigned int mMaxBitrate;
+ int mQuality;
+ bool mIsQualitySet;
+
+ //More inof at
+ //http://svn.xiph.org/trunk/vorbis-tools/oggenc/encode.c
+ //http://svn.xiph.org/trunk/vorbis-tools/oggenc/encode.h
+ //http://wiki.hydrogenaudio.org/index.php?title=Recommended_Ogg_Vorbis
+ //http://www.hydrogenaudio.org/forums/index.php?showtopic=15049
+ //http://www.hydrogenaudio.org/forums/index.php?showtopic=15049&st=160&p=357461&#entry357461
+
+ //Advanced
+ //double mBitrateAverageDamping;
+ //unsigned int mBitrateAverage;
+ //double mBitReservoirBias;
+ //unsigned int mBitReservoirBits;
+ //unsigned int mBitrateHardMin;
+ //unsigned int mBitrateHardMax;
+ //double mImpulseNoiseTune;
+ //double mLowpassFrequency;
+
+};
Added: trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisEncoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisEncoder.cpp 2006-09-30 08:40:47 UTC (rev 11865)
+++ trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisEncoder.cpp 2006-09-30 09:45:51 UTC (rev 11866)
@@ -0,0 +1,41 @@
+//===========================================================================
+//Copyright (C) 2003-2006 Zentaro Kavanagh
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
+#include "StdAfx.h"
+#include "VorbisEncoder.h"
+
+VorbisEncoder::VorbisEncoder(void)
+{
+}
+
+VorbisEncoder::~VorbisEncoder(void)
+{
+}
Added: trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisEncoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisEncoder.h 2006-09-30 08:40:47 UTC (rev 11865)
+++ trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/VorbisEncoder.h 2006-09-30 09:45:51 UTC (rev 11866)
@@ -0,0 +1,48 @@
+//===========================================================================
+//Copyright (C) 2003-2006 Zentaro Kavanagh
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
+#pragma once
+
+#include <libOOOgg/dllstuff.h>
+#include <libOOOgg/StampedOggPacket.h>
+
+#include "VorbisEncodeSettings.h"
+
+class VorbisEncoder
+{
+public:
+ VorbisEncoder(void);
+ ~VorbisEncoder(void);
+
+
+ bool setupCodec(VorbisEncodeSettings inSettings);
+ StampedOggPacket* encodeVorbis(unsigned short* inSampleBuffer, unsigned long inNumSamples);
+};
Modified: trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/libOOVorbis.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/libOOVorbis.vcproj 2006-09-30 08:40:47 UTC (rev 11865)
+++ trunk/oggdsf/src/lib/codecs/vorbis/libs/libOOVorbis/libOOVorbis.vcproj 2006-09-30 09:45:51 UTC (rev 11866)
@@ -43,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
+ AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -106,7 +106,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
+ AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
@@ -143,9 +143,9 @@
/>
</Configuration>
<Configuration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- OutputDirectory="$(SolutionDir)Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
- IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ Name="Debug_WM5_PPC_ARM|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
>
@@ -163,18 +163,18 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
- ExecutionBucket="7"
Optimization="0"
- AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
+ AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
+ BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@@ -199,24 +199,16 @@
Name="VCBscMakeTool"
/>
<Tool
- Name="VCCodeSignTool"
+ Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
</Configuration>
<Configuration
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- OutputDirectory="$(SolutionDir)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="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
WholeProgramOptimization="1"
@@ -235,16 +227,15 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
+ AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include; ..\..\..\..\core\ogg;..\..\..\..\helper;"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@@ -269,24 +260,16 @@
Name="VCBscMakeTool"
/>
<Tool
- Name="VCCodeSignTool"
+ Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
</Configuration>
<Configuration
- Name="Debug_WM5_PPC_ARM|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="$(SolutionDir)Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
>
@@ -304,18 +287,18 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
+ ExecutionBucket="7"
Optimization="0"
AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
- BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="4"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@@ -340,18 +323,27 @@
Name="VCBscMakeTool"
/>
<Tool
- Name="VCFxCopTool"
+ Name="VCCodeSignTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
+ />
+ <DebuggerTool
+ />
</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="$(SolutionDir)Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -372,14 +364,12 @@
<Tool
Name="VCCLCompilerTool"
ExecutionBucket="7"
- Optimization="0"
AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
- MinimalRebuild="true"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ RuntimeLibrary="2"
UsePrecompiledHeader="2"
WarningLevel="4"
- DebugInformationFormat="0"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -418,12 +408,11 @@
/>
</Configuration>
<Configuration
- Name="Release_WM5_PPC_ARM|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="$(SolutionDir)Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
- WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -439,16 +428,19 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
+ ExecutionBucket="7"
+ Optimization="0"
AdditionalIncludeDirectories="..\libvorbis\include;..\..\..\..\core\ogg\libogg\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
- RuntimeLibrary="2"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
+ MinimalRebuild="true"
+ RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="4"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
+ DebugInformationFormat="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -472,11 +464,19 @@
Name="VCBscMakeTool"
/>
<Tool
- Name="VCFxCopTool"
+ Name="VCCodeSignTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
+ />
+ <DebuggerTool
+ />
</Configuration>
<Configuration
Name="Release_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
@@ -577,7 +577,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Debug_WM5_PPC_ARM|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -585,7 +585,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Release_WM5_PPC_ARM|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -593,7 +593,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_WM5_PPC_ARM|Win32"
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
@@ -601,7 +601,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"
@@ -609,7 +609,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release_WM5_PPC_ARM|Win32"
+ Name="Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
@@ -629,6 +629,14 @@
RelativePath=".\VorbisDecoder.cpp"
>
</File>
+ <File
+ RelativePath=".\VorbisEncoder.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\VorbisEncodeSettings.cpp"
+ >
+ </File>
</Filter>
<Filter
Name="Header Files"
@@ -643,6 +651,14 @@
RelativePath=".\VorbisDecoder.h"
>
</File>
+ <File
+ RelativePath=".\VorbisEncoder.h"
+ >
+ </File>
+ <File
+ RelativePath=".\VorbisEncodeSettings.h"
+ >
+ </File>
</Filter>
<Filter
Name="Resource Files"
More information about the commits
mailing list