[xiph-commits] r8911 - in trunk/oggdsf: build/oggcodecs
src/lib/codecs/cmml/dsfCMMLRawSource
src/lib/codecs/theora/filters/dsfTheoraDecoder
src/lib/codecs/vorbis/filters/dsfVorbisEncoder
src/lib/core/directshow/dsfAnxDemux
src/lib/core/directshow/dsfAnxMux
src/lib/core/directshow/dsfOggDemux
src/lib/core/directshow/dsfOggMux src/lib/core/ogg/libOOOgg
src/lib/player/libDSPlayDotNET
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Mon Feb 14 02:19:52 PST 2005
Author: illiminable
Date: 2005-02-14 02:18:38 -0800 (Mon, 14 Feb 2005)
New Revision: 8911
Modified:
trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.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/dsfAnxDemux/CMMLSourcePin.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLSourcePin.h
trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.h
trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/anxmuxdllstuff.cpp
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/FLACStream.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FLACStream.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
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/OggFLAC_1_0_Stream.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggFLAC_1_0_Stream.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/SpeexStream.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.h
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp
trunk/oggdsf/src/lib/player/libDSPlayDotNET/DSPlay.cpp
Log:
* Massive improvements in memory management...
* Audio streams using 10% of previous memory use
* Video down to 15% in most cases
* ifdef 'd around some debuggy stuff
Modified: trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
===================================================================
--- trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2005-02-14 10:18:38 UTC (rev 8911)
@@ -63,270 +63,282 @@
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
+ "MsmKey" = "8:_27330A8D56F34785A52342ADD956700F"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
+ "MsmKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
+ "MsmKey" = "8:_2C5F38B64D1B4026848AEB8788C27EFC"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
+ "MsmKey" = "8:_2D5D4F4E3F6E43359F3202D733153812"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_E6B7C1CA6BF74C998B68B4C3379FB830"
+ "MsmKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
+ "MsmKey" = "8:_3A86D30B7A3948869605033FC8CEA4B2"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
+ "MsmKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+ "MsmKey" = "8:_408749AC43894882BEEBFF43737E505B"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_D3E41A5878FC4EC0B0F443CF3E5991BA"
+ "MsmKey" = "8:_42F89A4130A36CD4BA74B00F4B424775"
+ "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_B9749E2A902A46BEAE555C07E32980BB"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_E6B7C1CA6BF74C998B68B4C3379FB830"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_A0E68123D9D541DFA9691752981C903A"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_9F87CF49E6BC48AE9DECD5A3F35FEC24"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_950B983745EC40EF9FF08E742A6E9510"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_D3E41A5878FC4EC0B0F443CF3E5991BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_B9749E2A902A46BEAE555C07E32980BB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_A0E68123D9D541DFA9691752981C903A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_9F87CF49E6BC48AE9DECD5A3F35FEC24"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_950B983745EC40EF9FF08E742A6E9510"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_52EEBD17D1BC463493F06DCBC4C2CD44"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_3A86D30B7A3948869605033FC8CEA4B2"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_27330A8D56F34785A52342ADD956700F"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_24A1793CB89A464FB683A8A3BDA774DB"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_1FDED4DADD384431A22FF1C26BE42207"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_52EEBD17D1BC463493F06DCBC4C2CD44"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_26B144014F7E4039B450D41FCEC9F41C"
- "OwnerKey" = "8:_054BE8EA6F5E45A7AB2066734E998570"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_27330A8D56F34785A52342ADD956700F"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_2C5F38B64D1B4026848AEB8788C27EFC"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_3A86D30B7A3948869605033FC8CEA4B2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_2D5D4F4E3F6E43359F3202D733153812"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_3A86D30B7A3948869605033FC8CEA4B2"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_27330A8D56F34785A52342ADD956700F"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_1FDED4DADD384431A22FF1C26BE42207"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_408749AC43894882BEEBFF43737E505B"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_141113E874984C0483C694B14F3C16A3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_42F89A4130A36CD4BA74B00F4B424775"
- "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_054BE8EA6F5E45A7AB2066734E998570"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -381,187 +393,253 @@
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_E6B7C1CA6BF74C998B68B4C3379FB830"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_D3E41A5878FC4EC0B0F443CF3E5991BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_B9749E2A902A46BEAE555C07E32980BB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_A0E68123D9D541DFA9691752981C903A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_9F87CF49E6BC48AE9DECD5A3F35FEC24"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_950B983745EC40EF9FF08E742A6E9510"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_83AF8D74700947168B69E69E5160F082"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_52EEBD17D1BC463493F06DCBC4C2CD44"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_3A86D30B7A3948869605033FC8CEA4B2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_27330A8D56F34785A52342ADD956700F"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_24A1793CB89A464FB683A8A3BDA774DB"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_1FDED4DADD384431A22FF1C26BE42207"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_141113E874984C0483C694B14F3C16A3"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65C66D9E67754F0899463F574D0045D8"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_054BE8EA6F5E45A7AB2066734E998570"
"MsmSig" = "8:_UNDEFINED"
}
@@ -633,6 +711,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"
@@ -879,6 +969,26 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_46A378A9B03E4612A645053EDB884C20"
+ {
+ "SourcePath" = "8:MSVCP71D.dll"
+ "TargetName" = "8:MSVCP71D.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:FALSE"
+ "IsDependency" = "11:TRUE"
+ "IsolateTo" = "8:"
+ }
"{A582A373-4685-4296-BEFE-614B80A702C3}:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
{
"SourcePath" = "8:WSOCK32.dll"
@@ -899,6 +1009,26 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_655D5383153A6AB10D15352A7EABCC7A"
+ {
+ "SourcePath" = "8:MSVCR71D.dll"
+ "TargetName" = "8:MSVCR71D.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:FALSE"
+ "IsDependency" = "11:TRUE"
+ "IsolateTo" = "8:"
+ }
"{A582A373-4685-4296-BEFE-614B80A702C3}:_81A3CDB604B64763884C387192BE6771"
{
"SourcePath" = "8:..\\..\\COPYRIGHTS"
@@ -939,6 +1069,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"
@@ -3192,40 +3362,12 @@
}
"MergeModule"
{
- "{35A69C6E-5BA4-440D-803D-762B59A45393}:_26B144014F7E4039B450D41FCEC9F41C"
- {
- "UseDynamicProperties" = "11:TRUE"
- "IsDependency" = "11:TRUE"
- "SourcePath" = "8:vc_user_crt71_rtl_x86_---.msm"
- "Properties"
- {
- }
- "LanguageId" = "3:0"
- "Exclude" = "11:FALSE"
- "Folder" = "8:"
- "Feature" = "8:"
- "IsolateTo" = "8:"
- }
- "{35A69C6E-5BA4-440D-803D-762B59A45393}:_65C66D9E67754F0899463F574D0045D8"
- {
- "UseDynamicProperties" = "11:TRUE"
- "IsDependency" = "11:TRUE"
- "SourcePath" = "8:vc_user_stl71_rtl_x86_---.msm"
- "Properties"
- {
- }
- "LanguageId" = "3:0"
- "Exclude" = "11:FALSE"
- "Folder" = "8:"
- "Feature" = "8:"
- "IsolateTo" = "8:"
- }
}
"ProjectOutput"
{
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_02E7D9728C8944F1BD021329177F5140"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libCMMLTags\\Release\\libCMMLTags.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libCMMLTags\\Debug\\libCMMLTags.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3253,7 +3395,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_054BE8EA6F5E45A7AB2066734E998570"
{
- "SourcePath" = "8:..\\..\\src\\lib\\helper\\libOOOggChef\\Release\\libOOOggChef.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\helper\\libOOOggChef\\Debug\\libOOOggChef.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3281,7 +3423,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_0A1E63E5852E4F759F1A27E8F097727B"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggDump\\Release\\OOOggDump.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggDump\\Debug\\OOOggDump.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3309,7 +3451,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_0D0DD40A31F842C68B09BE0CBDE1996B"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACEncoder\\Release\\dsfFLACEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACEncoder\\Debug\\dsfFLACEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3337,7 +3479,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_141113E874984C0483C694B14F3C16A3"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAnxMux\\Release\\dsfAnxMux.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAnxMux\\Debug\\dsfAnxMux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3365,7 +3507,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_1FDED4DADD384431A22FF1C26BE42207"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libCMMLParse\\Release\\libCMMLParse.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libCMMLParse\\Debug\\libCMMLParse.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3393,7 +3535,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_24A1793CB89A464FB683A8A3BDA774DB"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\libs\\libvorbis\\win32\\Vorbis_Dynamic_Release\\vorbis.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\libs\\libvorbis\\win32\\Vorbis_Dynamic_Debug\\vorbis_d.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3421,7 +3563,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_27330A8D56F34785A52342ADD956700F"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggSeekFileQuery\\Release\\OOOggSeekFileQuery.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggSeekFileQuery\\Debug\\OOOggSeekFileQuery.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3449,7 +3591,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_273D851AE72C4D2EA8020A712DBFE5A3"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfNativeFLACSource\\Release\\dsfNativeFLACSource.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfNativeFLACSource\\Debug\\dsfNativeFLACSource.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3477,7 +3619,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_3243E453AFD94BB88B5A1014BDFCBAAE"
{
- "SourcePath" = "8:..\\..\\src\\tests\\testLibOOOgg\\Release\\testLibOOOgg.exe"
+ "SourcePath" = "8:..\\..\\src\\tests\\testLibOOOgg\\Debug\\testLibOOOgg.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3505,7 +3647,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_3A86D30B7A3948869605033FC8CEA4B2"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggPageInfo\\Release\\OOOggPageInfo.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggPageInfo\\Debug\\OOOggPageInfo.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3533,7 +3675,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_3C7C3E6B832E481C8A36701A33FF3721"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggStat\\Release\\OOOggStat.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggStat\\Debug\\OOOggStat.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3561,7 +3703,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_408749AC43894882BEEBFF43737E505B"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexDecoder\\Release\\dsfSpeexDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexDecoder\\Debug\\dsfSpeexDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3589,7 +3731,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_4EB6175B98B54613A5087D8EA257D00A"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\libs\\libOOTheora\\Release\\libOOTheora.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\libs\\libOOTheora\\Debug\\libOOTheora.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3617,7 +3759,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_52EEBD17D1BC463493F06DCBC4C2CD44"
{
- "SourcePath" = "8:..\\..\\src\\lib\\helper\\libTemporalURI\\Release\\libTemporalURI.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\helper\\libTemporalURI\\Debug\\libTemporalURI.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3645,7 +3787,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraDecoder\\Release\\dsfTheoraDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraDecoder\\Debug\\dsfTheoraDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3673,7 +3815,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_578B89273D59478F861AA5BC3600D074"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggMux\\Release\\dsfOggMux.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggMux\\Debug\\dsfOggMux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3701,7 +3843,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_58F56CD02F64413B9459F3E151760A57"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOgg\\Release\\libOOOgg.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOgg\\Debug\\libOOOgg.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3729,7 +3871,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_5EB08DD30B564283AA9C9F27D80CF9E4"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOggSeek\\Release\\libOOOggSeek.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOggSeek\\Debug\\libOOOggSeek.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3757,7 +3899,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_5F037C77C35B4B5098153851ADDB7B6A"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\dsfCMMLRawSource\\Release\\dsfCMMLRawSource.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\dsfCMMLRawSource\\Debug\\dsfCMMLRawSource.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3785,7 +3927,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_65015192414F476999A68339F89BEA57"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\dsfCMMLDecoder\\Release\\dsfCMMLDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\dsfCMMLDecoder\\Debug\\dsfCMMLDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3813,7 +3955,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_83AF8D74700947168B69E69E5160F082"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\release\\bin\\libFLAC.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\debug\\bin\\libFLAC.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3841,7 +3983,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8976C400668B453CB941859C4F3C6E27"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACDecoder\\Release\\dsfFLACDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACDecoder\\Debug\\dsfFLACDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3869,7 +4011,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8D9A2E4C592D4118B80A4AE8394D8963"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexEncoder\\Release\\dsfSpeexEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexEncoder\\Debug\\dsfSpeexEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3897,7 +4039,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8F970C0B2593413CA2A3BBF5F2600387"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAnxDemux\\Release\\dsfAnxDemux.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAnxDemux\\Debug\\dsfAnxDemux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3925,7 +4067,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_950B983745EC40EF9FF08E742A6E9510"
{
- "SourcePath" = "8:..\\..\\src\\tools\\AnxCutter\\Release\\AnxCutter.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\AnxCutter\\Debug\\AnxCutter.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3953,7 +4095,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_9F87CF49E6BC48AE9DECD5A3F35FEC24"
{
- "SourcePath" = "8:..\\..\\src\\tests\\testTemporal\\Release\\testTemporal.exe"
+ "SourcePath" = "8:..\\..\\src\\tests\\testTemporal\\Debug\\testTemporal.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3981,7 +4123,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_A0E68123D9D541DFA9691752981C903A"
{
- "SourcePath" = "8:..\\..\\src\\tests\\testCMMLParser\\Release\\testCMMLParser.exe"
+ "SourcePath" = "8:..\\..\\src\\tests\\testCMMLParser\\Debug\\testCMMLParser.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4009,7 +4151,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_A5AAB8CB90C548F1820BC101A765616C"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSeeking\\Release\\dsfSeeking.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSeeking\\Debug\\dsfSeeking.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4037,7 +4179,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_AC8962A7F212481095173AB7C8C89025"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraEncoder\\Release\\dsfTheoraEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraEncoder\\Debug\\dsfTheoraEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4065,7 +4207,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_B9749E2A902A46BEAE555C07E32980BB"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggSeekFileMaker\\Release\\OOOggSeekFileMaker.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggSeekFileMaker\\Debug\\OOOggSeekFileMaker.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4093,7 +4235,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggValidate\\Release\\OOOggValidate.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggValidate\\Debug\\OOOggValidate.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4121,7 +4263,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_D2048C8B212841C88E42F6ADDCA8B0A2"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSubtitleVMR9\\Release\\dsfSubtitleVMR9.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSubtitleVMR9\\Debug\\dsfSubtitleVMR9.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4149,7 +4291,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_D3E41A5878FC4EC0B0F443CF3E5991BA"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggSeekFileReader\\Release\\OOOggSeekFileReader.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggSeekFileReader\\Debug\\OOOggSeekFileReader.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4177,7 +4319,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_DB60960DC12343B89500B86D5AB10D02"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\release\\bin\\libFLAC++.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\debug\\bin\\libFLAC++.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4205,7 +4347,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_DCF4ED7597F8492AA49DC521111ED0F5"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggDemux\\Release\\dsfOggDemux.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggDemux\\Debug\\dsfOggDemux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4233,7 +4375,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_E1E372FA955046E6928BF533EA0AE6C3"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libVorbisComment\\Release\\libVorbisComment.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libVorbisComment\\Debug\\libVorbisComment.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4261,7 +4403,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\helper\\libfishsound\\win32\\Release\\libfishsound.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\helper\\libfishsound\\win32\\Debug\\libfishsound.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4289,7 +4431,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_E6B7C1CA6BF74C998B68B4C3379FB830"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggPacketise\\Release\\OOOggPacketise.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggPacketise\\Debug\\OOOggPacketise.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4317,7 +4459,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_EB09F87C612C40BCA34AC87060CFEFF1"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggCommentDump\\Release\\OOOggCommentDump.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggCommentDump\\Debug\\OOOggCommentDump.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4345,7 +4487,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_EFEA71FFF2864107815DBDECCCCA1178"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisDecoder\\Release\\dsfVorbisDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisDecoder\\Debug\\dsfVorbisDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4373,7 +4515,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_FD547F0196C24DFBB9CAFCCEC06561BC"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisEncoder\\Release\\dsfVorbisEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisEncoder\\Debug\\dsfVorbisEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp 2005-02-14 10:18:38 UTC (rev 8911)
@@ -10,8 +10,9 @@
{
mCMMLFormatBlock.granuleDenominator = 1;
mCMMLFormatBlock.granuleNumerator = 1000;
-
+#ifdef OGGCODECS_LOGGING
debugLog.open("G:\\logs\\cmmlrawsource.log", ios_base::out);
+#endif
}
CMMLRawSourcePin::~CMMLRawSourcePin(void)
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp 2005-02-14 10:18:38 UTC (rev 8911)
@@ -67,8 +67,9 @@
, mLastSeenStartGranPos(0)
, mTheoraFormatInfo(NULL)
{
+#ifdef OGGCODECS_LOGGING
debugLog.open("G:\\logs\\newtheofilter.log", ios_base::out);
-
+#endif
mTheoraDecoder = new TheoraDecoder;
mTheoraDecoder->initCodec();
Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeInputPin.cpp 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeInputPin.cpp 2005-02-14 10:18:38 UTC (rev 8911)
@@ -41,8 +41,9 @@
, mUptoFrame(0)
, mVorbisQuality(0.6f)
{
+#ifdef OGGCODECS_LOGGING
debugLog.open("G:\\logs\\vorbisenc.logs", ios_base::out);
-
+#endif
}
VorbisEncodeInputPin::~VorbisEncodeInputPin(void)
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.cpp 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.cpp 2005-02-14 10:18:38 UTC (rev 8911)
@@ -45,8 +45,9 @@
, mAnxVersion(0)
, mAnnodexHeader(NULL)
{
-
+#ifdef OGGCODECS_LOGGING
debugLog.open("G:\\logs\\anxmapper.log", ios_base::out);
+#endif
}
AnxStreamMapper::~AnxStreamMapper(void)
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLSourcePin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLSourcePin.cpp 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLSourcePin.cpp 2005-02-14 10:18:38 UTC (rev 8911)
@@ -40,8 +40,10 @@
CCritSec* inFilterLock,
StreamHeaders* inHeaderSource,
CMediaType* inMediaType,
- wstring inPinName)
- : OggDemuxSourcePin(inObjectName, inParentFilter, inFilterLock, inHeaderSource, inMediaType, inPinName, true)
+ wstring inPinName,
+ unsigned long inNumBuffers,
+ unsigned long inBufferSize)
+ : OggDemuxSourcePin(inObjectName, inParentFilter, inFilterLock, inHeaderSource, inMediaType, inPinName, true, inNumBuffers, inBufferSize)
{
//debugLog.open("G:\\logs\\cmml_source_pin.log", ios_base::out);
}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLSourcePin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLSourcePin.h 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLSourcePin.h 2005-02-14 10:18:38 UTC (rev 8911)
@@ -51,7 +51,9 @@
CCritSec* inFilterLock,
StreamHeaders* inHeaderSource,
CMediaType* inMediaType,
- wstring inPinName);
+ wstring inPinName,
+ unsigned long inNumBuffers,
+ unsigned long inBufferSize);
virtual ~CMMLSourcePin(void);
//Implements IStreamBuilder to force the pin tothe cmml filter
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.cpp 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.cpp 2005-02-14 10:18:38 UTC (rev 8911)
@@ -62,7 +62,9 @@
mOwningFilter->theLock(),
mCodecHeaders,
locMediaType,
- getPinName());
+ getPinName(),
+ getNumBuffers(),
+ getBufferSize());
mStreamReady = true;
mSourcePin = locSourcePin;
@@ -118,4 +120,11 @@
LONGLONG CMMLStream::getCurrentPos() {
return (mLastEndGranulePos * UNITS * mCMMLFormatBlock->granuleDenominator) / mCMMLFormatBlock->granuleNumerator;
+}
+
+unsigned long CMMLStream::getNumBuffers() {
+ return CMML_NUM_BUFFERS;
+}
+unsigned long CMMLStream::getBufferSize() {
+ return CMML_BUFFER_SIZE;
}
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.h 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.h 2005-02-14 10:18:38 UTC (rev 8911)
@@ -59,10 +59,15 @@
virtual LONGLONG getCurrentPos();
+ virtual unsigned long getNumBuffers();
+ virtual unsigned long getBufferSize();
+
//Override
virtual bool AddPin();
protected:
+ static const unsigned long CMML_NUM_BUFFERS = 25;
+ static const unsigned long CMML_BUFFER_SIZE = 65536;
OggPacket* mAnxDataPacket;
sCMMLFormatBlock* mCMMLFormatBlock;
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp 2005-02-14 10:18:38 UTC (rev 8911)
@@ -42,7 +42,9 @@
, mAnxVersionMajor(inAnxVersionMajor)
, mAnxVersionMinor(inAnxVersionMinor)
{
+#ifdef OGGCODECS_LOGGING
debugLog.open("g:\\logs\\anxmuxinputpin.log", ios_base::out);
+#endif
mExtraPackets.clear();
}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/anxmuxdllstuff.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/anxmuxdllstuff.cpp 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/anxmuxdllstuff.cpp 2005-02-14 10:18:38 UTC (rev 8911)
@@ -47,8 +47,7 @@
//The folowing two functions do the registration and deregistration of the dll and it's contained com objects.
STDAPI DllRegisterServer()
{
- fstream debugLog;
- debugLog.open("G:\\logs\\anxmuxreg.log", ios_base::out);
+
//TO DO::: Should we be releasing the filter mapper even when we return early ?
HRESULT hr;
IFilterMapper2* locFilterMapper = NULL;
@@ -60,16 +59,16 @@
}
- debugLog<<"Pre - create"<<endl;
+
hr = CoCreateInstance(CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, IID_IFilterMapper2, (void **)&locFilterMapper);
- debugLog<<"Post - create"<<endl;
+
if (FAILED(hr)) {
- debugLog<<"Failed Create"<<endl;
+
return hr;
}
- debugLog<<"Pre reg"<<endl;
+
hr = locFilterMapper->RegisterFilter(
CLSID_AnxMuxFilter, // Filter CLSID.
L"Annodex Mux Filter", // Filter name.
@@ -78,8 +77,8 @@
L"Annodex Mux Filter", // Instance data. ???????
&AnxMuxFilterReg // Pointer to filter information.
);
- debugLog<<"Post reg - "<< hr<<endl;
- debugLog.close();
+
+
locFilterMapper->Release();
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.cpp 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.cpp 2005-02-14 10:18:38 UTC (rev 8911)
@@ -252,4 +252,11 @@
LONGLONG FFDShowVideoStream::getCurrentPos() {
return 0;
-}
\ No newline at end of file
+}
+
+unsigned long FFDShowVideoStream::getNumBuffers() {
+ return FFDSHOW_VIDEO_NUM_BUFFERS;
+}
+unsigned long FFDShowVideoStream::getBufferSize() {
+ return FFDSHOW_VIDEO_BUFFER_SIZE;
+}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.h 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.h 2005-02-14 10:18:38 UTC (rev 8911)
@@ -52,12 +52,16 @@
virtual GUID getMajorTypeGUID();
virtual LONGLONG getCurrentPos();
+ virtual unsigned long getNumBuffers();
+ virtual unsigned long getBufferSize();
//Override
virtual bool dispatchPacket(StampedOggPacket* inPacket);
virtual bool deliverCodecHeaders();
protected:
+ static const unsigned long FFDSHOW_VIDEO_NUM_BUFFERS = 50;
+ static const unsigned long FFDSHOW_VIDEO_BUFFER_SIZE = 1024*512*3;
VIDEOINFOHEADER* mFFDShowVideoFormatBlock;
DWORD mFourCCCode;
GUID mMediaSubTypeGUID;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FLACStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FLACStream.cpp 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FLACStream.cpp 2005-02-14 10:18:38 UTC (rev 8911)
@@ -97,6 +97,13 @@
return MEDIATYPE_Audio;
}
+unsigned long FLACStream::getNumBuffers() {
+ return FLAC_NUM_BUFFERS;
+}
+unsigned long FLACStream::getBufferSize() {
+ return FLAC_BUFFER_SIZE;
+}
+
//Need to override from oggstream because we have variable number of headers
bool FLACStream::processHeaderPacket(StampedOggPacket* inPacket) {
//FIX::: Return values
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FLACStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FLACStream.h 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FLACStream.h 2005-02-14 10:18:38 UTC (rev 8911)
@@ -53,6 +53,9 @@
virtual GUID getMajorTypeGUID();
virtual LONGLONG getCurrentPos();
+ virtual unsigned long getNumBuffers();
+ virtual unsigned long getBufferSize();
+
//Override from oggstream to handle dynamic number of headers.
virtual bool FLACStream::processHeaderPacket(StampedOggPacket* inPacket);
virtual bool deliverCodecHeaders();
@@ -62,6 +65,8 @@
virtual void setLastEndGranPos(__int64 inPos);
protected:
+ static const unsigned long FLAC_NUM_BUFFERS = 75;
+ static const unsigned long FLAC_BUFFER_SIZE = 65536; //Possibly should be higher... could even be dynamicly checked from header
//unsigned long mNumHeaderPackets;
sFLACFormatBlock* mFLACFormatBlock;
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp 2005-02-14 10:18:38 UTC (rev 8911)
@@ -39,11 +39,11 @@
, mNumLeftovers(0)
{
mBufferLock = new CCritSec;
+#ifdef OGGCODECS_LOGGING
debugLog.open("d:\\zen\\logs\\htttp.log", ios_base::out);
- //debugLog<<"==========================================="<<endl;
fileDump.open("d:\\zen\\logs\\filedump.ogg", ios_base::out|ios_base::binary);
rawDump.open("D:\\zen\\logs\\rawdump.out", ios_base::out|ios_base::binary);
-
+#endif
mInterBuff = new unsigned char[RECV_BUFF_SIZE* 2];
}
@@ -53,9 +53,11 @@
//debugLog<<"About to close socket"<<endl;
close();
//debugLog<<"Winsock ended"<<endl;
+#ifdef OGGCODECS_LOGGING
debugLog.close();
fileDump.close();
rawDump.close();
+#endif
delete mBufferLock;
delete mInterBuff;
}
@@ -66,7 +68,7 @@
//This method is a bit rough and ready !!
ASSERT(inNumBytes > 2);
rawDump.write((char*)inBuff, inNumBytes);
- debugLog<<"UnChunk"<<endl;
+ //debugLog<<"UnChunk"<<endl;
unsigned long locNumBytesLeft = inNumBytes;
memcpy((void*)(mInterBuff + mNumLeftovers), (const void*)inBuff, inNumBytes);
@@ -74,26 +76,26 @@
mNumLeftovers = 0;
unsigned char* locWorkingBuffPtr = mInterBuff;
- debugLog<<"inNumBytes = "<<inNumBytes<<endl;
+ //debugLog<<"inNumBytes = "<<inNumBytes<<endl;
while (locNumBytesLeft > 8) {
- debugLog<<"---"<<endl;
- debugLog<<"Bytes left = "<<locNumBytesLeft<<endl;
- debugLog<<"ChunkRemaining = "<<mChunkRemains<<endl;
+ //debugLog<<"---"<<endl;
+ //debugLog<<"Bytes left = "<<locNumBytesLeft<<endl;
+ //debugLog<<"ChunkRemaining = "<<mChunkRemains<<endl;
if (mChunkRemains == 0) {
- debugLog<<"Zero bytes of chunk remains"<<endl;
+ //debugLog<<"Zero bytes of chunk remains"<<endl;
//Assign to a string for easy manipulation of the hex size
string locTemp;
if (mIsFirstChunk) {
- debugLog<<"It's the first chunk"<<endl;
+ //debugLog<<"It's the first chunk"<<endl;
mIsFirstChunk = false;
locTemp = (char*)locWorkingBuffPtr;
} else {
- debugLog<<"Not the first chunk"<<endl;
- debugLog<<"Skip bytes = "<<(int)locWorkingBuffPtr[0]<<(int)locWorkingBuffPtr[1]<<endl;
+ //debugLog<<"Not the first chunk"<<endl;
+ //debugLog<<"Skip bytes = "<<(int)locWorkingBuffPtr[0]<<(int)locWorkingBuffPtr[1]<<endl;
locTemp = (char*)(locWorkingBuffPtr + 2);
locWorkingBuffPtr+=2;
locNumBytesLeft -= 2;
@@ -109,22 +111,22 @@
if (locChunkSizePos != string::npos) {
- debugLog<<"Found the size bytes "<<endl;
+ //debugLog<<"Found the size bytes "<<endl;
//Get a string representation of the hex string that tells us the size of the chunk
string locChunkSizeStr = locTemp.substr(0, locChunkSizePos);
- debugLog<<"Sizingbuytes " << locChunkSizeStr<<endl;
+ //debugLog<<"Sizingbuytes " << locChunkSizeStr<<endl;
char* locDummyPtr = NULL;
//Convert it to a number
mChunkRemains = strtol(locChunkSizeStr.c_str(), &locDummyPtr, 16);
- debugLog<<"Chunk reamining "<<mChunkRemains<<endl;
+ //debugLog<<"Chunk reamining "<<mChunkRemains<<endl;
//The size of the crlf 's and the chunk size value
unsigned long locGuffSize = (unsigned long)(locChunkSizeStr.size() + 2);
locWorkingBuffPtr += locGuffSize;
locNumBytesLeft -= locGuffSize;
} else {
- debugLog<<"************************************** "<<endl;
+ //debugLog<<"************************************** "<<endl;
}
@@ -132,13 +134,13 @@
//This is the end of file
if (mChunkRemains == 0) {
- debugLog<<"EOF"<<endl;
+ //debugLog<<"EOF"<<endl;
return;
}
//If theres less bytes than the remainder of the chunk
if (locNumBytesLeft < mChunkRemains) {
- debugLog<<"less bytes remain than the chunk needs"<<endl;
+ //debugLog<<"less bytes remain than the chunk needs"<<endl;
mFileCache.write((const unsigned char*)locWorkingBuffPtr, locNumBytesLeft );
fileDump.write((char*)locWorkingBuffPtr, locNumBytesLeft);
@@ -146,7 +148,7 @@
mChunkRemains -= locNumBytesLeft;
locNumBytesLeft = 0;
} else {
- debugLog<<"more bytes remain than the chunk needs"<<endl;
+ //debugLog<<"more bytes remain than the chunk needs"<<endl;
mFileCache.write((const unsigned char*)locWorkingBuffPtr, mChunkRemains );
fileDump.write((char*)locWorkingBuffPtr, mChunkRemains);
locWorkingBuffPtr += mChunkRemains;
@@ -157,7 +159,7 @@
}
if (locNumBytesLeft != 0) {
- debugLog<<"There is a non- zero amount of bytes leftover... buffer them up for next time..."<<endl;
+ //debugLog<<"There is a non- zero amount of bytes leftover... buffer them up for next time..."<<endl;
memcpy((void*)mInterBuff, (const void*)locWorkingBuffPtr, locNumBytesLeft);
mNumLeftovers = locNumBytesLeft;
}
@@ -263,7 +265,7 @@
//Close the socket down
//Open up a new one to the same place.
//Make the partial content request.
- debugLog<<"Seeking to "<<inPos<<endl;
+ //debugLog<<"Seeking to "<<inPos<<endl;
if (mFileCache.readSeek(inPos)) {
return inPos;
} else {
@@ -275,7 +277,7 @@
void HTTPFileSource::close() {
//Killing thread
- debugLog<<"HTTPFileSource::close()"<<endl;
+ //debugLog<<"HTTPFileSource::close()"<<endl;
if (ThreadExists() == TRUE) {
//debugLog<<"Calling Thread to EXIT"<<endl;
CallWorker(THREAD_EXIT);
@@ -301,7 +303,7 @@
//
mSeenResponse = false;
mLastResponse = "";
- debugLog<<"Open: "<<inSourceLocation<<endl;
+ //debugLog<<"Open: "<<inSourceLocation<<endl;
{ //CRITICAL SECTION - PROTECTING STREAM BUFFER
CAutoLock locLock(mBufferLock);
@@ -355,7 +357,7 @@
//debugLog<<"isEOF : Amount Buffered avail = "<<locSizeBuffed<<endl;
if ((locSizeBuffed == 0) && mIsEOF) {
- debugLog<<"isEOF : It is EOF"<<endl;
+ //debugLog<<"isEOF : It is EOF"<<endl;
return true;
} else {
//debugLog<<"isEOF : It's not EOF"<<endl;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp 2005-02-14 10:18:38 UTC (rev 8911)
@@ -115,11 +115,10 @@
mDemuxLock = new CCritSec;
mStreamLock = new CCritSec;
mStreamMapper = new OggStreamMapper(this);
+
+#ifdef OGGCODECS_LOGGING
debugLog.open("g:\\logs\\sourcelog.log", ios_base::out);
- //debugLog<<"Test..."<<endl;
- //debugLog.seekp(0, ios_base::end);
- //debugLog<<"Test2..."<<endl;
- //debugLog << "**************** Starting LOg ********************"<<endl;
+#endif
}
@@ -136,8 +135,10 @@
mSourceFileLock = new CCritSec;
mDemuxLock = new CCritSec;
mStreamLock = new CCritSec;
+#ifdef OGGCODECS_LOGGING
+ debugLog.open("d:\\zen\\logs\\anx_base_sourcelog.log", ios_base::out);
+#endif
- debugLog.open("d:\\zen\\logs\\anx_base_sourcelog.log", ios_base::out);
//When it is derived, it's up to the superclass to set this.
//mStreamMapper = new OggStreamMapper(this);
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.cpp 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.cpp 2005-02-14 10:18:38 UTC (rev 8911)
@@ -37,7 +37,9 @@
StreamHeaders* inHeaderSource,
CMediaType* inMediaType,
wstring inPinName,
- bool inAllowSeek )
+ bool inAllowSeek,
+ unsigned long inNumBuffers,
+ unsigned long inBufferSize)
: CBaseOutputPin( NAME("Ogg Demux Output Pin")
, inParentFilter
, inFilterLock
@@ -49,11 +51,15 @@
, mDataQueue(NULL)
, mFirstRun(true)
, mPartialPacket(NULL)
+ , mBufferSize(inBufferSize)
+ , mNumBuffers(inNumBuffers)
{
//TODO::: Something about this is causing a COM reference leak.
+#ifdef OGGCODECS_LOGGING
+ debugLog.open("d:\\zen\\logs\\sourcefilterpin.log", ios_base::out);
+#endif
- debugLog.open("d:\\zen\\logs\\sourcefilterpin.log", ios_base::out);
IMediaSeeking* locSeeker = NULL;
//if (inAllowSeek) {
//debugLog<<"Allowing seek"<<endl;
@@ -228,9 +234,9 @@
ALLOCATOR_PROPERTIES locActualAlloc;
locReqAlloc.cbAlign = 1;
- locReqAlloc.cbBuffer = BUFFER_SIZE;
+ locReqAlloc.cbBuffer = mBufferSize; //BUFFER_SIZE;
locReqAlloc.cbPrefix = 0;
- locReqAlloc.cBuffers = NUM_BUFFERS;
+ locReqAlloc.cBuffers = mNumBuffers; //NUM_BUFFERS;
locHR = inoutAllocator->SetProperties(&locReqAlloc, &locActualAlloc);
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourcePin.h 2005-02-14 10:18:38 UTC (rev 8911)
@@ -55,7 +55,9 @@
StreamHeaders* inHeaderSource,
CMediaType* inMediaType,
wstring inPinName,
- bool inAllowSeek);
+ bool inAllowSeek,
+ unsigned long inNumBuffers,
+ unsigned long inBufferSize);
@@ -92,4 +94,7 @@
COutputQueue* mDataQueue;
fstream debugLog;
bool mFirstRun;
+
+ unsigned long mBufferSize;
+ unsigned long mNumBuffers;
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggFLAC_1_0_Stream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggFLAC_1_0_Stream.cpp 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggFLAC_1_0_Stream.cpp 2005-02-14 10:18:38 UTC (rev 8911)
@@ -111,6 +111,13 @@
return MEDIATYPE_Audio;
}
+unsigned long OggFLAC_1_0_Stream::getNumBuffers() {
+ return OGG_FLAC_1_0_NUM_BUFFERS;
+}
+unsigned long OggFLAC_1_0_Stream::getBufferSize() {
+ return OGG_FLAC_1_0_BUFFER_SIZE;
+}
+
//Need to override from oggstream because we have variable number of headers
bool OggFLAC_1_0_Stream::processHeaderPacket(StampedOggPacket* inPacket) {
//FIX::: Return values
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggFLAC_1_0_Stream.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggFLAC_1_0_Stream.h 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggFLAC_1_0_Stream.h 2005-02-14 10:18:38 UTC (rev 8911)
@@ -53,6 +53,9 @@
virtual GUID getMajorTypeGUID();
virtual LONGLONG getCurrentPos();
+ virtual unsigned long getNumBuffers();
+ virtual unsigned long getBufferSize();
+
//Override from oggstream to handle dynamic number of headers.
virtual bool OggFLAC_1_0_Stream::processHeaderPacket(StampedOggPacket* inPacket);
virtual bool deliverCodecHeaders();
@@ -62,6 +65,9 @@
virtual void setLastEndGranPos(__int64 inPos);
protected:
+
+ static const unsigned long OGG_FLAC_1_0_BUFFER_SIZE = 65536; //Maybe not high enough for some cases... could also be dynamic from headers
+ static const unsigned long OGG_FLAC_1_0_NUM_BUFFERS = 75;
//unsigned long mNumHeaderPackets;
sFLACFormatBlock* mFLACFormatBlock;
bool mIsFixedNumHeaders;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.cpp 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.cpp 2005-02-14 10:18:38 UTC (rev 8911)
@@ -209,7 +209,10 @@
mCodecHeaders,
locMediaType,
getPinName(),
- mAllowSeek);
+ mAllowSeek,
+ getNumBuffers(),
+ getBufferSize()
+ );
mStreamReady = true;
mSourcePin = locSourcePin;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.h 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.h 2005-02-14 10:18:38 UTC (rev 8911)
@@ -59,6 +59,7 @@
unsigned long serialNo();
void setSerialNo(unsigned long inSerialNo);
//virtual bool IdentifyCodec(OggPacket* inOggPacket) = 0;
+
virtual bool InitCodec(StampedOggPacket* inOggPacket) = 0;
virtual BYTE* getFormatBlock() = 0;
virtual unsigned long getFormatBlockSize() = 0;
@@ -71,6 +72,9 @@
virtual LONGLONG getCurrentPos() = 0;
+ virtual unsigned long getNumBuffers() = 0;
+ virtual unsigned long getBufferSize() = 0;
+
virtual unsigned long numCodecHeaders();
void setSendExcess(bool inSendExcess);
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/SpeexStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/SpeexStream.cpp 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/SpeexStream.cpp 2005-02-14 10:18:38 UTC (rev 8911)
@@ -95,4 +95,11 @@
LONGLONG SpeexStream::getCurrentPos() {
return (mLastEndGranulePos * UNITS) / mSpeexFormatBlock->samplesPerSec;
+}
+
+unsigned long SpeexStream::getNumBuffers() {
+ return SPEEX_NUM_BUFFERS;
+}
+unsigned long SpeexStream::getBufferSize() {
+ return SPEEX_BUFFER_SIZE;
}
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/SpeexStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/SpeexStream.h 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/SpeexStream.h 2005-02-14 10:18:38 UTC (rev 8911)
@@ -52,8 +52,13 @@
virtual GUID getMajorTypeGUID();
virtual LONGLONG getCurrentPos();
+ virtual unsigned long getNumBuffers();
+ virtual unsigned long getBufferSize();
+
virtual void setLastEndGranPos(__int64 inPos);
protected:
+ static const unsigned long SPEEX_NUM_BUFFERS = 75;
+ static const unsigned long SPEEX_BUFFER_SIZE = 65536;
sSpeexFormatBlock* mSpeexFormatBlock;
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.cpp 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.cpp 2005-02-14 10:18:38 UTC (rev 8911)
@@ -140,4 +140,15 @@
LONGLONG TheoraStream::getCurrentPos() {
return 0; //(mLastGranulePos * UNITS) / mVorbisFormatBlock->samplesPerSec;
-}
\ No newline at end of file
+}
+
+unsigned long TheoraStream::getNumBuffers() {
+ return THEORA_NUM_BUFFERS;
+}
+unsigned long TheoraStream::getBufferSize() {
+ unsigned long locBuffSize = ((unsigned long)mTheoraFormatBlock->outerFrameHeight * (unsigned long)mTheoraFormatBlock->outerFrameWidth * 3) >> 3;
+ if (locBuffSize < 65536) {
+ locBuffSize = 65536;
+ }
+ return locBuffSize;
+}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.h 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.h 2005-02-14 10:18:38 UTC (rev 8911)
@@ -54,8 +54,14 @@
virtual GUID getMajorTypeGUID();
virtual LONGLONG getCurrentPos();
+ virtual unsigned long getNumBuffers();
+ virtual unsigned long getBufferSize();
+
virtual void setLastEndGranPos(__int64 inPos);
protected:
+ static const unsigned long THEORA_NUM_BUFFERS = 50;
+ static const unsigned long THEORA_BUFFER_SIZE = 1024*512;
+
sTheoraFormatBlock* mTheoraFormatBlock;
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.cpp 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.cpp 2005-02-14 10:18:38 UTC (rev 8911)
@@ -95,4 +95,11 @@
LONGLONG VorbisStream::getCurrentPos() {
return (mLastEndGranulePos * UNITS) / mVorbisFormatBlock->samplesPerSec;
+}
+
+unsigned long VorbisStream::getNumBuffers() {
+ return VORBIS_NUM_BUFFERS;
+}
+unsigned long VorbisStream::getBufferSize() {
+ return VORBIS_BUFFER_SIZE;
}
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.h 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.h 2005-02-14 10:18:38 UTC (rev 8911)
@@ -57,7 +57,13 @@
virtual GUID getMajorTypeGUID();
virtual LONGLONG getCurrentPos();
+ virtual unsigned long getNumBuffers();
+ virtual unsigned long getBufferSize();
+
protected:
+ static const unsigned long VORBIS_NUM_BUFFERS = 75;
+ static const unsigned long VORBIS_BUFFER_SIZE = 65536; //Should be plenty... wouldn't hurt to find out !!
+
sVorbisFormatBlock* mVorbisFormatBlock;
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp 2005-02-14 10:18:38 UTC (rev 8911)
@@ -127,8 +127,10 @@
m_pLock = new CCritSec;
mStreamLock = new CCritSec;
mInputPins.push_back(new OggMuxInputPin(this, m_pLock, &mHR, mInterleaver->newStream()));
+
+#ifdef OGGCODECS_LOGGING
debugLog.open("g:\\logs\\muxer.log", ios_base::out);
-
+#endif
////Make our delegate pin[0], the top pin... we send all out requests there.
//IMediaSeeking* locSeeker = NULL;
//mInputPins[0]->NonDelegatingQueryInterface(IID_IMediaSeeking, (void**)&locSeeker);
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp 2005-02-14 10:18:38 UTC (rev 8911)
@@ -37,13 +37,18 @@
, mProgressTime(0)
, mBytesWritten(0)
{
+#ifdef OGGCODECS_LOGGING
debugLog.open("G:\\logs\\interleaver.log", ios_base::out);
+#endif
}
OggPageInterleaver::~OggPageInterleaver(void)
{
+#ifdef OGGCODECS_LOGGING
debugLog.close();
+#endif
+
//Need to delete stream objects
}
@@ -54,8 +59,10 @@
}
void OggPageInterleaver::notifyArrival() {
+#ifdef OGGCODECS_LOGGING
debugLog<<endl;
debugLog<<"notifyArrival : "<<endl;
+#endif
processData();
}
void OggPageInterleaver::processData() {
@@ -85,28 +92,30 @@
*/
//
//Temp
-
+#ifdef OGGCODECS_LOGGING
debugLog<<endl;
debugLog<<"ProcessData : "<<endl;
+#endif
if (isAllEOS()) {
- debugLog<<"ProcessData : All Streams EOS."<<endl;
+ //debugLog<<"ProcessData : All Streams EOS."<<endl;
+
//Finish up
while (!isAllEmpty()) {
- debugLog<<"ProcessData : All Streams EOS : Flushing."<<endl;
+ //debugLog<<"ProcessData : All Streams EOS : Flushing."<<endl;
writeLowest();
}
- debugLog<<"ProcessData : All Streams EOS : Notify complete."<<endl;
+ //debugLog<<"ProcessData : All Streams EOS : Notify complete."<<endl;
mNotifier->NotifyComplete();
} else {
- debugLog<<"ProcessData : All Streams *NOT* EOS."<<endl;
+ //debugLog<<"ProcessData : All Streams *NOT* EOS."<<endl;
while (isProcessable()) {
- debugLog<<"ProcessData : Writing lowest"<<endl;
+ //debugLog<<"ProcessData : Writing lowest"<<endl;
writeLowest();
}
- debugLog<<"ProcessData : No more processable data"<<endl;
+ //debugLog<<"ProcessData : No more processable data"<<endl;
if (isAllEOS() && isAllEmpty()) {
- debugLog<<"ProcessData : All EOS and all Empty... Notifying complete..."<<endl;
+ //debugLog<<"ProcessData : All EOS and all Empty... Notifying complete..."<<endl;
mNotifier->NotifyComplete();
}
}
@@ -133,12 +142,12 @@
LOOG_INT64 locTestLowTime = mInputStreams[i]->scaledFrontTime();
//debuging
- LOOG_INT64 locCurrLowTimeUNS = locLowestStream->frontTime();
- LOOG_INT64 locTestLowTimeUNS = mInputStreams[i]->frontTime();
+ //LOOG_INT64 locCurrLowTimeUNS = locLowestStream->frontTime();
+ //LOOG_INT64 locTestLowTimeUNS = mInputStreams[i]->frontTime();
//debugging end
- debugLog<<"writeLowest : Scaled : Curr = "<<locCurrLowTime<<" -- Test["<<(unsigned long)i<<"] = "<<locTestLowTime<<endl;
- debugLog<<"writeLowest : UNSCAL : Curr = "<<locCurrLowTimeUNS<<" -- Test["<<(unsigned long)i<<"] = "<<locTestLowTimeUNS<<endl;
+ //debugLog<<"writeLowest : Scaled : Curr = "<<locCurrLowTime<<" -- Test["<<(unsigned long)i<<"] = "<<locTestLowTime<<endl;
+ //debugLog<<"writeLowest : UNSCAL : Curr = "<<locCurrLowTimeUNS<<" -- Test["<<(unsigned long)i<<"] = "<<locTestLowTimeUNS<<endl;
//ASSERT (all header packets have granule pos 0)
@@ -171,27 +180,27 @@
//DeBUGGIN BLOCK
if ( (mInputStreams[i]->peekFront() != NULL) &&
(mInputStreams[i]->peekFront()->header()->isBOS()) ) {
- debugLog<<"WriteLowest : Selecting because BOS"<<endl;
+ //debugLog<<"WriteLowest : Selecting because BOS"<<endl;
}
if ( (mInputStreams[i]->peekFront() != NULL) &&
((mInputStreams[i]->peekFront()->header()->GranulePos()) == -1) ) {
- debugLog<<"WriteLowest : Selecting because gran pos = -1"<<endl;
+ //debugLog<<"WriteLowest : Selecting because gran pos = -1"<<endl;
}
if ((mInputStreams[i]->peekFront() != NULL) &&
(!mInputStreams[i]->sentAllHeaders()) &&
(mInputStreams[i]->packetsSent() < locLowestStream->packetsSent()) ) {
- debugLog<<"WriteLowest : Selecting because hasn't sent all headers"<<endl;
+ //debugLog<<"WriteLowest : Selecting because hasn't sent all headers"<<endl;
}
if (locTestLowTime < locCurrLowTime) {
- debugLog<<"WriteLowest : Selecting because test time "<<locTestLowTime<<" less than "<<locCurrLowTime<<endl;
+ //debugLog<<"WriteLowest : Selecting because test time "<<locTestLowTime<<" less than "<<locCurrLowTime<<endl;
}
//END BEBUGGING BLOCK
locLowestStream = mInputStreams[i];
- debugLog<<"writeLowest : Selecting stream "<<(unsigned long)i<<" @ Gran = "<<locLowestStream->frontTime()<<" & Time = "<<locLowestStream->scaledFrontTime()<<endl;
+ //debugLog<<"writeLowest : Selecting stream "<<(unsigned long)i<<" @ Gran = "<<locLowestStream->frontTime()<<" & Time = "<<locLowestStream->scaledFrontTime()<<endl;
}
}
}
@@ -199,12 +208,12 @@
if (locLowestStream == NULL) {
throw 0;
} else {
- debugLog<<"writeLowest : Writing..."<<endl;
+ //debugLog<<"writeLowest : Writing..."<<endl;
if (locLowestStream->scaledFrontTime() != -1) {
mProgressTime = locLowestStream->scaledFrontTime();
}
- debugLog<<"writeLowest : Progress Time = "<<mProgressTime<<endl;
+ //debugLog<<"writeLowest : Progress Time = "<<mProgressTime<<endl;
OggPage* locPageToWrite = locLowestStream->popFront();
mBytesWritten += locPageToWrite->pageSize();
@@ -229,29 +238,29 @@
for (size_t i = 0; i < mInputStreams.size(); i++) {
retVal = retVal && (mInputStreams[i]->isProcessable());
}
- if (retVal) {
- debugLog<<"isPRocessable : TRUE"<<endl;
- } else {
- debugLog<<"isPRocessable : FALSE"<<endl;
- }
+ //if (retVal) {
+ // debugLog<<"isPRocessable : TRUE"<<endl;
+ //} else {
+ // debugLog<<"isPRocessable : FALSE"<<endl;
+ //}
return retVal;
}
bool OggPageInterleaver::isAllEOS() {
bool retVal = true;
//ASSERT(mInputStreams.size() >= 1)
for (size_t i = 0; i < mInputStreams.size(); i++) {
- if (mInputStreams[i]->isEOS()) {
- debugLog<<"isAllEOS : ***** Stream "<<(unsigned long)i<<" is EOS"<<endl;
- } else {
- debugLog<<"isAllEOS : ***** Stream "<<(unsigned long)i<<" not EOS"<<endl;
- }
+ //if (mInputStreams[i]->isEOS()) {
+ // debugLog<<"isAllEOS : ***** Stream "<<(unsigned long)i<<" is EOS"<<endl;
+ //} else {
+ // debugLog<<"isAllEOS : ***** Stream "<<(unsigned long)i<<" not EOS"<<endl;
+ //}
retVal = retVal && (mInputStreams[i]->isEOS() || !mInputStreams[i]->isActive());
}
- if (retVal) {
- debugLog<<"isAllEOS : TRUE"<<endl;
- } else {
- debugLog<<"isAllEOS : FALSE"<<endl;
- }
+ //if (retVal) {
+ // debugLog<<"isAllEOS : TRUE"<<endl;
+ //} else {
+ // debugLog<<"isAllEOS : FALSE"<<endl;
+ //}
return retVal;
}
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp 2005-02-14 10:18:38 UTC (rev 8911)
@@ -124,15 +124,15 @@
{
delete mHeaderBuff;
mHeaderBuff = NULL;
- debugLog.close();
+ //debugLog.close();
}
//Calling this after you have fed in packets will cause lost data and memory leak (mPending page)
bool OggPaginator::setParameters(OggPaginatorSettings* inSettings) {
delete mSettings;
mSettings = inSettings;
- string x= "G:\\logs\\paginator" + StringHelper::numToString(inSettings->mSerialNo) + ".log";
- debugLog.open(x.c_str(), ios_base::out);
+ //string x= "G:\\logs\\paginator" + StringHelper::numToString(inSettings->mSerialNo) + ".log";
+ //debugLog.open(x.c_str(), ios_base::out);
createFreshPage();
return true;
}
@@ -157,12 +157,12 @@
//When we get a signal to finish a stream, we set the EOS Flag on the current page pending
// which may be empty, and then deliver it.
- debugLog<<endl;
- debugLog<<"finishStream : ";
+ //debugLog<<endl;
+ //debugLog<<"finishStream : ";
//This makes sure if our last page is empty and we want to send the EOS page, we stamp it with the previous granule pos
// since if this page has no packets it must be the same. Makes it easier to find the stream duration.
if (mPendingPage->numPackets() == 0) {
- debugLog<<"finishStream : Setting gran pos on 0 pack last page to "<<mLastGranulePos<<endl;
+ //debugLog<<"finishStream : Setting gran pos on 0 pack last page to "<<mLastGranulePos<<endl;
mPendingPage->header()->setGranulePos(mLastGranulePos);
}
@@ -220,8 +220,8 @@
}
bool OggPaginator::deliverCurrentPage() {
- debugLog<<endl;
- debugLog<<"deliverCurrentPage : "<<endl;
+ //debugLog<<endl;
+ //debugLog<<"deliverCurrentPage : "<<endl;
mPendingPage->header()->setSegmentTable((const unsigned char*)mSegmentTable, mSegmentTableSize);
mPendingPage->header()->setDataSize(mCurrentPageSize - mPendingPage->headerSize()); //This is odd
@@ -239,8 +239,8 @@
}
bool OggPaginator::createFreshPage() {
- debugLog<<endl;
- debugLog<<"createFreshPage : "<<endl;
+ //debugLog<<endl;
+ //debugLog<<"createFreshPage : "<<endl;
mPendingPage = new OggPage; //Potential for leak here if setsettings called. Otherwise deleted in destructor or dispatched
mCurrentPageSize = OggPageHeader::OGG_BASE_HEADER_SIZE;
mPendingPageHasData = false;
@@ -251,10 +251,10 @@
//If it's the first page it gets the BOS Flag
if (mSequenceNo == 0) {
- debugLog<<"createFreshPage : Setting as BOS"<<endl;
+ //debugLog<<"createFreshPage : Setting as BOS"<<endl;
mPendingPage->header()->setHeaderFlags(OggPageHeader::BOS);
} else {
- debugLog<<"createFreshPage : Setting NO FLAGS"<<endl;
+ //debugLog<<"createFreshPage : Setting NO FLAGS"<<endl;
mPendingPage->header()->setHeaderFlags(OggPageHeader::NO_FLAGS);
}
@@ -265,8 +265,8 @@
}
bool OggPaginator::addPacketToPage(StampedOggPacket* inOggPacket) {
- debugLog<<endl;
- debugLog<<"addPacketToPage : "<<endl;
+ //debugLog<<endl;
+ //debugLog<<"addPacketToPage : "<<endl;
mPendingPageHasData = true;
//while some packet left
// add as much as possible
@@ -285,7 +285,7 @@
unsigned long locPacketStartPoint = 0;
unsigned long locConsumed = 0;
- debugLog<<"addPacketToPage : Packet size = "<<locPacketRemaining<<endl;
+ //debugLog<<"addPacketToPage : Packet size = "<<locPacketRemaining<<endl;
//While there is still more packet not added to the page add as much as it will take.
while (locPacketRemaining > 0) {
@@ -293,12 +293,12 @@
locConsumed = addAsMuchPacketAsPossible(inOggPacket, locPacketStartPoint, locPacketRemaining);
- debugLog<<"addPacketToPage : Packet consumed = "<<locPacketRemaining<<endl;
+ //debugLog<<"addPacketToPage : Packet consumed = "<<locPacketRemaining<<endl;
locPacketStartPoint += locConsumed;
locPacketRemaining -= locConsumed;
- debugLog<<"addPacketToPage : Packet remaining = "<<locPacketRemaining<<endl;
- debugLog<<"addPacketToPage : Packet part start at = "<<locPacketStartPoint<<endl;
+ //debugLog<<"addPacketToPage : Packet remaining = "<<locPacketRemaining<<endl;
+ //debugLog<<"addPacketToPage : Packet part start at = "<<locPacketStartPoint<<endl;
}
@@ -309,9 +309,9 @@
//Every header gets it's own page.
if (((mPacketCount < mSettings->mNumHeaders) || ((mSettings->mMaxPacksPerPage != 0) && (mPacketCount >= mSettings->mMaxPacksPerPage))) && (mPendingPageHasData)) {
- debugLog<<"addPacketToPage : Cond Deliv : Packet Count = "<<mPacketCount<<endl;
- debugLog<<"addPacketToPage : Cond Deliv : Num Headers = "<<mSettings->mNumHeaders<<endl;
- debugLog<<"addPacketToPage : Cond Deliv : Max Pack per page = "<<mSettings->mMaxPacksPerPage<<endl;
+ //debugLog<<"addPacketToPage : Cond Deliv : Packet Count = "<<mPacketCount<<endl;
+ //debugLog<<"addPacketToPage : Cond Deliv : Num Headers = "<<mSettings->mNumHeaders<<endl;
+ //debugLog<<"addPacketToPage : Cond Deliv : Max Pack per page = "<<mSettings->mMaxPacksPerPage<<endl;
deliverCurrentPage();
}
@@ -328,12 +328,12 @@
//debugLog<<"Max page size = "<<mSettings->mMaxPageSize<<endl;
//debugLog<<"Current page size = "<<mCurrentPageSize<<endl;
- debugLog<<endl;
- debugLog<<"addAsMuchPacketAsPossible : "<<endl;
- debugLog<<"addAsMuchPacketAsPossible : Start At = "<<inStartAt<<endl;
- debugLog<<"addAsMuchPacketAsPossible : Remaining = "<<inRemaining<<endl;
- debugLog<<"addAsMuchPacketAsPossible : Segtable size = "<<mSegmentTableSize<<endl;
- debugLog<<"addAsMuchPacketAsPossible : Current Page Size = "<<mCurrentPageSize<<endl;
+ //debugLog<<endl;
+ //debugLog<<"addAsMuchPacketAsPossible : "<<endl;
+ //debugLog<<"addAsMuchPacketAsPossible : Start At = "<<inStartAt<<endl;
+ //debugLog<<"addAsMuchPacketAsPossible : Remaining = "<<inRemaining<<endl;
+ //debugLog<<"addAsMuchPacketAsPossible : Segtable size = "<<mSegmentTableSize<<endl;
+ //debugLog<<"addAsMuchPacketAsPossible : Current Page Size = "<<mCurrentPageSize<<endl;
//The amount of space left in the page is the minimum of
@@ -346,7 +346,7 @@
//Take 1 so when it adds the packet it doesn't try to consume one extra segment which doesn't exist.
unsigned long locSpaceLeft = MIN(((255 - mSegmentTableSize) * 255) - 1, mSettings->mMaxPageSize - mCurrentPageSize);
- debugLog<<"addAsMuchPacketAsPossible : Space left = "<<locSpaceLeft<<endl;
+ //debugLog<<"addAsMuchPacketAsPossible : Space left = "<<locSpaceLeft<<endl;
//debugLog<<"Space left = "<<locSpaceLeft<<endl;
//debugLog<<"Space left = "<<locSpaceLeft<<endl;
//Round down to nearest multiple of 255
@@ -355,7 +355,7 @@
//This is important when the packet gets broken because inRemaining is gt locSpace left
// In this case where the packet gets broken the final segment on the page must be 255.
locSpaceLeft -= (locSpaceLeft % 255);
- debugLog<<"addAsMuchPacketAsPossible : Space left = "<<locSpaceLeft<<endl;
+ //debugLog<<"addAsMuchPacketAsPossible : Space left = "<<locSpaceLeft<<endl;
//ASSERT(locSpaceLeft >=0);
//debugLog<<"Adjust space left = "<<locSpaceLeft<<endl;
@@ -368,24 +368,24 @@
//If (a) is the minimum then we know that the how much we are adding is a multiple of 255.
unsigned long locHowMuchToAdd = MIN(locSpaceLeft, inRemaining);
- debugLog<<"addAsMuchPacketAsPossible : How much to add = "<<locHowMuchToAdd<<endl;
+ //debugLog<<"addAsMuchPacketAsPossible : How much to add = "<<locHowMuchToAdd<<endl;
//mPending page has data is useless, it was set before this function is called... need to fix that. maybe move into add part of pack into apge
if ((!mPendingPageHasData) && (inStartAt != 0)) {
- debugLog<<"addAsMuchPacketAsPossible : Setting continuation flag"<<endl;
+ //debugLog<<"addAsMuchPacketAsPossible : Setting continuation flag"<<endl;
mPendingPage->header()->setHeaderFlags((unsigned char)(mPendingPage->header()->HeaderFlags() | OggPageHeader::CONTINUATION));
}
if (locHowMuchToAdd > 0) {
- debugLog<<"addAsMuchPacketAsPossible : Adding from "<<inStartAt<<" for "<<locHowMuchToAdd<<endl;
+ //debugLog<<"addAsMuchPacketAsPossible : Adding from "<<inStartAt<<" for "<<locHowMuchToAdd<<endl;
addPartOfPacketToPage(inOggPacket, inStartAt, locHowMuchToAdd);
}
//This puts only a single packet on the first page...
if ((mCurrentPageSize >= mSettings->mMinPageSize) || (mPendingPage->header()->PageSequenceNo() == 0) || (locHowMuchToAdd == 0)) {
- debugLog<<"addAsMuchPacketAsPossible : Cond Deliv : Probably shouldn't be ehre."<<endl;
+ //debugLog<<"addAsMuchPacketAsPossible : Cond Deliv : Probably shouldn't be ehre."<<endl;
deliverCurrentPage();
}
return locHowMuchToAdd;
@@ -393,9 +393,9 @@
}
bool OggPaginator::addPartOfPacketToPage(StampedOggPacket* inOggPacket, unsigned long inStartFrom, unsigned long inLength) {
- debugLog<<endl;
- debugLog<<"addPartOfPacketToPage : "<<endl;
- debugLog<<"addPartOfPacketToPage : Add from "<<inStartFrom<< " to "<<inLength<<endl;
+ //debugLog<<endl;
+ //debugLog<<"addPartOfPacketToPage : "<<endl;
+ //debugLog<<"addPartOfPacketToPage : Add from "<<inStartFrom<< " to "<<inLength<<endl;
//Buffer the amount of the packet we are going to add.
unsigned char* locBuff = new unsigned char[inLength]; //Given to constructor of stampedpacket.
@@ -409,7 +409,7 @@
// as the total packet size.
bool locIsLastOfPacket = (inStartFrom + inLength == inOggPacket->packetSize());
- debugLog<<"addPartOfPacketToPage : This is the last bit of the packet..."<<endl;
+ //debugLog<<"addPartOfPacketToPage : This is the last bit of the packet..."<<endl;
//Create a new packet
StampedOggPacket* locPartialPacket = new StampedOggPacket( locBuff,
inLength,
@@ -419,7 +419,7 @@
inOggPacket->endTime(),
inOggPacket->mStampType); //Given to page.
- debugLog<<"addPartOfPacketToPage : Adding Partial Packet to page"<<endl;
+ //debugLog<<"addPartOfPacketToPage : Adding Partial Packet to page"<<endl;
//Add the packet to the page.
mPendingPage->addPacket(locPartialPacket);
@@ -435,7 +435,7 @@
//Now do the segment table bookkeeping.
unsigned long locNumSegsNeeded = (inLength / 255);
- debugLog<<"addPartOfPacketToPage : Num 255 segs to add = "<<locNumSegsNeeded<<" ("<<inLength<<")"<<endl;
+ //debugLog<<"addPartOfPacketToPage : Num 255 segs to add = "<<locNumSegsNeeded<<" ("<<inLength<<")"<<endl;
//Always do one less than the total... the last segment is a special case
//We fill all but the last segemnt with 255
@@ -450,7 +450,7 @@
//Its the last part of the packet... so we need one extra segemnt... to hold the last part.
// The last part will be between 0-254
- debugLog<<"addPartOfPacketToPage : Adding last seg = "<<(unsigned long)(inLength % 255)<<endl;
+ //debugLog<<"addPartOfPacketToPage : Adding last seg = "<<(unsigned long)(inLength % 255)<<endl;
mSegmentTable[mSegmentTableSize] = (unsigned char)(inLength % 255);
mSegmentTableSize++;
@@ -462,7 +462,7 @@
//ASSERT((inLength % 255) == 0);
if ((inLength % 255) != 0) {
- debugLog<<"addPartOfPacketToPage : ASSERTION FAILED !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"<<endl;
+ //debugLog<<"addPartOfPacketToPage : ASSERTION FAILED !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"<<endl;
}
//mSegmentTable[mSegmentTableSize] = (unsigned char)(255);
//mSegmentTableSize++;
@@ -473,11 +473,11 @@
mCurrentPageSize += (locNumSegsNeeded + inLength);
- debugLog<<"addPartOfPacketToPage : Current Page Size = "<<mCurrentPageSize<<endl;
+ //debugLog<<"addPartOfPacketToPage : Current Page Size = "<<mCurrentPageSize<<endl;
if (locIsLastOfPacket) {
- debugLog<<"addPartOfPacketToPage : Updating gran pos to : "<<inOggPacket->endTime()<<endl;
+ //debugLog<<"addPartOfPacketToPage : Updating gran pos to : "<<inOggPacket->endTime()<<endl;
mPendingPage->header()->setGranulePos(inOggPacket->endTime());
}
Modified: trunk/oggdsf/src/lib/player/libDSPlayDotNET/DSPlay.cpp
===================================================================
--- trunk/oggdsf/src/lib/player/libDSPlayDotNET/DSPlay.cpp 2005-02-13 16:53:27 UTC (rev 8910)
+++ trunk/oggdsf/src/lib/player/libDSPlayDotNET/DSPlay.cpp 2005-02-14 10:18:38 UTC (rev 8911)
@@ -82,7 +82,9 @@
CoInitialize(NULL);
mCMMLProxy = new CMMLCallbackProxy; //Need to delete this !
debugLog = new fstream;
+#ifdef OGGCODECS_LOGGING
debugLog->open("G:\\logs\\dsplay.log", ios_base::out | ios_base::app);
+#endif
*debugLog<<"Starting new log"<<endl;
}
More information about the commits
mailing list