[xiph-commits] r8703 - in trunk/oggdsf: build/oggcodecs
src/lib/codecs/cmml/dsfCMMLDecoder
src/lib/codecs/cmml/dsfCMMLRawSource
src/lib/codecs/helper/libfishsound/win32
src/lib/codecs/speex/filters/dsfSpeexDecoder
src/lib/codecs/theora/filters/dsfTheoraDecoder
src/lib/codecs/theora/filters/dsfTheoraEncoder
src/lib/codecs/vorbis/filters/dsfVorbisEncoder
src/lib/core/directshow/dsfAnxDemux
src/lib/core/directshow/dsfOggDemux src/tests/testCMMLParser
src/tools/OOOggPageInfo src/tools/OOOggSeekFileQuery
src/tools/OOOggStat src/tools/OOOggValidate
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Sun Jan 9 01:53:31 PST 2005
Author: illiminable
Date: 2005-01-09 01:53:20 -0800 (Sun, 09 Jan 2005)
New Revision: 8703
Modified:
trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.vcproj
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/dsfCMMLRawSource.vcproj
trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound.vcproj
trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeOutputPin.cpp
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp
trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeInputPin.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStreamMapper.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj
trunk/oggdsf/src/tests/testCMMLParser/testCMMLParser.vcproj
trunk/oggdsf/src/tools/OOOggPageInfo/OOOggPageInfo.cpp
trunk/oggdsf/src/tools/OOOggSeekFileQuery/OOOggSeekFileQuery.vcproj
trunk/oggdsf/src/tools/OOOggStat/OOOggStat.cpp
trunk/oggdsf/src/tools/OOOggValidate/OggValidationState.cpp
Log:
* More warnings killed
Modified: trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
===================================================================
--- trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2005-01-09 08:51:25 UTC (rev 8702)
+++ trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2005-01-09 09:53:20 UTC (rev 8703)
@@ -117,6 +117,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_42F89A4130A36CD4BA74B00F4B424775"
+ "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
"MsmSig" = "8:_UNDEFINED"
@@ -124,7 +130,7 @@
"Entry"
{
"MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_054BE8EA6F5E45A7AB2066734E998570"
+ "OwnerKey" = "8:_A0E68123D9D541DFA9691752981C903A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -202,12 +208,6 @@
"Entry"
{
"MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_A0E68123D9D541DFA9691752981C903A"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_9F87CF49E6BC48AE9DECD5A3F35FEC24"
"MsmSig" = "8:_UNDEFINED"
}
@@ -345,6 +345,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_054BE8EA6F5E45A7AB2066734E998570"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -381,12 +387,6 @@
}
"Entry"
{
- "MsmKey" = "8:_5A4EFEBB52DC88AE0DABDEE219328F5C"
- "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -412,7 +412,7 @@
"Entry"
{
"MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_054BE8EA6F5E45A7AB2066734E998570"
+ "OwnerKey" = "8:_A0E68123D9D541DFA9691752981C903A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -508,12 +508,6 @@
"Entry"
{
"MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_A0E68123D9D541DFA9691752981C903A"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_9F87CF49E6BC48AE9DECD5A3F35FEC24"
"MsmSig" = "8:_UNDEFINED"
}
@@ -663,6 +657,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_054BE8EA6F5E45A7AB2066734E998570"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_81A3CDB604B64763884C387192BE6771"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -729,6 +729,18 @@
}
"Entry"
{
+ "MsmKey" = "8:_B2784574F1B848EABBE013669B46808C"
+ "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_B6A0B75A2A7A47922297CCEFC5F6F6BA"
+ "OwnerKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_B9749E2A902A46BEAE555C07E32980BB"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -955,10 +967,10 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{A582A373-4685-4296-BEFE-614B80A702C3}:_46A378A9B03E4612A645053EDB884C20"
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_42F89A4130A36CD4BA74B00F4B424775"
{
- "SourcePath" = "8:MSVCP71D.dll"
- "TargetName" = "8:MSVCP71D.dll"
+ "SourcePath" = "8:dsfOggDemux.dll"
+ "TargetName" = "8:dsfOggDemux.dll"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
"Condition" = "8:"
@@ -971,14 +983,14 @@
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
- "Exclude" = "11:FALSE"
+ "Exclude" = "11:TRUE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{A582A373-4685-4296-BEFE-614B80A702C3}:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_46A378A9B03E4612A645053EDB884C20"
{
- "SourcePath" = "8:WSOCK32.dll"
- "TargetName" = "8:WSOCK32.dll"
+ "SourcePath" = "8:MSVCP71D.dll"
+ "TargetName" = "8:MSVCP71D.dll"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
"Condition" = "8:"
@@ -991,14 +1003,14 @@
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
- "Exclude" = "11:TRUE"
+ "Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{A582A373-4685-4296-BEFE-614B80A702C3}:_5A4EFEBB52DC88AE0DABDEE219328F5C"
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
{
- "SourcePath" = "8:libFLAC.dll"
- "TargetName" = "8:libFLAC.dll"
+ "SourcePath" = "8:WSOCK32.dll"
+ "TargetName" = "8:WSOCK32.dll"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
"Condition" = "8:"
@@ -1075,6 +1087,46 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_B2784574F1B848EABBE013669B46808C"
+ {
+ "SourcePath" = "8:libFLAC.dll"
+ "TargetName" = "8:libFLAC.dll"
+ "Tag" = "8:"
+ "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:TRUE"
+ "IsDependency" = "11:TRUE"
+ "IsolateTo" = "8:"
+ }
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_B6A0B75A2A7A47922297CCEFC5F6F6BA"
+ {
+ "SourcePath" = "8:libOOOgg.dll"
+ "TargetName" = "8:libOOOgg.dll"
+ "Tag" = "8:"
+ "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:TRUE"
+ "IsDependency" = "11:TRUE"
+ "IsolateTo" = "8:"
+ }
"{A582A373-4685-4296-BEFE-614B80A702C3}:_D9BE90D398094F15B881B22369C3A231"
{
"SourcePath" = "8:..\\..\\VERSIONS"
@@ -1151,7 +1203,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:oggcodecs"
"ProductCode" = "8:{D65F0073-A820-4085-B997-A061171595A7}"
- "PackageCode" = "8:{50255F27-890C-447B-889C-879484843EDF}"
+ "PackageCode" = "8:{4B3706EB-221D-4A69-89C2-A2127C97C646}"
"UpgradeCode" = "8:{1A644FEB-7597-4FAB-AADE-C2C7C64C5984}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.vcproj 2005-01-09 08:51:25 UTC (rev 8702)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.vcproj 2005-01-09 09:53:20 UTC (rev 8703)
@@ -28,7 +28,8 @@
WarningLevel="4"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="4"
- CallingConvention="2"/>
+ CallingConvention="2"
+ DisableSpecificWarnings="4251"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
@@ -89,7 +90,8 @@
WarningLevel="4"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"
- CallingConvention="2"/>
+ CallingConvention="2"
+ DisableSpecificWarnings="4251"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
@@ -153,7 +155,8 @@
WarningLevel="4"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"
- CallingConvention="2"/>
+ CallingConvention="2"
+ DisableSpecificWarnings="4251"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
@@ -217,7 +220,8 @@
WarningLevel="4"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"
- CallingConvention="2"/>
+ CallingConvention="2"
+ DisableSpecificWarnings="4251"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp 2005-01-09 08:51:25 UTC (rev 8702)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp 2005-01-09 09:53:20 UTC (rev 8703)
@@ -173,7 +173,7 @@
debugLog<<"Tag time = "<<locStart<<" - "<<locStop<<endl;
debugLog<<locNarrowStr<<endl<<endl;
- locSample->SetActualDataLength(locNarrowStr.size());
+ locSample->SetActualDataLength((long)locNarrowStr.size());
locSample->SetTime(&locStart, &locStop);
locSample->SetMediaTime(NULL, NULL);
locSample->SetDiscontinuity(FALSE);
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/dsfCMMLRawSource.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/dsfCMMLRawSource.vcproj 2005-01-09 08:51:25 UTC (rev 8702)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/dsfCMMLRawSource.vcproj 2005-01-09 09:53:20 UTC (rev 8703)
@@ -28,7 +28,8 @@
WarningLevel="4"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="4"
- CallingConvention="2"/>
+ CallingConvention="2"
+ DisableSpecificWarnings="4251"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
@@ -79,7 +80,8 @@
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"
- CallingConvention="2"/>
+ CallingConvention="2"
+ DisableSpecificWarnings="4251"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
@@ -133,7 +135,8 @@
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"
- CallingConvention="2"/>
+ CallingConvention="2"
+ DisableSpecificWarnings="4251"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
@@ -187,7 +190,8 @@
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"
- CallingConvention="2"/>
+ CallingConvention="2"
+ DisableSpecificWarnings="4251"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound.vcproj 2005-01-09 08:51:25 UTC (rev 8702)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound.vcproj 2005-01-09 09:53:20 UTC (rev 8703)
@@ -42,7 +42,8 @@
WarningLevel="4"
SuppressStartupBanner="TRUE"
CallingConvention="0"
- CompileAs="0"/>
+ CompileAs="1"
+ DisableSpecificWarnings="4100; 4055; 4244; 4127; 4054"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
@@ -109,7 +110,8 @@
SuppressStartupBanner="TRUE"
DebugInformationFormat="4"
CallingConvention="0"
- CompileAs="0"/>
+ CompileAs="1"
+ DisableSpecificWarnings="4100; 4055; 4244; 4127; 4054"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
@@ -183,7 +185,8 @@
WarningLevel="4"
SuppressStartupBanner="TRUE"
CallingConvention="0"
- CompileAs="0"/>
+ CompileAs="1"
+ DisableSpecificWarnings="4100; 4055; 4244; 4127; 4054"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
@@ -259,7 +262,8 @@
WarningLevel="4"
SuppressStartupBanner="TRUE"
CallingConvention="0"
- CompileAs="0"/>
+ CompileAs="1"
+ DisableSpecificWarnings="4100; 4055; 4244; 4127; 4054"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeOutputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeOutputPin.cpp 2005-01-09 08:51:25 UTC (rev 8702)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeOutputPin.cpp 2005-01-09 09:53:20 UTC (rev 8703)
@@ -59,9 +59,9 @@
if (inPosition == 0) {
WAVEFORMATEX* locWaveFormat = (WAVEFORMATEX*)outMediaType->AllocFormatBuffer(sizeof(WAVEFORMATEX));
locWaveFormat->wFormatTag = WAVE_FORMAT_PCM;
- locWaveFormat->nChannels = ((SpeexDecodeFilter*)m_pFilter)->mSpeexFormatInfo->numChannels;
+ locWaveFormat->nChannels = (WORD)(((SpeexDecodeFilter*)m_pFilter)->mSpeexFormatInfo->numChannels);
locWaveFormat->nSamplesPerSec = ((SpeexDecodeFilter*)m_pFilter)->mSpeexFormatInfo->samplesPerSec;
- locWaveFormat->wBitsPerSample = 16;
+ locWaveFormat->wBitsPerSample = 16; //TODO ::: Is this correct ?
locWaveFormat->nBlockAlign = (locWaveFormat->nChannels) * (locWaveFormat->wBitsPerSample >> 3);
locWaveFormat->nAvgBytesPerSec = ((locWaveFormat->nChannels) * (locWaveFormat->wBitsPerSample >> 3)) * locWaveFormat->nSamplesPerSec;
locWaveFormat->cbSize = 0;
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp 2005-01-09 08:51:25 UTC (rev 8702)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp 2005-01-09 09:53:20 UTC (rev 8703)
@@ -531,7 +531,7 @@
//Skip the top padding
locSourceUptoPtr += (mYOffset * locYStride);
- for (long line = 0; line < mHeight; line++) {
+ for (unsigned long line = 0; line < mHeight; line++) {
memcpy((void*)(locDestUptoPtr), (const void*)(locSourceUptoPtr + mXOffset), mWidth);
locSourceUptoPtr += locYStride;
locDestUptoPtr += mWidth;
@@ -556,7 +556,7 @@
//Skip the top padding
locSourceUptoPtr += ((mYOffset/2) * locYStride);
- for (long line = 0; line < mHeight / 2; line++) {
+ for (unsigned long line = 0; line < mHeight / 2; line++) {
memcpy((void*)(locDestUptoPtr), (const void*)(locSourceUptoPtr + (mXOffset / 2)), mWidth / 2);
locSourceUptoPtr += locUVStride;
locDestUptoPtr += (mWidth / 2);
@@ -580,7 +580,7 @@
//Skip the top padding
locSourceUptoPtr += ((mYOffset/2) * locYStride);
- for (long line = 0; line < mHeight / 2; line++) {
+ for (unsigned long line = 0; line < mHeight / 2; line++) {
memcpy((void*)(locDestUptoPtr), (const void*)(locSourceUptoPtr + (mXOffset / 2)), mWidth / 2);
locSourceUptoPtr += locUVStride;
locDestUptoPtr += (mWidth / 2);
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp 2005-01-09 08:51:25 UTC (rev 8702)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/TheoraEncodeInputPin.cpp 2005-01-09 09:53:20 UTC (rev 8703)
@@ -169,13 +169,13 @@
//Slight optimisation to keep the inner loop tighter
//
//This branch of the condition does exactly the same as the else branch where mXOffset = 0
- for (long line = 0; line < mHeight; line++) {
+ for (unsigned long line = 0; line < mHeight; line++) {
memcpy((void*)locDestUptoPtr, (const void*)locSourceUptoPtr, mWidth);
locSourceUptoPtr += mWidth;
locDestUptoPtr += mWidth;
}
} else {
- for (long line = 0; line < mHeight; line++) {
+ for (unsigned long line = 0; line < mHeight; line++) {
//Pad the start of the line with mXOffset bytes
memset((void*)locDestUptoPtr, NULL, mXOffset);
locDestUptoPtr += mXOffset;
@@ -229,13 +229,13 @@
//Add mHeight/2 lines of data of length mWidth/2 plus padded by mXOffset/2 at each end
if (mXOffset == 0) {
//Slight optimisation to keep the inner loop tighter
- for (long line = 0; line < mHeight / 2; line++) {
+ for (unsigned long line = 0; line < mHeight / 2; line++) {
memcpy((void*)locDestUptoPtr, (const void*)locSourceUptoPtr, mWidth / 2);
locSourceUptoPtr += (mWidth / 2);
locDestUptoPtr += (mWidth / 2);
}
} else {
- for (long line = 0; line < mHeight / 2; line++) {
+ for (unsigned long line = 0; line < mHeight / 2; line++) {
//Pad the start of the line
memset((void*)locDestUptoPtr, NULL, mXOffset / 2);
locDestUptoPtr += (mXOffset / 2);
@@ -289,13 +289,13 @@
//Add mHeight/2 lines of data of length mWidth/2 plus padded by mXOffset/2 at each end
if (mXOffset == 0) {
//Slight optimisation to keep the inner loop tighter
- for (long line = 0; line < mHeight / 2; line++) {
+ for (unsigned long line = 0; line < mHeight / 2; line++) {
memcpy((void*)locDestUptoPtr, (const void*)locSourceUptoPtr, mWidth / 2);
locSourceUptoPtr += (mWidth / 2);
locDestUptoPtr += (mWidth / 2);
}
} else {
- for (long line = 0; line < mHeight / 2; line++) {
+ for (unsigned long line = 0; line < mHeight / 2; line++) {
//Pad the start of the line
memset((void*)locDestUptoPtr, NULL, mXOffset / 2);
locDestUptoPtr += (mXOffset / 2);
@@ -402,13 +402,13 @@
//Add mHeight lines of data of width mWidth plus padding of mXOffset at each end
if (mXOffset == 0) {
//Slight optimisation to keep the inner loop tighter
- for (long line = 0; line < mHeight; line++) {
+ for (unsigned long line = 0; line < mHeight; line++) {
memcpy((void*)locDestUptoPtr, (const void*)locSourceUptoPtr, mWidth);
locSourceUptoPtr += mWidth;
locDestUptoPtr += mWidth;
}
} else {
- for (long line = 0; line < mHeight; line++) {
+ for (unsigned long line = 0; line < mHeight; line++) {
//Pad the start of the line with mXOffset bytes
memset((void*)locDestUptoPtr, NULL, mXOffset);
locDestUptoPtr += mXOffset;
@@ -451,13 +451,13 @@
//Add mHeight/2 lines of data of length mWidth/2 plus padded by mXOffset/2 at each end
if (mXOffset == 0) {
//Slight optimisation to keep the inner loop tighter
- for (long line = 0; line < mHeight / 2; line++) {
+ for (unsigned long line = 0; line < mHeight / 2; line++) {
memcpy((void*)locDestUptoPtr, (const void*)locSourceUptoPtr, mWidth / 2);
locSourceUptoPtr += (mWidth / 2);
locDestUptoPtr += (mWidth / 2);
}
} else {
- for (long line = 0; line < mHeight / 2; line++) {
+ for (unsigned long line = 0; line < mHeight / 2; line++) {
//Pad the start of the line
memset((void*)locDestUptoPtr, NULL, mXOffset / 2);
locDestUptoPtr += (mXOffset / 2);
@@ -504,13 +504,13 @@
//Add mHeight/2 lines of data of length mWidth/2 plus padded by mXOffset/2 at each end
if (mXOffset == 0) {
//Slight optimisation to keep the inner loop tighter
- for (long line = 0; line < mHeight / 2; line++) {
+ for (unsigned long line = 0; line < mHeight / 2; line++) {
memcpy((void*)locDestUptoPtr, (const void*)locSourceUptoPtr, mWidth / 2);
locSourceUptoPtr += (mWidth / 2);
locDestUptoPtr += (mWidth / 2);
}
} else {
- for (long line = 0; line < mHeight / 2; line++) {
+ for (unsigned long line = 0; line < mHeight / 2; line++) {
//Pad the start of the line
memset((void*)locDestUptoPtr, NULL, mXOffset / 2);
locDestUptoPtr += (mXOffset / 2);
@@ -848,7 +848,7 @@
int temp = 0;
//Process 2 lines at a time
- for (int line = 0; line < mHeight; line += 2) {
+ for (unsigned long line = 0; line < mHeight; line += 2) {
//debugLog<<"Encode AYUV To YV12 : ++ Line = "<<line<<endl;
ASSERT (locSourceUptoPtr == (inBuf + (line * (mWidth * PIXEL_BYTE_SIZE))));
@@ -858,7 +858,7 @@
//Columns also done 2 at a time
- for (int col = 0; col < mWidth; col += 2) {
+ for (unsigned long col = 0; col < mWidth; col += 2) {
//debugLog<<"Encode AYUV To YV12 : ++++++ Col = "<<col<<endl;
@@ -1011,7 +1011,7 @@
//After downsampling... from each block of 8, we get 4 y samples and 1 each of u and v
- for (int i = 0; i < mHeight / 2; i++) {
+ for (unsigned long i = 0; i < mHeight / 2; i++) {
//TO DO: Draw memory layouts.
//***Part of the average method... store the pointer to the last of the previous line
@@ -1019,7 +1019,7 @@
//locLastVUpto = locVUpto;
//***
- for (int j = 0; j < mWidth / 2; j++) {
+ for (unsigned long j = 0; j < mWidth / 2; j++) {
*(locYUpto++) = *(locSourceUptoPtr++);
*(locUUpto++) = *(locSourceUptoPtr++);
*(locYUpto++) = *(locSourceUptoPtr++);
@@ -1028,7 +1028,7 @@
//***Drop line method
- for (int j = 0; j < mWidth / 2; j++) {
+ for (unsigned long j = 0; j < mWidth / 2; j++) {
//Ignore the second line
*(locYUpto++) = *(locSourceUptoPtr++);
locSourceUptoPtr++;
@@ -1072,12 +1072,12 @@
//After downsampling... from each block of 8, we get 4 y samples and 1 each of u and v
- for (int i = 0; i < mHeight / 2; i++) {
+ for (unsigned long i = 0; i < mHeight / 2; i++) {
//TO DO: Draw memory layouts.
- for (int j = 0; j < mWidth / 2; j++) {
+ for (unsigned long j = 0; j < mWidth / 2; j++) {
*(locYUpto++) = *(locSourceUptoPtr++); //Y for Yellow
*(locVUpto++) = *(locSourceUptoPtr++); //V for victor
@@ -1087,7 +1087,7 @@
//***Drop line method
- for (int j = 0; j < mWidth / 2; j++) {
+ for (unsigned long j = 0; j < mWidth / 2; j++) {
//Ignore the second line
*(locYUpto++) = *(locSourceUptoPtr++); //Y for Yellow
locSourceUptoPtr++; //V for victor
@@ -1117,11 +1117,11 @@
//After downsampling... from each block of 8, we get 4 y samples and 1 each of u and v
- for (int i = 0; i < mHeight / 2; i++) {
+ for (unsigned long i = 0; i < mHeight / 2; i++) {
//TO DO: Draw memory layouts.
- for (int j = 0; j < mWidth / 2; j++) {
+ for (unsigned long j = 0; j < mWidth / 2; j++) {
*(locUUpto++) = *(locSourceUptoPtr++); //U for Ugly
*(locYUpto++) = *(locSourceUptoPtr++); //Y for Yellow
@@ -1132,7 +1132,7 @@
//***Drop line method
- for (int j = 0; j < mWidth / 2; j++) {
+ for (unsigned long j = 0; j < mWidth / 2; j++) {
//Ignore the second line
locSourceUptoPtr++; //U for ugly
@@ -1348,8 +1348,8 @@
((TheoraEncodeFilter*)mParentFilter)->mTheoraFormatBlock.colourSpace = OC_CS_UNSPECIFIED;
((TheoraEncodeFilter*)mParentFilter)->mTheoraFormatBlock.outerFrameHeight = mTheoraInfo.height;
((TheoraEncodeFilter*)mParentFilter)->mTheoraFormatBlock.outerFrameWidth = mTheoraInfo.width;
- ((TheoraEncodeFilter*)mParentFilter)->mTheoraFormatBlock.xOffset = mXOffset;
- ((TheoraEncodeFilter*)mParentFilter)->mTheoraFormatBlock.yOffset = mYOffset;
+ ((TheoraEncodeFilter*)mParentFilter)->mTheoraFormatBlock.xOffset = (unsigned char)mXOffset;
+ ((TheoraEncodeFilter*)mParentFilter)->mTheoraFormatBlock.yOffset = (unsigned char)mYOffset;
//TODO ::: DO something about aspect ratios
((TheoraEncodeFilter*)mParentFilter)->mTheoraFormatBlock.aspectDenominator = 0;
@@ -1387,9 +1387,6 @@
ConstructCodec();
return CBaseInputPin::SetMediaType(inMediaType);
-
-
- return S_OK;
}
Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeInputPin.cpp 2005-01-09 08:51:25 UTC (rev 8702)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeInputPin.cpp 2005-01-09 09:53:20 UTC (rev 8703)
@@ -83,7 +83,7 @@
mFishSound = fish_sound_new (FISH_SOUND_ENCODE, &mFishInfo);
//Change to fill in vorbis format block so muxer can work
- ((VorbisEncodeFilter*)mParentFilter)->mVorbisFormatBlock.numChannels = mWaveFormat->nChannels;
+ ((VorbisEncodeFilter*)mParentFilter)->mVorbisFormatBlock.numChannels = (unsigned char)mWaveFormat->nChannels;
((VorbisEncodeFilter*)mParentFilter)->mVorbisFormatBlock.samplesPerSec = mWaveFormat->nSamplesPerSec;
//
@@ -176,155 +176,4 @@
return CBaseInputPin::SetMediaType(inMediaType);
-
-
- return S_OK;
-
}
-
-//Old impl
-//************************************
-//#include "stdafx.h"
-//#include "vorbisencodeinputpin.h"
-//
-//VorbisEncodeInputPin::VorbisEncodeInputPin(AbstractAudioEncodeFilter* inParentFilter, CCritSec* inFilterLock, AbstractAudioEncodeOutputPin* inOutputPin)
-// : AbstractAudioEncodeInputPin(inParentFilter, inFilterLock, inOutputPin, NAME("VorbisEncodeInputPin"), L"PCM In")
-// , mFishSound(NULL)
-//{
-//
-//}
-//
-//VorbisEncodeInputPin::~VorbisEncodeInputPin(void)
-//{
-// DestroyCodec();
-//}
-//
-//
-////PURE VIRTUALS
-//long VorbisEncodeInputPin::encodeData(unsigned char* inBuf, long inNumBytes) {
-//
-//
-//
-//
-// float* locFloatBuf = new float[inNumBytes/2];
-// short locTempShort = 0;
-// float locTempFloat = 0;
-//
-// //__int64 locGranPos = 0;
-// //locGranPos = fish_sound_get_frameno(mFishSound);
-// //Removed the hack
-// //fish_sound_command(mFishSound, 7, &locGranPos, sizeof(__int64));
-// //
-//
-// //mUptoFrame = locGranPos;
-// //__int64 locTemp = ((FishSoundVorbisInfo*)mFishSound->codec_data)->vd.pcm_returned;
-// for (int i = 0; i < inNumBytes; i += 2) {
-// locTempShort = *((short*)(inBuf + i));
-// locTempFloat = (float)locTempShort;
-// locTempFloat /= 32767.0;
-// locFloatBuf[i/2] = locTempFloat;;
-// }
-// //FIX::: The 2 is the size of a sample ie 16 bits
-// long locErr = fish_sound_encode(mFishSound, (float**)locFloatBuf, inNumBytes/(mFishInfo.channels*2));
-// delete[] locFloatBuf;
-// //FIX::: Do something here ?
-// if (locErr < 0) {
-//
-// } else {
-//
-// }
-// return locErr;
-//}
-//bool VorbisEncodeInputPin::ConstructCodec() {
-// mFishInfo.channels = mWaveFormat->nChannels;
-// mFishInfo.format = FISH_SOUND_VORBIS;
-// mFishInfo.samplerate = mWaveFormat->nSamplesPerSec;
-//
-// mFishInfo.format = FISH_SOUND_VORBIS;
-// mFishSound = fish_sound_new (FISH_SOUND_ENCODE, &mFishInfo);
-//
-// //Change to fill in vorbis format block so muxer can work
-// ((VorbisEncodeFilter*)mParentFilter)->mVorbisFormatBlock.numChannels = mWaveFormat->nChannels;
-// ((VorbisEncodeFilter*)mParentFilter)->mVorbisFormatBlock.samplesPerSec = mWaveFormat->nSamplesPerSec;
-// //
-//
-// int i = 1;
-// //FIX::: Use new API for interleave setting
-// fish_sound_command(mFishSound, FISH_SOUND_SET_INTERLEAVE, &i, sizeof(int));
-//
-// fish_sound_set_encoded_callback (mFishSound, VorbisEncodeInputPin::VorbisEncoded, this);
-// //FIX::: Proper return value
-// return true;
-//
-//}
-//void VorbisEncodeInputPin::DestroyCodec() {
-// fish_sound_delete(mFishSound);
-// mFishSound = NULL;
-//}
-//
-//
-////Encoded callback
-//int VorbisEncodeInputPin::VorbisEncoded (FishSound* inFishSound, unsigned char* inPacketData, long inNumBytes, void* inThisPointer)
-//{
-//
-// VorbisEncodeInputPin* locThis = reinterpret_cast<VorbisEncodeInputPin*> (inThisPointer);
-// VorbisEncodeFilter* locFilter = reinterpret_cast<VorbisEncodeFilter*>(locThis->m_pFilter);
-//
-//
-// //Time stamps are granule pos not directshow times
-//
-// LONGLONG locFrameStart = locThis->mUptoFrame;
-// LONGLONG locFrameEnd = locThis->mUptoFrame
-// = fish_sound_get_frameno(locThis->mFishSound);
-// //Get a pointer to a new sample stamped with our time
-// IMediaSample* locSample;
-// HRESULT locHR = locThis->mOutputPin->GetDeliveryBuffer(&locSample, &locFrameStart, &locFrameEnd, NULL);
-//
-// if (FAILED(locHR)) {
-// //We get here when the application goes into stop mode usually.
-// return locHR;
-// }
-//
-// BYTE* locBuffer = NULL;
-//
-//
-// //Make our pointers set to point to the samples buffer
-// locSample->GetPointer(&locBuffer);
-//
-//
-//
-// if (locSample->GetSize() >= inNumBytes) {
-//
-// memcpy((void*)locBuffer, (const void*)inPacketData, inNumBytes);
-//
-// //Set the sample parameters.
-// locThis->SetSampleParams(locSample, inNumBytes, &locFrameStart, &locFrameEnd);
-//
-// {
-// CAutoLock locLock(locThis->m_pLock);
-//
-// //Add a reference so it isn't deleted en route.
-// //locSample->AddRef();
-// HRESULT locHR = locThis->mOutputPin->mDataQueue->Receive(locSample); //->DownstreamFilter()->Receive(locSample);
-// if (locHR != S_OK) {
-//
-// } else {
-// }
-// }
-//
-// return 0;
-// } else {
-// throw 0;
-// }
-//}
-//
-//
-//HRESULT VorbisEncodeInputPin::SetMediaType(const CMediaType* inMediaType) {
-// AbstractAudioEncodeInputPin::SetMediaType(inMediaType);
-//
-// ConstructCodec();
-//
-//
-// return S_OK;
-//
-//}
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.cpp 2005-01-09 08:51:25 UTC (rev 8702)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.cpp 2005-01-09 09:53:20 UTC (rev 8703)
@@ -389,9 +389,9 @@
//Flush each stream, then ignore the codec headers.
if (mAnxVersion == ANX_VERSION_2_0) {
//debugLog<<"Flushing stream "<<i<<" for "<<mStreamList[i]->numCodecHeaders() + 1<<endl;
- mStreamList[i]->flush(mStreamList[i]->numCodecHeaders() + 1); //+1 = AnxData Header...
+ mStreamList[i]->flush((unsigned short)(mStreamList[i]->numCodecHeaders() + 1)); //+1 = AnxData Header...
} else {
- mStreamList[i]->flush(mStreamList[i]->numCodecHeaders());
+ mStreamList[i]->flush((unsigned short)(mStreamList[i]->numCodecHeaders()));
}
}
return true;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStreamMapper.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStreamMapper.cpp 2005-01-09 08:51:25 UTC (rev 8702)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStreamMapper.cpp 2005-01-09 09:53:20 UTC (rev 8703)
@@ -130,7 +130,7 @@
if (isReady()) { //CHECK::: Should check for allow dsipatch ???
for (unsigned long i = 0; i < mStreamList.size(); i++) {
//Flush each stream, then ignore the codec headers.
- mStreamList[i]->flush(mStreamList[i]->numCodecHeaders());
+ mStreamList[i]->flush((unsigned short)mStreamList[i]->numCodecHeaders());
}
return true;
} else {
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj 2005-01-09 08:51:25 UTC (rev 8702)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj 2005-01-09 09:53:20 UTC (rev 8703)
@@ -37,7 +37,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Strmbasd.lib Msvcrtd.lib Winmm.lib Strmiids.lib Quartz.lib wsock32.lib shlwapi.lib"
- ShowProgress="2"
+ ShowProgress="0"
OutputFile="$(OutDir)/dsfOggDemux.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""C:\DXSDK\Samples\C++\DirectShow\BaseClasses\Debug""
Modified: trunk/oggdsf/src/tests/testCMMLParser/testCMMLParser.vcproj
===================================================================
--- trunk/oggdsf/src/tests/testCMMLParser/testCMMLParser.vcproj 2005-01-09 08:51:25 UTC (rev 8702)
+++ trunk/oggdsf/src/tests/testCMMLParser/testCMMLParser.vcproj 2005-01-09 09:53:20 UTC (rev 8703)
@@ -28,7 +28,8 @@
WarningLevel="4"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="4"
- CallingConvention="2"/>
+ CallingConvention="2"
+ DisableSpecificWarnings="4251"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
@@ -75,7 +76,8 @@
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"
- CallingConvention="2"/>
+ CallingConvention="2"
+ DisableSpecificWarnings="4251"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Modified: trunk/oggdsf/src/tools/OOOggPageInfo/OOOggPageInfo.cpp
===================================================================
--- trunk/oggdsf/src/tools/OOOggPageInfo/OOOggPageInfo.cpp 2005-01-09 08:51:25 UTC (rev 8702)
+++ trunk/oggdsf/src/tools/OOOggPageInfo/OOOggPageInfo.cpp 2005-01-09 09:53:20 UTC (rev 8703)
@@ -65,7 +65,7 @@
if (locSerialNo == streamSerials[i]) {
locFoundPos = i;
- cout << "Stream "<<i<<" : Granule = "<<inOggPage->header()->GranulePos()<<" - ";
+ cout << "Stream "<<(unsigned long)i<<" : Granule = "<<inOggPage->header()->GranulePos()<<" - ";
locNumPacks = 0;
if (inOggPage->numPackets() == 0) {
cout<<"EMPTY PAGE"<<endl;
@@ -152,7 +152,7 @@
cout<<endl;
for (size_t i = 0; i < maxPacks.size(); i++) {
- cout<<"Stream "<<i<<" max Packets = "<<*maxPacks[i]<<endl;
+ cout<<"Stream "<<(unsigned long)i<<" max Packets = "<<*maxPacks[i]<<endl;
}
Modified: trunk/oggdsf/src/tools/OOOggSeekFileQuery/OOOggSeekFileQuery.vcproj
===================================================================
--- trunk/oggdsf/src/tools/OOOggSeekFileQuery/OOOggSeekFileQuery.vcproj 2005-01-09 08:51:25 UTC (rev 8702)
+++ trunk/oggdsf/src/tools/OOOggSeekFileQuery/OOOggSeekFileQuery.vcproj 2005-01-09 09:53:20 UTC (rev 8703)
@@ -28,7 +28,8 @@
WarningLevel="4"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="4"
- CallingConvention="2"/>
+ CallingConvention="2"
+ DisableSpecificWarnings="4251"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
@@ -75,7 +76,8 @@
WarningLevel="4"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"
- CallingConvention="2"/>
+ CallingConvention="2"
+ DisableSpecificWarnings="4251"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Modified: trunk/oggdsf/src/tools/OOOggStat/OOOggStat.cpp
===================================================================
--- trunk/oggdsf/src/tools/OOOggStat/OOOggStat.cpp 2005-01-09 08:51:25 UTC (rev 8702)
+++ trunk/oggdsf/src/tools/OOOggStat/OOOggStat.cpp 2005-01-09 09:53:20 UTC (rev 8703)
@@ -45,7 +45,7 @@
unsigned long streamNo;
-bool pageCB(OggPage* inOggPage, void *inUserData /* ignored */)
+bool pageCB(OggPage* inOggPage, void* /* inUserData ignored */)
{
if ((inOggPage->numPackets() > 0) && (inOggPage->header()->isBOS())) {
streamNo++;
Modified: trunk/oggdsf/src/tools/OOOggValidate/OggValidationState.cpp
===================================================================
--- trunk/oggdsf/src/tools/OOOggValidate/OggValidationState.cpp 2005-01-09 08:51:25 UTC (rev 8702)
+++ trunk/oggdsf/src/tools/OOOggValidate/OggValidationState.cpp 2005-01-09 09:53:20 UTC (rev 8703)
@@ -33,7 +33,7 @@
return retStream;
}
unsigned long OggValidationState::numStreams() {
- return mStreams.size();
+ return (unsigned long)mStreams.size();
}
OggStreamValidationState* OggValidationState::getStream(unsigned long inIndex) {
@@ -91,7 +91,7 @@
if (mStreams.size() != 0) {
mIsValid = true;
- for (int i = 0; i < mStreams.size(); i++) {
+ for (size_t i = 0; i < mStreams.size(); i++) {
mIsValid &= (mStreams[i]->mState == OggStreamValidationState::VS_FULLY_VALID);
}
}
@@ -278,7 +278,7 @@
if (inOggPage->getPacket(inOggPage->numPackets() - 1)->isTruncated() == true) {
//Valid case
//If the last packet is incomplete.
- if (OggStreamValidationState::VS_SEEN_BOS) {
+ if (OggStreamValidationState::VS_SEEN_BOS) { //TODO::: Bug ????
//...And we've seen a BOS page
//Now we wait for the continuation
More information about the commits
mailing list