[xiph-cvs] r6743 - in trunk/oggdsf/src/lib: codecs/flac/libs/libflac/src/libFLAC/Debug_dynamic codecs/flac/libs/libflac/src/libFLAC/Release_dynamic codecs/flac/libs/libflac/src/libFLAC++/Debug_dynamic codecs/flac/libs/libflac/src/libFLAC++/Release_dynamic codecs/helper/libfishsound/win32 codecs/speex/filters/dsfSpeexDecoder codecs/vorbis/filters/dsfVorbisDecoder codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Debug codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Release core/directshow/dsfAbstractAudioDecoder core/directshow/dsfAbstractVideoDecoder core/directshow/dsfOggDemux core/directshow/dsfSeeking core/ogg/libOOOggSeek core/ogg/libogg/win32/Dynamic_Debug core/ogg/libogg/win32/Dynamic_Release
illiminable at xiph.org
illiminable at xiph.org
Fri May 21 11:45:30 PDT 2004
Author: illiminable
Date: 2004-05-21 14:45:28 -0400 (Fri, 21 May 2004)
New Revision: 6743
Modified:
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Debug_dynamic/BuildLog.htm
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Release_dynamic/BuildLog.htm
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Debug_dynamic/BuildLog.htm
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Release_dynamic/BuildLog.htm
trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound.exp
trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeInputPin.cpp
trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.cpp
trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h
trunk/oggdsf/src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Debug/BuildLog.htm
trunk/oggdsf/src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Release/BuildLog.htm
trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.h
trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/SpeexStream.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.cpp
trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.cpp
trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.h
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.h
trunk/oggdsf/src/lib/core/ogg/libogg/win32/Dynamic_Debug/BuildLog.htm
trunk/oggdsf/src/lib/core/ogg/libogg/win32/Dynamic_Release/BuildLog.htm
Log:
Oooops.... left a ton of debug code.
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Debug_dynamic/BuildLog.htm
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Debug_dynamic/BuildLog.htm 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Debug_dynamic/BuildLog.htm 2004-05-21 18:45:28 UTC (rev 6743)
@@ -46,12 +46,12 @@
VSCOMNTOOLS="C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\"
windir=C:\WINDOWS
_ACP_ATLPROV=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin\ATLPROV.DLL
- _ACP_INCLUDE=..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
- _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_INCLUDE="C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\dsfAbstractAudioDecoder;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;..\libOOOgg;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
_ACP_PATH=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\tools;C:\Program Files\Microsoft Visual Studio .NET\Common7\ide;C:\Program Files\HTML Help Workshop\;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\bin;C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\ATI Technologies\ATI Control Panel
</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
Command Lines
-</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre>Creating temporary file "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\BAT0000A8.bat" with contents
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre>Creating temporary file "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\BAT000003.bat" with contents
[
@echo off
echo on
@@ -63,8 +63,8 @@
exit 1
:VCEnd
]
-Creating command line "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\BAT0000A8.bat"
-Creating temporary file "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP0000A9.rsp" with contents
+Creating command line "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\BAT000003.bat"
+Creating temporary file "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP000004.rsp" with contents
[
/Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "FLAC_API_EXPORTS" /D "VERSION=\"1.1.0\"" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "_WINDOWS" /D "WIN32" /D "_USRDLL" /D "_WINDLL" /FD /EHsc /MDd /GR /Fp".\Debug_dynamic/libFLAC_dynamic.pch" /Fo".\Debug_dynamic/" /Fd".\Debug_dynamic/" /FR".\Debug_dynamic/" /W3 /c /ZI /Gd
stream_encoder_framing.c
@@ -86,8 +86,8 @@
bitmath.c
bitbuffer.c
]
-Creating command line "cl.exe @C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP0000A9.rsp /nologo"
-Creating temporary file "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP0000AA.rsp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP000004.rsp /nologo"
+Creating temporary file "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP000005.rsp" with contents
[
/OUT:"..\..\obj\debug\bin/libFLAC.dll" /INCREMENTAL /NOLOGO /DLL /DEBUG /PDB:".\..\..\obj\debug\lib/libFLAC.pdb" /SUBSYSTEM:WINDOWS /IMPLIB:".\..\..\obj\debug\lib/libFLAC.lib" /MACHINE:I386 odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
Debug_dynamic\bitbuffer.obj
@@ -112,7 +112,7 @@
ia32\fixed_asm.obj
ia32\lpc_asm.obj
]
-Creating command line "link.exe @C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP0000AA.rsp"
+Creating command line "link.exe @C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP000005.rsp"
</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
Output Window
</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre>Performing Custom Build Step
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Release_dynamic/BuildLog.htm
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Release_dynamic/BuildLog.htm 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Release_dynamic/BuildLog.htm 2004-05-21 18:45:28 UTC (rev 6743)
@@ -46,12 +46,12 @@
VSCOMNTOOLS="C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\"
windir=C:\WINDOWS
_ACP_ATLPROV=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin\ATLPROV.DLL
- _ACP_INCLUDE="C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
- _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;..\..\..\..\core\ogg\libOOOgg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_INCLUDE="C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\dsfAbstractAudioDecoder;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;..\libOOOgg;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
_ACP_PATH=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\tools;C:\Program Files\Microsoft Visual Studio .NET\Common7\ide;C:\Program Files\HTML Help Workshop\;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\bin;C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\ATI Technologies\ATI Control Panel
</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
Command Lines
-</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre>Creating temporary file "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\BAT00004D.bat" with contents
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre>Creating temporary file "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\BAT000021.bat" with contents
[
@echo off
echo on
@@ -63,8 +63,8 @@
exit 1
:VCEnd
]
-Creating command line "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\BAT00004D.bat"
-Creating temporary file "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP00004E.rsp" with contents
+Creating command line "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\BAT000021.bat"
+Creating temporary file "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP000022.rsp" with contents
[
/Ox /Og /Ob2 /Oi /Ot /GL /G6 /I ".\include" /I "..\..\include" /D "NDEBUG" /D "FLAC_API_EXPORTS" /D "VERSION=\"1.1.0\"" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "_WINDOWS" /D "WIN32" /D "_USRDLL" /D "_WINDLL" /GF /FD /EHsc /MD /Gy /GR /Fp".\Release_dynamic/libFLAC_dynamic.pch" /Fo".\Release_dynamic/" /Fd".\Release_dynamic/" /FR".\Release_dynamic/" /W3 /c /Gd
stream_encoder_framing.c
@@ -86,8 +86,8 @@
bitmath.c
bitbuffer.c
]
-Creating command line "cl.exe @C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP00004E.rsp /nologo"
-Creating temporary file "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP00004F.rsp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP000022.rsp /nologo"
+Creating temporary file "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP000023.rsp" with contents
[
/OUT:"..\..\obj\release\bin/libFLAC.dll" /INCREMENTAL:NO /NOLOGO /DLL /PDB:".\..\..\obj\release\lib/libFLAC.pdb" /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /OPT:NOWIN98 /LTCG /IMPLIB:".\..\..\obj\release\lib/libFLAC.lib" /MACHINE:I386 odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
Release_dynamic\bitbuffer.obj
@@ -112,7 +112,7 @@
ia32\fixed_asm.obj
ia32\lpc_asm.obj
]
-Creating command line "link.exe @C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP00004F.rsp"
+Creating command line "link.exe @C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP000023.rsp"
</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
Output Window
</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre>Performing Custom Build Step
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Debug_dynamic/BuildLog.htm
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Debug_dynamic/BuildLog.htm 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Debug_dynamic/BuildLog.htm 2004-05-21 18:45:28 UTC (rev 6743)
@@ -46,8 +46,8 @@
VSCOMNTOOLS="C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\"
windir=C:\WINDOWS
_ACP_ATLPROV=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin\ATLPROV.DLL
- _ACP_INCLUDE=..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
- _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_INCLUDE="C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\dsfAbstractAudioDecoder;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;..\libOOOgg;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
_ACP_PATH=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\tools;C:\Program Files\Microsoft Visual Studio .NET\Common7\ide;C:\Program Files\HTML Help Workshop\;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\bin;C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\ATI Technologies\ATI Control Panel
</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
Command Lines
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Release_dynamic/BuildLog.htm
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Release_dynamic/BuildLog.htm 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Release_dynamic/BuildLog.htm 2004-05-21 18:45:28 UTC (rev 6743)
@@ -46,12 +46,12 @@
VSCOMNTOOLS="C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\"
windir=C:\WINDOWS
_ACP_ATLPROV=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin\ATLPROV.DLL
- _ACP_INCLUDE="C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
- _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;..\..\..\..\core\ogg\libOOOgg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_INCLUDE="C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\dsfAbstractAudioDecoder;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;..\libOOOgg;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
_ACP_PATH=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\tools;C:\Program Files\Microsoft Visual Studio .NET\Common7\ide;C:\Program Files\HTML Help Workshop\;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\bin;C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\ATI Technologies\ATI Control Panel
</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
Command Lines
-</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre>Creating temporary file "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP000050.rsp" with contents
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre>Creating temporary file "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP00002A.rsp" with contents
[
/OUT:"..\..\obj\release\bin/libFLAC++.dll" /INCREMENTAL:NO /NOLOGO /DLL /PDB:".\..\..\obj\release\lib/libFLAC++.pdb" /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /OPT:NOWIN98 /LTCG /IMPLIB:".\..\..\obj\release\lib/libFLAC++.lib" /MACHINE:I386 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "\Dev\oggdsf\src\lib\codecs\flac\libs\libflac\obj\release\lib\libFLAC.lib"
"Release_dynamic\file_decoder.obj"
@@ -62,7 +62,7 @@
"Release_dynamic\stream_decoder.obj"
"Release_dynamic\stream_encoder.obj"
]
-Creating command line "link.exe @C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP000050.rsp"
+Creating command line "link.exe @C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP00002A.rsp"
</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
Output Window
</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre>Linking...
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound.exp
===================================================================
(Binary files differ)
Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeInputPin.cpp 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeInputPin.cpp 2004-05-21 18:45:28 UTC (rev 6743)
@@ -116,11 +116,11 @@
REFERENCE_TIME locFrameEnd = locTimeBase + (((__int64)(locThis->mUptoFrame * UNITS)) / locThis->mSampleRate);
- locThis->aadDebug<<"Last Seen : " <<locThis->mLastSeenStartGranPos<<endl;
- locThis->aadDebug<<"Last Seen : " << locThis->mLastSeenStartGranPos<<endl;
- locThis->aadDebug<<"Time Base : " << locTimeBase << endl;
- locThis->aadDebug<<"FrameCount : " <<locThis->mUptoFrame<<endl;
- locThis->aadDebug<<"Seek TB : " <<locThis->mSeekTimeBase<<endl;
+ //locThis->aadDebug<<"Last Seen : " <<locThis->mLastSeenStartGranPos<<endl;
+ //locThis->aadDebug<<"Last Seen : " << locThis->mLastSeenStartGranPos<<endl;
+ //locThis->aadDebug<<"Time Base : " << locTimeBase << endl;
+ //locThis->aadDebug<<"FrameCount : " <<locThis->mUptoFrame<<endl;
+ //locThis->aadDebug<<"Seek TB : " <<locThis->mSeekTimeBase<<endl;
//TO DO::: Move this somewhere else
unsigned long locActualSize = inFrames * locThis->mFrameSize;
Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.cpp 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.cpp 2004-05-21 18:45:28 UTC (rev 6743)
@@ -39,7 +39,7 @@
mBegun(false)
{
- debugLog.open("C:\\vorbislog.log", ios_base::out);
+ //debugLog.open("C:\\vorbislog.log", ios_base::out);
ConstructCodec();
}
@@ -70,7 +70,7 @@
}
VorbisDecodeInputPin::~VorbisDecodeInputPin(void)
{
- debugLog.close();
+ //debugLog.close();
DestroyCodec();
}
@@ -110,11 +110,11 @@
//Start time hacks
REFERENCE_TIME locTimeBase = ((locThis->mLastSeenStartGranPos * UNITS) / locThis->mSampleRate) - locThis->mSeekTimeBase;
- locThis->aadDebug<<"Last Seen : " <<locThis->mLastSeenStartGranPos<<endl;
- locThis->debugLog<<"Last Seen : " << locThis->mLastSeenStartGranPos<<endl;
- locThis->debugLog<<"Time Base : " << locTimeBase << endl;
- locThis->debugLog<<"FrameCount : " <<locThis->mUptoFrame<<endl;
- locThis->debugLog<<"Seek TB : " <<locThis->mSeekTimeBase<<endl;
+ //locThis->aadDebug<<"Last Seen : " <<locThis->mLastSeenStartGranPos<<endl;
+ //locThis->debugLog<<"Last Seen : " << locThis->mLastSeenStartGranPos<<endl;
+ //locThis->debugLog<<"Time Base : " << locTimeBase << endl;
+ //locThis->debugLog<<"FrameCount : " <<locThis->mUptoFrame<<endl;
+ //locThis->debugLog<<"Seek TB : " <<locThis->mSeekTimeBase<<endl;
//Temp - this will break seeking
REFERENCE_TIME locFrameStart = locTimeBase + (((__int64)(locThis->mUptoFrame * UNITS)) / locThis->mSampleRate);
@@ -126,9 +126,9 @@
REFERENCE_TIME locFrameEnd = locTimeBase + (((__int64)(locThis->mUptoFrame * UNITS)) / locThis->mSampleRate);
- locThis->debugLog<<"Start : "<<locFrameStart<<endl;
- locThis->debugLog<<"End : "<<locFrameEnd<<endl;
- locThis->debugLog<<"=================================================="<<endl;
+ //locThis->debugLog<<"Start : "<<locFrameStart<<endl;
+ //locThis->debugLog<<"End : "<<locFrameEnd<<endl;
+ //locThis->debugLog<<"=================================================="<<endl;
IMediaSample* locSample;
HRESULT locHR = locThis->mOutputPin->GetDeliveryBuffer(&locSample, &locFrameStart, &locFrameEnd, NULL);
@@ -200,14 +200,14 @@
long VorbisDecodeInputPin::decodeData(BYTE* inBuf, long inNumBytes)
{
- debugLog << "Decode called... Last Gran Pos : "<<mLastSeenStartGranPos<<endl;
+ //debugLog << "Decode called... Last Gran Pos : "<<mLastSeenStartGranPos<<endl;
DbgLog((LOG_TRACE,1,TEXT("decodeData")));
long locErr = fish_sound_decode(mFishSound, inBuf, inNumBytes);
//FIX::: Do something here ?
if (locErr < 0) {
- debugLog <<"** Fish Sound error **"<<endl;
+ //debugLog <<"** Fish Sound error **"<<endl;
} else {
- debugLog << "Fish Sound OK >=0 "<<endl;
+ //debugLog << "Fish Sound OK >=0 "<<endl;
}
return locErr;
}
Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h 2004-05-21 18:45:28 UTC (rev 6743)
@@ -97,7 +97,7 @@
//VorbisDecodeOutputPin* mOutputPin;
//__int64 mUptoFrame;
- fstream debugLog;
+ //fstream debugLog;
FishSound* mFishSound;
FishSoundInfo mFishInfo;
Modified: trunk/oggdsf/src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Debug/BuildLog.htm
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Debug/BuildLog.htm 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Debug/BuildLog.htm 2004-05-21 18:45:28 UTC (rev 6743)
@@ -46,8 +46,8 @@
VSCOMNTOOLS="C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\"
windir=C:\WINDOWS
_ACP_ATLPROV=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin\ATLPROV.DLL
- _ACP_INCLUDE=..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
- _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_INCLUDE="C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\dsfAbstractAudioDecoder;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;..\libOOOgg;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
_ACP_PATH=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\tools;C:\Program Files\Microsoft Visual Studio .NET\Common7\ide;C:\Program Files\HTML Help Workshop\;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\bin;C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\ATI Technologies\ATI Control Panel
</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
Command Lines
Modified: trunk/oggdsf/src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Release/BuildLog.htm
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Release/BuildLog.htm 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Release/BuildLog.htm 2004-05-21 18:45:28 UTC (rev 6743)
@@ -46,8 +46,8 @@
VSCOMNTOOLS="C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\"
windir=C:\WINDOWS
_ACP_ATLPROV=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin\ATLPROV.DLL
- _ACP_INCLUDE="C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
- _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;..\..\..\..\core\ogg\libOOOgg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_INCLUDE="C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\dsfAbstractAudioDecoder;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;..\libOOOgg;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
_ACP_PATH=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\tools;C:\Program Files\Microsoft Visual Studio .NET\Common7\ide;C:\Program Files\HTML Help Workshop\;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\bin;C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\ATI Technologies\ATI Control Panel
</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
Command Lines
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.cpp 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.cpp 2004-05-21 18:45:28 UTC (rev 6743)
@@ -46,7 +46,7 @@
, mLastSeenStartGranPos(0)
{
//ConstructCodec();
- aadDebug.open("c:\\aadec.log", ios_base::out);
+ //aadDebug.open("c:\\aadec.log", ios_base::out);
mAcceptableMediaType = inAcceptMediaType;
mStreamLock = new CCritSec;
IMediaSeeking* locSeeker = NULL;
@@ -77,7 +77,7 @@
AbstractAudioDecodeInputPin::~AbstractAudioDecodeInputPin(void)
{
//DestroyCodec();
- aadDebug.close();
+ //aadDebug.close();
delete mStreamLock;
}
@@ -118,7 +118,7 @@
REFERENCE_TIME locEnd = 0;
inSample->GetTime(&locStart, &locEnd);
//Error chacks needed here
- aadDebug<<"Receive : Start = "<<locStart<<endl;
+ //aadDebug<<"Receive : Start = "<<locStart<<endl;
if (mLastSeenStartGranPos != locStart) {
ResetFrameCount();
}
@@ -128,10 +128,10 @@
long locResult = decodeData(locBuff, inSample->GetActualDataLength());
if (locResult == 0) {
- aadDebug<<"Receive Decode : OK"<<endl;
+ //aadDebug<<"Receive Decode : OK"<<endl;
return S_OK;
} else {
- aadDebug<<"Receive Decode : *** FAILED *** "<<locResult<<endl;
+ //aadDebug<<"Receive Decode : *** FAILED *** "<<locResult<<endl;
return S_FALSE;
}
}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.h 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.h 2004-05-21 18:45:28 UTC (rev 6743)
@@ -96,7 +96,7 @@
AbstractAudioDecodeFilter* mParentFilter;
CMediaType* mAcceptableMediaType;
- fstream aadDebug;
+ //fstream aadDebug;
CCritSec* mStreamLock;
CCritSec* mFilterLock;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.cpp 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.cpp 2004-05-21 18:45:28 UTC (rev 6743)
@@ -37,11 +37,11 @@
mParentFilter(inParentFilter)
, mDataQueue(NULL)
{
- debugLog.open("g:\\logs\\absvidlog.log", ios_base::out|ios_base::binary);
+ //debugLog.open("g:\\logs\\absvidlog.log", ios_base::out|ios_base::binary);
}
AbstractVideoDecodeOutputPin::~AbstractVideoDecodeOutputPin(void)
{
- debugLog.close();
+ //debugLog.close();
delete mDataQueue;
}
@@ -150,14 +150,14 @@
}
HRESULT AbstractVideoDecodeOutputPin::CheckMediaType(const CMediaType *inMediaType) {
if ((inMediaType->majortype == MEDIATYPE_Video) && (inMediaType->subtype == MEDIASUBTYPE_YV12) && (inMediaType->formattype == FORMAT_VideoInfo)) {
- debugLog << "CheckMediaType : Accepting..."<<endl;
+ //debugLog << "CheckMediaType : Accepting..."<<endl;
VIDEOINFOHEADER* locVideoHeader = (VIDEOINFOHEADER*)inMediaType->Format();
- debugLog << "CheckMediaType : Height = " << locVideoHeader->bmiHeader.biHeight<<endl;
- debugLog << "CheckMediaType : Width = " << locVideoHeader->bmiHeader.biWidth<<endl<<endl;
+ //debugLog << "CheckMediaType : Height = " << locVideoHeader->bmiHeader.biHeight<<endl;
+ //debugLog << "CheckMediaType : Width = " << locVideoHeader->bmiHeader.biWidth<<endl<<endl;
- debugLog << "CheckMediaType : mHeight was = " << mParentFilter->mInputPin->mHeight<<endl;
- debugLog << "CheckMediaType : mWidth was = " << mParentFilter->mInputPin->mWidth<<endl<<endl;
+ //debugLog << "CheckMediaType : mHeight was = " << mParentFilter->mInputPin->mHeight<<endl;
+ //debugLog << "CheckMediaType : mWidth was = " << mParentFilter->mInputPin->mWidth<<endl<<endl;
mParentFilter->mInputPin->mHeight = (unsigned long)abs(locVideoHeader->bmiHeader.biHeight);
mParentFilter->mInputPin->mWidth = (unsigned long)abs(locVideoHeader->bmiHeader.biWidth);
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.h 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.h 2004-05-21 18:45:28 UTC (rev 6743)
@@ -70,7 +70,7 @@
AbstractVideoDecodeFilter* mParentFilter;
void FillMediaType(CMediaType* inMediaType);
- fstream debugLog;
+ //fstream debugLog;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.cpp 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.cpp 2004-05-21 18:45:28 UTC (rev 6743)
@@ -42,12 +42,12 @@
, mGranuleOffset(0)
{
InitCodec(inBOSPage->getStampedPacket(0));
- debugLog.open("g:\\downloads\\ffd_dump.out", ios_base::out|ios_base::binary);
+ //debugLog.open("g:\\downloads\\ffd_dump.out", ios_base::out|ios_base::binary);
}
FFDShowVideoStream::~FFDShowVideoStream(void)
{
- debugLog.close();
+ //debugLog.close();
delete mFFDShowVideoFormatBlock;
}
@@ -204,7 +204,7 @@
mLastTimeStamp = (locEnd >= mLastTimeStamp) ? locEnd
: mLastTimeStamp;
- debugLog << "Packet : Start = "<<locStart<<" - End = "<<locEnd<<endl;
+ //debugLog << "Packet : Start = "<<locStart<<" - End = "<<locEnd<<endl;
StampedOggPacket* locPack = new StampedOggPacket(locBuff, inPacket->packetSize() - 1, true, locStart, locEnd, StampedOggPacket::DIRECTSHOW);
return OggStream::dispatchPacket(locPack);
}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.h 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.h 2004-05-21 18:45:28 UTC (rev 6743)
@@ -65,5 +65,5 @@
//LONGLONG mLastGranulePos;
LONGLONG mGranuleOffset;
- fstream debugLog;
+ //fstream debugLog;
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp 2004-05-21 18:45:28 UTC (rev 6743)
@@ -90,8 +90,8 @@
mDemuxLock = new CCritSec;
mStreamLock = new CCritSec;
mStreamMapper = new OggStreamMapper(this);
- debugLog.open("C:\\TEMP\\sourcelog.log", ios_base::out|ios_base::binary);
- debugLog << "**************** Starting LOg ********************"<<endl;
+ //debugLog.open("C:\\TEMP\\sourcelog.log", ios_base::out|ios_base::binary);
+ //debugLog << "**************** Starting LOg ********************"<<endl;
}
@@ -128,7 +128,7 @@
CAutoLock locLock(m_pLock);
mFileName = inFileName;
- debugLog << "Opening source file : "<<StringHelper::toNarrowStr(mFileName)<<endl;
+ //debugLog << "Opening source file : "<<StringHelper::toNarrowStr(mFileName)<<endl;
mSeekTable = new AutoOggSeekTable(StringHelper::toNarrowStr(mFileName));
mSeekTable->buildTable();
@@ -137,7 +137,7 @@
STDMETHODIMP OggDemuxSourceFilter::GetCapabilities(DWORD* inCapabilities) {
if (mSeekTable->enabled()) {
- debugLog<<"GetCaps "<<mSeekingCap<<endl;
+ //debugLog<<"GetCaps "<<mSeekingCap<<endl;
*inCapabilities = mSeekingCap;
return S_OK;
} else {
@@ -147,7 +147,7 @@
}
STDMETHODIMP OggDemuxSourceFilter::GetDuration(LONGLONG* outDuration) {
if (mSeekTable->enabled()) {
- debugLog<<"GetDuration = " << mSeekTable->fileDuration()<<" ds units"<<endl;
+ //debugLog<<"GetDuration = " << mSeekTable->fileDuration()<<" ds units"<<endl;
*outDuration = mSeekTable->fileDuration();
return S_OK;
} else {
@@ -161,28 +161,28 @@
STDMETHODIMP OggDemuxSourceFilter::CheckCapabilities(DWORD *pCapabilities){
- debugLog<<"CheckCaps : Not imp"<<endl;
+ //debugLog<<"CheckCaps : Not imp"<<endl;
return E_NOTIMPL;
}
STDMETHODIMP OggDemuxSourceFilter::IsFormatSupported(const GUID *pFormat){
ASSERT(pFormat != NULL);
if (*pFormat == TIME_FORMAT_MEDIA_TIME) {
- debugLog<<"IsFormatSupported : TRUE"<<endl;
+ //debugLog<<"IsFormatSupported : TRUE"<<endl;
return S_OK;
} else {
- debugLog<<"IsFormatSupported : FALSE !!!"<<endl;
+ //debugLog<<"IsFormatSupported : FALSE !!!"<<endl;
return S_FALSE;
}
}
STDMETHODIMP OggDemuxSourceFilter::QueryPreferredFormat(GUID *pFormat){
- debugLog<<"QueryPrefferedTimeFormat : MEDIA TIME"<<endl;
+ //debugLog<<"QueryPrefferedTimeFormat : MEDIA TIME"<<endl;
*pFormat = TIME_FORMAT_MEDIA_TIME;
return S_OK;
}
STDMETHODIMP OggDemuxSourceFilter::SetTimeFormat(const GUID *pFormat){
- debugLog<<"SetTimeForamt : NOT IMPL"<<endl;
+ //debugLog<<"SetTimeForamt : NOT IMPL"<<endl;
return E_NOTIMPL;
}
STDMETHODIMP OggDemuxSourceFilter::GetTimeFormat( GUID *pFormat){
@@ -192,7 +192,7 @@
STDMETHODIMP OggDemuxSourceFilter::GetStopPosition(LONGLONG *pStop){
if (mSeekTable->enabled()) {
- debugLog<<"GetStopPos = " << mSeekTable->fileDuration()<<" ds units"<<endl;
+ //debugLog<<"GetStopPos = " << mSeekTable->fileDuration()<<" ds units"<<endl;
*pStop = mSeekTable->fileDuration();
return S_OK;
} else {
@@ -201,12 +201,12 @@
}
STDMETHODIMP OggDemuxSourceFilter::GetCurrentPosition(LONGLONG *pCurrent){
- debugLog <<"GetCurrPos = HARD CODED = 6 secs"<< endl;
+ //debugLog <<"GetCurrPos = HARD CODED = 6 secs"<< endl;
*pCurrent = 6 * UNITS;
return S_OK;
}
STDMETHODIMP OggDemuxSourceFilter::ConvertTimeFormat(LONGLONG *pTarget, const GUID *pTargetFormat, LONGLONG Source, const GUID *pSourceFormat){
- debugLog<<"ConvertTimeForamt : NOT IMPL"<<endl;
+ //debugLog<<"ConvertTimeForamt : NOT IMPL"<<endl;
return E_NOTIMPL;
}
STDMETHODIMP OggDemuxSourceFilter::SetPositions(LONGLONG *pCurrent,DWORD dwCurrentFlags,LONGLONG *pStop,DWORD dwStopFlags){
@@ -215,8 +215,8 @@
CAutoLock locLock(m_pLock);
if (mSeekTable->enabled()) {
- debugLog<<"SetPos : Current = "<<*pCurrent<<" Flags = "<<dwCurrentFlags<<" Stop = "<<*pStop<<" dwStopFlags = "<<dwStopFlags<<endl;
- debugLog<<" : Delivering begin flush..."<<endl;
+ //debugLog<<"SetPos : Current = "<<*pCurrent<<" Flags = "<<dwCurrentFlags<<" Stop = "<<*pStop<<" dwStopFlags = "<<dwStopFlags<<endl;
+ //debugLog<<" : Delivering begin flush..."<<endl;
CAutoLock locSourceLock(mSourceFileLock);
@@ -224,8 +224,8 @@
DeliverBeginFlush();
- debugLog<<" : Begin flush Delviered."<<endl;
- debugLog<<" : Delivering new segemnt"<<endl;
+ //debugLog<<" : Begin flush Delviered."<<endl;
+ //debugLog<<" : Delivering new segemnt"<<endl;
//FIX ATTEMPT::: Part of time stamping fixes.. we don't use absolute times any more... this is out !
@@ -239,40 +239,40 @@
//END FIX
- debugLog<<" : NewSegment Delviered."<<endl;
+ //debugLog<<" : NewSegment Delviered."<<endl;
unsigned long locStartPos = mSeekTable->getStartPos(*pCurrent);
bool locSendExcess = false;
if (locStartPos == mStreamMapper->startOfData()) {
locSendExcess = true;
}
- debugLog<<" : Seeking to position "<<mSeekTable->getStartPos(*pCurrent)<<endl;
+ //debugLog<<" : Seeking to position "<<mSeekTable->getStartPos(*pCurrent)<<endl;
{
CAutoLock locDemuxLock(mDemuxLock);
mOggBuffer.clearData();
}
- debugLog << "Setting GranPos : "<<mSeekTable->getRealStartPos()<<endl;
+ //debugLog << "Setting GranPos : "<<mSeekTable->getRealStartPos()<<endl;
for (unsigned long i = 0; i < mStreamMapper->numStreams(); i++) {
mStreamMapper->getOggStream(i)->setSendExcess(locSendExcess);
mStreamMapper->getOggStream(i)->setLastEndGranPos(mSeekTable->getRealStartPos());
}
{
CAutoLock locStreamLock(mStreamLock);
- debugLog<<" : Delivering End Flush..."<<endl;
+ //debugLog<<" : Delivering End Flush..."<<endl;
DeliverEndFlush();
- debugLog<<" : End flush Delviered."<<endl;
+ //debugLog<<" : End flush Delviered."<<endl;
DeliverNewSegment(*pCurrent, *pCurrent + mSeekTable->fileDuration(), 1.0);
}
mSourceFile.seekg(mSeekTable->getStartPos(*pCurrent), ios_base::beg);
*pCurrent = mSeekTable->getRealStartPos();
- debugLog<<" : Seek complete."<<endl;
- debugLog<<" : Notifying whether to send excess... ";
+ //debugLog<<" : Seek complete."<<endl;
+ //debugLog<<" : Notifying whether to send excess... ";
if (locSendExcess) {
- debugLog<<"YES"<<endl;
+ //debugLog<<"YES"<<endl;
} else {
- debugLog<<"NO"<<endl;
+ //debugLog<<"NO"<<endl;
}
//debugLog << "Setting GranPos : "<<mSeekTable->getRealStartPos()<<endl;
//for (unsigned long i = 0; i < mStreamMapper->numStreams(); i++) {
@@ -300,39 +300,39 @@
return S_OK;
}
STDMETHODIMP OggDemuxSourceFilter::GetPositions(LONGLONG *pCurrent, LONGLONG *pStop){
- debugLog<<"GetPos : Current = HARDCODED 2 secs , Stop = "<<mSeekTable->fileDuration()/UNITS <<" secs."<<endl;
+ //debugLog<<"GetPos : Current = HARDCODED 2 secs , Stop = "<<mSeekTable->fileDuration()/UNITS <<" secs."<<endl;
*pCurrent = 2 * UNITS;
*pStop = mSeekTable->fileDuration();
return S_OK;
}
STDMETHODIMP OggDemuxSourceFilter::GetAvailable(LONGLONG *pEarliest, LONGLONG *pLatest){
- debugLog<<"GetAvailable : NOT IMPL"<<endl;
+ //debugLog<<"GetAvailable : NOT IMPL"<<endl;
return E_NOTIMPL;
}
STDMETHODIMP OggDemuxSourceFilter::SetRate(double dRate){
return E_NOTIMPL;
- debugLog<<"SetRate : "<<dRate<<endl;
+ //debugLog<<"SetRate : "<<dRate<<endl;
return S_OK;;
}
STDMETHODIMP OggDemuxSourceFilter::GetRate(double *dRate){
return E_NOTIMPL;
- debugLog <<"GetRate : Hard coded to 1.0"<<endl;
+ //debugLog <<"GetRate : Hard coded to 1.0"<<endl;
*dRate = 1.0;
return S_OK;;
}
STDMETHODIMP OggDemuxSourceFilter::GetPreroll(LONGLONG *pllPreroll){
return E_NOTIMPL;
*pllPreroll = 0;
- debugLog<<"GetPreroll : HARD CODED TO 0"<<endl;
+ //debugLog<<"GetPreroll : HARD CODED TO 0"<<endl;
return S_OK;
}
STDMETHODIMP OggDemuxSourceFilter::IsUsingTimeFormat(const GUID *pFormat){
if (*pFormat == TIME_FORMAT_MEDIA_TIME) {
- debugLog<<"IsUsingTimeFormat : MEDIA TIME TRUE"<<endl;
+ //debugLog<<"IsUsingTimeFormat : MEDIA TIME TRUE"<<endl;
return S_OK;
} else {
- debugLog<<"IsUsingTimeFormat : MEDIA TIME FALSE !!!!"<<endl;
+ //debugLog<<"IsUsingTimeFormat : MEDIA TIME FALSE !!!!"<<endl;
return S_FALSE;
}
@@ -359,13 +359,13 @@
//CAMThread Stuff
DWORD OggDemuxSourceFilter::ThreadProc(void) {
- debugLog << "Thread Proc Called..."<<endl;
+ //debugLog << "Thread Proc Called..."<<endl;
while(true) {
DWORD locThreadCommand = GetRequest();
- debugLog << "Command = "<<locThreadCommand<<endl;
+ //debugLog << "Command = "<<locThreadCommand<<endl;
switch(locThreadCommand) {
case THREAD_EXIT:
- debugLog << "EXIT ** "<<endl;
+ //debugLog << "EXIT ** "<<endl;
Reply(S_OK);
return S_OK;
@@ -375,7 +375,7 @@
// break;
case THREAD_RUN:
- debugLog << "RUN ** "<<endl;
+ //debugLog << "RUN ** "<<endl;
Reply(S_OK);
DataProcessLoop();
break;
@@ -409,20 +409,20 @@
void OggDemuxSourceFilter::DeliverBeginFlush() {
CAutoLock locLock(m_pLock);
- debugLog << "Delivering Begin Flush"<<endl;
+ //debugLog << "Delivering Begin Flush"<<endl;
for (unsigned long i = 0; i < mStreamMapper->numStreams(); i++) {
mStreamMapper->getOggStream(i)->getPin()->DeliverBeginFlush();
}
//Should this be here or endflush or neither ?
- debugLog << "Calling Reset Stream"<<endl;
+ //debugLog << "Calling Reset Stream"<<endl;
resetStream();
}
void OggDemuxSourceFilter::DeliverEndFlush() {
CAutoLock locLock(m_pLock);
- debugLog << "Delivering End Flush"<<endl;
+ //debugLog << "Delivering End Flush"<<endl;
for (unsigned long i = 0; i < mStreamMapper->numStreams(); i++) {
mStreamMapper->getOggStream(i)->getPin()->DeliverEndFlush();
}
@@ -438,7 +438,7 @@
}
void OggDemuxSourceFilter::DeliverNewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) {
- debugLog<<"DeliverNewSegment : Delivering start = "<<tStart<<" end = "<< tStop<<"rate = "<<dRate<<endl;
+ //debugLog<<"DeliverNewSegment : Delivering start = "<<tStart<<" end = "<< tStop<<"rate = "<<dRate<<endl;
IReferenceClock* locRefClock = NULL;
@@ -465,34 +465,34 @@
}
while (!locIsEOF && locKeepGoing) {
if(CheckRequest(&locCommand) == TRUE) {
- debugLog<<"DataProcessLoop : Thread Command issued... leaving loop."<<endl;
+ //debugLog<<"DataProcessLoop : Thread Command issued... leaving loop."<<endl;
return S_OK;
}
{
CAutoLock locSourceLock(mSourceFileLock);
- debugLog << "DataProcessLoop : Getpointer = "<<mSourceFile.tellg()<<endl;
+ //debugLog << "DataProcessLoop : Getpointer = "<<mSourceFile.tellg()<<endl;
mSourceFile.read(locBuff, 4096);
locBytesRead = mSourceFile.gcount();
}
- debugLog <<"DataProcessLoop : gcount = "<<locBytesRead<<endl;
+ //debugLog <<"DataProcessLoop : gcount = "<<locBytesRead<<endl;
{
CAutoLock locDemuxLock(mDemuxLock);
locKeepGoing = mOggBuffer.feed(locBuff, locBytesRead);
}
if (!locKeepGoing) {
- debugLog << "DataProcessLoop : Feed in data buffer said stop"<<endl;
+ //debugLog << "DataProcessLoop : Feed in data buffer said stop"<<endl;
}
{
CAutoLock locSourceLock(mSourceFileLock);
locIsEOF = mSourceFile.eof();
}
if (locIsEOF) {
- debugLog << "DataProcessLoop : EOF"<<endl;
+ //debugLog << "DataProcessLoop : EOF"<<endl;
}
}
- debugLog<<"DataProcessLoop : Exiting. Deliver EOS"<<endl;
+ //debugLog<<"DataProcessLoop : Exiting. Deliver EOS"<<endl;
DeliverEOS();
//Shuold we flush ehre ?
@@ -536,7 +536,7 @@
STDMETHODIMP OggDemuxSourceFilter::Run(REFERENCE_TIME tStart) {
const REFERENCE_TIME A_LONG_TIME = UNITS * 1000;
CAutoLock locLock(m_pLock);
- debugLog<<"Run : time = "<<tStart<<endl;
+ //debugLog<<"Run : time = "<<tStart<<endl;
//DeliverNewSegment(tStart, tStart + A_LONG_TIME, 1.0);
return CBaseFilter::Run(tStart);
@@ -544,15 +544,15 @@
}
STDMETHODIMP OggDemuxSourceFilter::Pause(void) {
CAutoLock locLock(m_pLock);
- debugLog << "** Pause called **"<<endl;
+ //debugLog << "** Pause called **"<<endl;
if (m_State == State_Stopped) {
- debugLog << "Was in stopped state... starting thread"<<endl;
+ //debugLog << "Was in stopped state... starting thread"<<endl;
if (ThreadExists() == FALSE) {
Create();
}
CallWorker(THREAD_RUN);
}
- debugLog<<"Was NOT is stopped state, not doing much at all..."<<endl;
+ //debugLog<<"Was NOT is stopped state, not doing much at all..."<<endl;
HRESULT locHR = CBaseFilter::Pause();
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h 2004-05-21 18:45:28 UTC (rev 6743)
@@ -133,7 +133,7 @@
OggStreamMapper* mStreamMapper;
//DEBUG
- fstream debugLog;
+ //fstream debugLog;
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.cpp 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.cpp 2004-05-21 18:45:28 UTC (rev 6743)
@@ -46,7 +46,7 @@
mPartialPacket(NULL)
{
- debugLog.open("C:\\sourcefilterpin.log", ios_base::out);
+ //debugLog.open("C:\\sourcefilterpin.log", ios_base::out);
IMediaSeeking* locSeeker = NULL;
inParentFilter->NonDelegatingQueryInterface(IID_IMediaSeeking, (void**)&locSeeker);
@@ -55,7 +55,7 @@
OggDemuxSourcePin::~OggDemuxSourcePin(void)
{
- debugLog.close();
+ //debugLog.close();
delete mDataQueue;
}
@@ -74,15 +74,15 @@
IMediaSample* locSample = NULL;
REFERENCE_TIME locStart = inPacket->startTime();
REFERENCE_TIME locStop = inPacket->endTime();
- debugLog<<"Start : "<<locStart<<endl;
- debugLog<<"End : "<<locStop<<endl;
+ //debugLog<<"Start : "<<locStart<<endl;
+ //debugLog<<"End : "<<locStop<<endl;
DbgLog((LOG_TRACE, 2, "Getting Buffer in Source Pin..."));
HRESULT locHR = GetDeliveryBuffer(&locSample, &locStart, &locStop, NULL);
DbgLog((LOG_TRACE, 2, "* After get Buffer in Source Pin..."));
//Error checks
if (locHR != S_OK) {
//Stopping, fluching or error
- debugLog<<"Failure... No buffer"<<endl;
+ //debugLog<<"Failure... No buffer"<<endl;
return false;
}
//TIMESTAMP FIXING !
@@ -103,7 +103,7 @@
locHR = mDataQueue->Receive(locSample);
if (locHR != S_OK) {
- debugLog << "Failure... Queue rejected sample..."<<endl;
+ //debugLog << "Failure... Queue rejected sample..."<<endl;
//Stopping ??
return false;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h 2004-05-21 18:45:28 UTC (rev 6743)
@@ -86,7 +86,7 @@
StampedOggPacket* mPartialPacket;
HRESULT mFilterHR;
COutputQueue* mDataQueue;
- fstream debugLog;
+ //fstream debugLog;
bool mFirstRun;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.cpp 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.cpp 2004-05-21 18:45:28 UTC (rev 6743)
@@ -44,7 +44,7 @@
, mLastEndGranulePos(0)
, mLastStartGranulePos(0)
{
- osDebug.open("C:\\ostream.log", ios_base::out);
+ //osDebug.open("C:\\ostream.log", ios_base::out);
//Need to do something here !
mSerialNo = inBOSPage->header()->StreamSerialNo();
@@ -57,7 +57,7 @@
OggStream::~OggStream(void)
{
- osDebug.close();
+ //osDebug.close();
delete mSourcePin;
delete mCodecHeaders;
delete mPartialPacket;
@@ -211,14 +211,14 @@
}
void OggStream::setLastEndGranPos(__int64 inGranPos) {
- osDebug<<"*************************** ERROR ERROR ERROR **********************"<<endl;
+ //osDebug<<"*************************** ERROR ERROR ERROR **********************"<<endl;
mLastEndGranulePos = inGranPos;
}
bool OggStream::acceptOggPage(OggPage* inOggPage) {
//FIX::: Add proper error checking.
StampedOggPacket* locPacket = NULL;
- osDebug<<"New page sets start gran to "<<mLastEndGranulePos<<endl;
+ //osDebug<<"New page sets start gran to "<<mLastEndGranulePos<<endl;
mLastStartGranulePos = mLastEndGranulePos;
mLastEndGranulePos = inOggPage->header()->GranulePos()->value();
@@ -296,7 +296,7 @@
return true;
}
bool OggStream::dispatchPacket(StampedOggPacket* inPacket) {
- osDebug<<"Ogg Stream : Packet stamps = "<<inPacket->startTime()<<" - "<<inPacket->endTime()<<endl;
+ //osDebug<<"Ogg Stream : Packet stamps = "<<inPacket->startTime()<<" - "<<inPacket->endTime()<<endl;
return mSourcePin->deliverOggPacket(inPacket);
}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.h 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.h 2004-05-21 18:45:28 UTC (rev 6743)
@@ -102,5 +102,5 @@
OggDemuxSourcePin* mSourcePin;
OggDemuxSourceFilter* mOwningFilter;
- fstream osDebug;
+ //fstream osDebug;
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/SpeexStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/SpeexStream.cpp 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/SpeexStream.cpp 2004-05-21 18:45:28 UTC (rev 6743)
@@ -76,7 +76,7 @@
void SpeexStream::setLastEndGranPos(__int64 inPos) {
mLastEndGranulePos = (inPos * (__int64)mSpeexFormatBlock->samplesPerSec)/ UNITS;
- osDebug<<"Speex sets End Gran : "<<mLastEndGranulePos<<endl;
+ //osDebug<<"Speex sets End Gran : "<<mLastEndGranulePos<<endl;
}
unsigned long SpeexStream::getFormatBlockSize() {
//Do something
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.cpp 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.cpp 2004-05-21 18:45:28 UTC (rev 6743)
@@ -98,7 +98,7 @@
//LONGLONG locAbsFramePos = ((mLastSeenStartGranPos >> locFilter->mTheoraFormatInfo->maxKeyframeInterval) * locMod) + locInterFrameNo;
//REFERENCE_TIME locTimeBase = ((locAbsFramePos * mFrameDuration) - locThis->mSeekTimeBase;
//mLastEndGranulePos = (inPos * (__int64)mSpeexFormatBlock->samplesPerSec)/ UNITS;
- osDebug<<"Theora sets End Gran : "<<mLastEndGranulePos<<endl;
+ //osDebug<<"Theora sets End Gran : "<<mLastEndGranulePos<<endl;
}
BYTE* TheoraStream::getFormatBlock() {
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.cpp 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.cpp 2004-05-21 18:45:28 UTC (rev 6743)
@@ -73,7 +73,7 @@
void VorbisStream::setLastEndGranPos(__int64 inPos) {
mLastEndGranulePos = (inPos * (__int64)mVorbisFormatBlock->samplesPerSec)/ UNITS;
- osDebug<<"Vorbis sets End Gran : "<<mLastEndGranulePos<<endl;
+ //osDebug<<"Vorbis sets End Gran : "<<mLastEndGranulePos<<endl;
}
unsigned long VorbisStream::getFormatBlockSize() {
return sizeof(sVorbisFormatBlock);
Modified: trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.cpp 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.cpp 2004-05-21 18:45:28 UTC (rev 6743)
@@ -15,7 +15,7 @@
AM_SEEKING_CanGetStopPos |
AM_SEEKING_CanGetDuration;
- seekDebug.open("C:\\temp\\seeker.log", ios_base::out|ios_base::binary);
+ //seekDebug.open("C:\\temp\\seeker.log", ios_base::out|ios_base::binary);
}
@@ -31,7 +31,7 @@
AM_SEEKING_CanGetStopPos |
AM_SEEKING_CanGetDuration;
- seekDebug.open("C:\\temp\\seeker.log", ios_base::out|ios_base::binary);
+ //seekDebug.open("C:\\temp\\seeker.log", ios_base::out|ios_base::binary);
}
@@ -45,7 +45,7 @@
BasicSeekable::~BasicSeekable(void)
{
- seekDebug.close();
+ //seekDebug.close();
}
//IMediaSeeking Interface
STDMETHODIMP BasicSeekable::GetCapabilities(DWORD* inCapabilities) {
@@ -67,10 +67,10 @@
//return S_OK;
if (mSeekDelegate != NULL) {
- seekDebug<<"GetCaps : Passed on..."<<endl;
+ //seekDebug<<"GetCaps : Passed on..."<<endl;
return mSeekDelegate->GetCapabilities(inCapabilities);
} else {
- seekDebug<<"GetCaps : NULL Delegate"<<endl;
+ //seekDebug<<"GetCaps : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -92,10 +92,10 @@
if (mSeekDelegate != NULL) {
- seekDebug<<"CheckCaps : Passed on..."<<endl;
+ //seekDebug<<"CheckCaps : Passed on..."<<endl;
return mSeekDelegate->CheckCapabilities(outCapabilities);
} else {
- seekDebug<<"CheckCaps : NULL Delegate"<<endl;
+ //seekDebug<<"CheckCaps : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -113,10 +113,10 @@
//}
if (mSeekDelegate != NULL) {
- seekDebug<<"IsFromatsupp : Passed on..."<<endl;
+ //seekDebug<<"IsFromatsupp : Passed on..."<<endl;
return mSeekDelegate->IsFormatSupported(inFormat);
} else {
- seekDebug<<"IsFromatsupp : NULL Delegate"<<endl;
+ //seekDebug<<"IsFromatsupp : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -131,10 +131,10 @@
//return S_OK;
if (mSeekDelegate != NULL) {
- seekDebug<<"Query preff : Passed on..."<<endl;
+ //seekDebug<<"Query preff : Passed on..."<<endl;
return mSeekDelegate->QueryPreferredFormat(outFormat);
} else {
- seekDebug<<"Query preff : NULL Delegate"<<endl;
+ //seekDebug<<"Query preff : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -143,10 +143,10 @@
STDMETHODIMP BasicSeekable::SetTimeFormat(const GUID* inFormat) {
if (mSeekDelegate != NULL) {
- seekDebug<<"SetTimeformat :Passed on..."<<endl;
+ //seekDebug<<"SetTimeformat :Passed on..."<<endl;
return mSeekDelegate->SetTimeFormat(inFormat);
} else {
- seekDebug<<"SetTimeformat : NULL Delegate"<<endl;
+ //seekDebug<<"SetTimeformat : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -154,10 +154,10 @@
STDMETHODIMP BasicSeekable::GetTimeFormat( GUID *outFormat) {
if (mSeekDelegate != NULL) {
- seekDebug<<"Gettimeformat : Passed on..."<<endl;
+ //seekDebug<<"Gettimeformat : Passed on..."<<endl;
return mSeekDelegate->GetTimeFormat(outFormat);
} else {
- seekDebug<<"Gettimeformat : NULL Delegate"<<endl;
+ //seekDebug<<"Gettimeformat : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -165,10 +165,10 @@
STDMETHODIMP BasicSeekable::GetDuration(LONGLONG* outDuration) {
if (mSeekDelegate != NULL) {
- seekDebug<<"Getdureation : Passed on..."<<endl;
+ //seekDebug<<"Getdureation : Passed on..."<<endl;
return mSeekDelegate->GetDuration(outDuration);
} else {
- seekDebug<<"Getdureation : NULL Delegate"<<endl;
+ //seekDebug<<"Getdureation : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -176,10 +176,10 @@
}
STDMETHODIMP BasicSeekable::GetStopPosition(LONGLONG* inStop) {
if (mSeekDelegate != NULL) {
- seekDebug<<"Getstoppos : Passed on..."<<endl;
+ //seekDebug<<"Getstoppos : Passed on..."<<endl;
return mSeekDelegate->GetStopPosition(inStop);
} else {
- seekDebug<<"Getstoppos : NULL Delegate"<<endl;
+ //seekDebug<<"Getstoppos : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -189,10 +189,10 @@
//return E_NOTIMPL;
if (mSeekDelegate != NULL) {
- seekDebug<<"Getcurrpos : Passed on..."<<endl;
+ //seekDebug<<"Getcurrpos : Passed on..."<<endl;
return mSeekDelegate->GetCurrentPosition(outCurrent);
} else {
- seekDebug<<"Getcurrpos : NULL Delegate"<<endl;
+ //seekDebug<<"Getcurrpos : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -200,26 +200,26 @@
STDMETHODIMP BasicSeekable::ConvertTimeFormat(LONGLONG* outTarget, const GUID* inTargetFormat, LONGLONG inSource, const GUID* inSourceFormat) {
//return E_NOTIMPL;
if (mSeekDelegate != NULL) {
- seekDebug<<"ConvTimeformat : Passed on..."<<endl;
+ //seekDebug<<"ConvTimeformat : Passed on..."<<endl;
return mSeekDelegate->ConvertTimeFormat(outTarget, inTargetFormat, inSource, inSourceFormat);
} else {
- seekDebug<<"ConvTimeformat : NULL Delegate"<<endl;
+ //seekDebug<<"ConvTimeformat : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
}
STDMETHODIMP BasicSeekable::SetPositions(LONGLONG* inoutCurrent, DWORD inCurrentFlags, LONGLONG* inStop, DWORD inStopFlags) {
if (mSeekDelegate != NULL) {
- seekDebug<<"Set pos : Requested Time : "<<*inoutCurrent<<endl;
+ //seekDebug<<"Set pos : Requested Time : "<<*inoutCurrent<<endl;
HRESULT locHR = mSeekDelegate->SetPositions(inoutCurrent, inCurrentFlags, inStop, inStopFlags);
if (locHR == S_OK) {
mSeekTimeBase = *inoutCurrent;
- seekDebug<<"Set Pos : Actual Time : "<<mSeekTimeBase<<endl;
+ //seekDebug<<"Set Pos : Actual Time : "<<mSeekTimeBase<<endl;
}
return locHR;
} else {
- seekDebug<<"Set pos : NULL Delegate"<<endl;
+ //seekDebug<<"Set pos : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -227,10 +227,10 @@
}
STDMETHODIMP BasicSeekable::GetPositions(LONGLONG* outCurrent, LONGLONG* outStop) {
if (mSeekDelegate != NULL) {
- seekDebug<<"GetPos : Passed on..."<<endl;
+ //seekDebug<<"GetPos : Passed on..."<<endl;
return mSeekDelegate->GetPositions(outCurrent, outStop);
} else {
- seekDebug<<"GetPos : NULL Delegate"<<endl;
+ //seekDebug<<"GetPos : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -238,10 +238,10 @@
}
STDMETHODIMP BasicSeekable::GetAvailable(LONGLONG* outEarliest, LONGLONG* outLatest) {
if (mSeekDelegate != NULL) {
- seekDebug<<"Getavail : Passed on..."<<endl;
+ //seekDebug<<"Getavail : Passed on..."<<endl;
return mSeekDelegate->GetAvailable(outEarliest, outLatest);
} else {
- seekDebug<<"Getavail : NULL Delegate"<<endl;
+ //seekDebug<<"Getavail : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
@@ -249,40 +249,40 @@
STDMETHODIMP BasicSeekable::SetRate(double inRate) {
if (mSeekDelegate != NULL) {
- seekDebug<<"Setrate : Passed on..."<<endl;
+ //seekDebug<<"Setrate : Passed on..."<<endl;
return mSeekDelegate->SetRate(inRate);
} else {
- seekDebug<<"Setrate : NULL Delegate"<<endl;
+ //seekDebug<<"Setrate : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
}
STDMETHODIMP BasicSeekable::GetRate(double* outRate) {
if (mSeekDelegate != NULL) {
- seekDebug<<"Getrate : Passed on..."<<endl;
+ //seekDebug<<"Getrate : Passed on..."<<endl;
return mSeekDelegate->GetRate(outRate);
} else {
- seekDebug<<"Getrate : NULL Delegate"<<endl;
+ //seekDebug<<"Getrate : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
}
STDMETHODIMP BasicSeekable::GetPreroll(LONGLONG* outPreroll) {
if (mSeekDelegate != NULL) {
- seekDebug<<"Getpreroll : Passed on..."<<endl;
+ //seekDebug<<"Getpreroll : Passed on..."<<endl;
return mSeekDelegate->GetPreroll(outPreroll);
} else {
- seekDebug<<"Getpreroll : NULL Delegate"<<endl;
+ //seekDebug<<"Getpreroll : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
}
STDMETHODIMP BasicSeekable::IsUsingTimeFormat(const GUID* inFormat) {
if (mSeekDelegate != NULL) {
- seekDebug<<"Isusingtimeformat : Passed on..."<<endl;
+ //seekDebug<<"Isusingtimeformat : Passed on..."<<endl;
return mSeekDelegate->IsUsingTimeFormat(inFormat);
} else {
- seekDebug<<"Isusingtimeformat : NULL Delegate"<<endl;
+ //seekDebug<<"Isusingtimeformat : NULL Delegate"<<endl;
//This is probably wrong.
return E_NOTIMPL;
}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.h 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.h 2004-05-21 18:45:28 UTC (rev 6743)
@@ -76,7 +76,7 @@
REFERENCE_TIME mSeekTimeBase;
HRESULT mHR;
- fstream seekDebug;
+ //fstream seekDebug;
DWORD mSeekingCap;
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp 2004-05-21 18:45:28 UTC (rev 6743)
@@ -80,12 +80,14 @@
} else {
mEnabled = false;
mSampleRate = 1;
+
}
}
if (mSerialNoToTrack == inOggPage->header()->StreamSerialNo()) {
if ((mPacketCount > 3) && (mLastIsSeekable == true)) {
+ //if ((mPacketCount > mNumHeaders) && (inOggPage->header()->HeaderFlags() & 1 != 1)) {
addSeekPoint(mLastSeekTime, mFilePos);
}
@@ -104,17 +106,17 @@
mLastSeekTime = ((((inOggPage->header()->GranulePos()->value()) >> mGranulePosShift) + locInterFrameNo) * DS_UNITS) / mSampleRate;
} else {
mLastSeekTime = ((inOggPage->header()->GranulePos()->value()) * DS_UNITS) / mSampleRate;
- stDebug<<"Last Seek Time : "<<mLastSeekTime;
+ //stDebug<<"Last Seek Time : "<<mLastSeekTime;
}
if ((inOggPage->header()->HeaderFlags() & 1 == 1)) {
- stDebug <<" NOT SEEKABLE";
+ //stDebug <<" NOT SEEKABLE";
mLastIsSeekable = false;
}
- stDebug<<endl;
+ //stDebug<<endl;
mFileDuration = mLastSeekTime;
}
mFilePos += inOggPage->pageSize();
- stDebug<<"File Pos : "<<mFilePos<<endl;
+ //stDebug<<"File Pos : "<<mFilePos<<endl;
return true;
}
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.cpp 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.cpp 2004-05-21 18:45:28 UTC (rev 6743)
@@ -38,19 +38,19 @@
{
mSeekMap.clear();
mSeekMap.empty();
- stDebug.open("C:\\sktable.log", ios_base::out);
+ //stDebug.open("C:\\sktable.log", ios_base::out);
}
OggSeekTable::~OggSeekTable(void)
{
- stDebug.close();
+ //stDebug.close();
}
bool OggSeekTable::enabled() {
return mEnabled;
}
bool OggSeekTable::addSeekPoint(__int64 inTime, unsigned long mStartPos) {
- stDebug<< "Add Point : Time = "<<inTime<<" -- Byte Pos : "<<mStartPos<<endl;
+ //stDebug<< "Add Point : Time = "<<inTime<<" -- Byte Pos : "<<mStartPos<<endl;
mSeekMap.insert(tSeekMap::value_type(inTime, mStartPos));
return true;
@@ -64,7 +64,7 @@
unsigned long OggSeekTable::getStartPos(__int64 inTime) {
pair<__int64, unsigned long> locValue = *(mSeekMap.lower_bound(inTime));
mRealStartPos = locValue.first;
- stDebug<<"Get Point : Time Req = "<<inTime<<" -- Time Given = "<<mRealStartPos<<" -- Byte Pos : "<<locValue.second<<endl;
+ //stDebug<<"Get Point : Time Req = "<<inTime<<" -- Time Given = "<<mRealStartPos<<" -- Byte Pos : "<<locValue.second<<endl;
return locValue.second;
}
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.h 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.h 2004-05-21 18:45:28 UTC (rev 6743)
@@ -31,7 +31,7 @@
#pragma once
#include "libOOOggSeek.h"
-#include <fstream>
+//#include <fstream>
#include <map>
using namespace std;
@@ -53,6 +53,6 @@
tSeekMap::value_type mSeekValue;
__int64 mRealStartPos;
- fstream stDebug;
+ //fstream stDebug;
bool mEnabled;
};
Modified: trunk/oggdsf/src/lib/core/ogg/libogg/win32/Dynamic_Debug/BuildLog.htm
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libogg/win32/Dynamic_Debug/BuildLog.htm 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/core/ogg/libogg/win32/Dynamic_Debug/BuildLog.htm 2004-05-21 18:45:28 UTC (rev 6743)
@@ -46,8 +46,8 @@
VSCOMNTOOLS="C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\"
windir=C:\WINDOWS
_ACP_ATLPROV=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin\ATLPROV.DLL
- _ACP_INCLUDE=..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
- _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_INCLUDE="C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\dsfAbstractAudioDecoder;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;..\libOOOgg;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
_ACP_PATH=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\tools;C:\Program Files\Microsoft Visual Studio .NET\Common7\ide;C:\Program Files\HTML Help Workshop\;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\bin;C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\ATI Technologies\ATI Control Panel
</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
Command Lines
Modified: trunk/oggdsf/src/lib/core/ogg/libogg/win32/Dynamic_Release/BuildLog.htm
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libogg/win32/Dynamic_Release/BuildLog.htm 2004-05-21 12:11:27 UTC (rev 6742)
+++ trunk/oggdsf/src/lib/core/ogg/libogg/win32/Dynamic_Release/BuildLog.htm 2004-05-21 18:45:28 UTC (rev 6743)
@@ -46,8 +46,8 @@
VSCOMNTOOLS="C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\"
windir=C:\WINDOWS
_ACP_ATLPROV=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin\ATLPROV.DLL
- _ACP_INCLUDE="C:\DXSDK\Samples\C++\DirectShow\BaseClasses";..\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
- _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;..\..\..\..\core\ogg\libOOOgg;..\libtheora\include;..\..\..\..\core\ogg\libogg\include;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_INCLUDE="C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\dsfAbstractAudioDecoder;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;..\libOOOgg;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
_ACP_PATH=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\tools;C:\Program Files\Microsoft Visual Studio .NET\Common7\ide;C:\Program Files\HTML Help Workshop\;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\bin;C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\ATI Technologies\ATI Control Panel
</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
Command Lines
--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list