[xiph-commits] r8332 - in trunk/oggdsf: build/oggcodecs docs
sln/oggdsf_all src/lib/codecs/cmml/dsfCMMLDecoder
src/lib/codecs/cmml/dsfCMMLRawSource
src/lib/codecs/vorbis/filters/dsfVorbisDecoder
src/lib/core/directshow/dsfAnxDemux
src/lib/core/directshow/dsfOggDemux
src/lib/core/directshow/dsfSeeking
src/lib/core/directshow/libDirectshowAbstracts
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Sun Dec 5 17:33:52 PST 2004
Author: illiminable
Date: 2004-12-05 17:33:52 -0800 (Sun, 05 Dec 2004)
New Revision: 8332
Modified:
trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
trunk/oggdsf/docs/CMML_4_Dummies.txt
trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.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/core/directshow/dsfAnxDemux/AnxDemuxSourceFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.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/OggDemuxSourceFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStreamMapper.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStreamMapper.h
trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.cpp
trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.h
trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/BasicSeekPassThrough.cpp
trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/BasicSeekPassThrough.h
Log:
* Getting ready for release.
Modified: trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
===================================================================
--- trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-12-03 20:47:32 UTC (rev 8331)
+++ trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-12-06 01:33:52 UTC (rev 8332)
@@ -45,12 +45,6 @@
}
"Entry"
{
- "MsmKey" = "8:_15FA302C746D4E4994FCC43E6F9B2175"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_1ED42AE022EB477985E46FA18A63F9A5"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -99,414 +93,402 @@
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
+ "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
+ "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_15FA302C746D4E4994FCC43E6F9B2175"
+ "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
+ "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
+ "MsmKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
+ "MsmKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
+ "MsmKey" = "8:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
+ "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
+ "MsmKey" = "8:_578B89273D59478F861AA5BC3600D074"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+ "MsmKey" = "8:_58F56CD02F64413B9459F3E151760A57"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
+ "MsmKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
+ "MsmKey" = "8:_65015192414F476999A68339F89BEA57"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
+ "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
"OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
+ "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
+ "OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
+ "OwnerKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
+ "OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
+ "OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
"OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
+ "OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
+ "OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
+ "OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
+ "OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
+ "OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
+ "OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
+ "OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
+ "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
+ "OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
+ "OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
- "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
+ "OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_578B89273D59478F861AA5BC3600D074"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
+ "OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_58F56CD02F64413B9459F3E151760A57"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
+ "OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
+ "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65015192414F476999A68339F89BEA57"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_77F28BEDC86D404EBCC84AE004027B9B"
+ "OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
+ "MsmKey" = "8:_81A3CDB604B64763884C387192BE6771"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_15FA302C746D4E4994FCC43E6F9B2175"
+ "MsmKey" = "8:_83AF8D74700947168B69E69E5160F082"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
+ "MsmKey" = "8:_8976C400668B453CB941859C4F3C6E27"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
+ "MsmKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
"OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_83AF8D74700947168B69E69E5160F082"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_83AF8D74700947168B69E69E5160F082"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_24A1793CB89A464FB683A8A3BDA774DB"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_81A3CDB604B64763884C387192BE6771"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_24A1793CB89A464FB683A8A3BDA774DB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_83AF8D74700947168B69E69E5160F082"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8635BD1FEA5D4F26A480C449CD29BECB"
- "OwnerKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8976C400668B453CB941859C4F3C6E27"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_8F04F8C00C684CAEBEE50837881AB3D6"
+ "OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -531,20 +513,20 @@
}
"Entry"
{
- "MsmKey" = "8:_B2784574F1B848EABBE013669B46808C"
- "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
+ "MsmKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
+ "MsmKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_D7835E050C942DE27CB20AF3D1EC70F4"
+ "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -765,10 +747,10 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{A582A373-4685-4296-BEFE-614B80A702C3}:_46A378A9B03E4612A645053EDB884C20"
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_4812D148C77C9833CE1C0D8D175B84A4"
{
- "SourcePath" = "8:MSVCP71D.dll"
- "TargetName" = "8:MSVCP71D.dll"
+ "SourcePath" = "8:msxml3.dll"
+ "TargetName" = "8:msxml3.dll"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
"Condition" = "8:"
@@ -780,8 +762,8 @@
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
+ "Register" = "3:4"
+ "Exclude" = "11:TRUE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
@@ -805,26 +787,6 @@
"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:TRUE"
- "IsDependency" = "11:TRUE"
- "IsolateTo" = "8:"
- }
"{A582A373-4685-4296-BEFE-614B80A702C3}:_81A3CDB604B64763884C387192BE6771"
{
"SourcePath" = "8:..\\..\\COPYRIGHTS"
@@ -865,7 +827,7 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{A582A373-4685-4296-BEFE-614B80A702C3}:_B2784574F1B848EABBE013669B46808C"
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_D7835E050C942DE27CB20AF3D1EC70F4"
{
"SourcePath" = "8:libFLAC.dll"
"TargetName" = "8:libFLAC.dll"
@@ -961,7 +923,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:oggcodecs"
"ProductCode" = "8:{EDCBAB86-104A-4A03-B7D6-DFD783573933}"
- "PackageCode" = "8:{E5E5504B-159A-42FC-B565-4CA357DD58F2}"
+ "PackageCode" = "8:{99C8B2CA-FA0F-4A52-8C81-AD5E661CCC53}"
"UpgradeCode" = "8:{1A644FEB-7597-4FAB-AADE-C2C7C64C5984}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
@@ -1005,6 +967,392 @@
"Transitive" = "11:FALSE"
"Keys"
{
+ "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_57BC50643FBB4090A0C21215A5395255"
+ {
+ "Name" = "8:[ProductName]"
+ "Condition" = "8:"
+ "AlwaysCreate" = "11:FALSE"
+ "DeleteAtUninstall" = "11:FALSE"
+ "Transitive" = "11:FALSE"
+ "Keys"
+ {
+ "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_1FFBE31A445446B2A10B100E447F2E08"
+ {
+ "Name" = "8:OtherFiles"
+ "Condition" = "8:"
+ "AlwaysCreate" = "11:FALSE"
+ "DeleteAtUninstall" = "11:FALSE"
+ "Transitive" = "11:FALSE"
+ "Keys"
+ {
+ }
+ "Values"
+ {
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_06854443D5D64713A565DE50A41EAD75"
+ {
+ "Name" = "8:3"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:libWinCMMLParse.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_3A6CC9BB6B0042DC9BB9B0D7996B67AE"
+ {
+ "Name" = "8:14"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:libVorbisComment.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_3AAB390F29A4415C87C0B1E3612458C2"
+ {
+ "Name" = "8:13"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:libFLAC++.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_3FC34B1CA35B4F3CA7E8A6E63C1407D4"
+ {
+ "Name" = "8:20"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:HISTORY"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_435B2BA5AFD647BC9B5570622C56360F"
+ {
+ "Name" = "8:11"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:dsfSeeking.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_5450A253FD6A4E07A338E72CE8826163"
+ {
+ "Name" = "8:23"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:msvcr71.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_75202C71A1724FCDA82FBC9647D9AE8B"
+ {
+ "Name" = "8:4"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:libvorbis.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_7EEE371670B64A01944D204889CE4064"
+ {
+ "Name" = "8:2"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:OOOggDump.exe"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_7FBBDBA7C7CD4CC28D3D6DA06067FBEA"
+ {
+ "Name" = "8:10"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:libFLAC.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_81E5BA489E5C4F76909C27611A2F2EA7"
+ {
+ "Name" = "8:8"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:libOOOggSeek.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_86616AACAC5C4147B21B109B6F129AEB"
+ {
+ "Name" = "8:6"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:libOOTheora.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_869CAA3564E14449A9F5E255B28D8062"
+ {
+ "Name" = "8:9"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:dsfAbstractVideoEncoder.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_89FD5F9A863340D29EC2C71DF74738D1"
+ {
+ "Name" = "8:12"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:OOOggValidate.exe"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_8D0C70620B384CD1878F4BFD1B42C749"
+ {
+ "Name" = "8:17"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:AUTHORS"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_96298924EF9748AE9B43A4D12EC69C94"
+ {
+ "Name" = "8:15"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:libfishsound.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_9ACEDC41B55A4798B6E27F6B28648391"
+ {
+ "Name" = "8:7"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:libOOOgg.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_BF7918F1D27E40608D9E3AFCB7522783"
+ {
+ "Name" = "8:24"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:OOOggCommentDump.exe"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_C339E60257B04C428589DFD91F793AA0"
+ {
+ "Name" = "8:16"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:ABOUT.rtf"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_D1B9971700764C26BC584EF630A5F505"
+ {
+ "Name" = "8:19"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:COPYRIGHTS"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_D250EF116DE943C2A22A93A972E5D414"
+ {
+ "Name" = "8:22"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:msvcp71.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_D72C350C2940483EB9196BFD77507525"
+ {
+ "Name" = "8:21"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:VERSIONS"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_DD1BD86A5F4B43479355D702B5AAAC92"
+ {
+ "Name" = "8:18"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:COPYRIGHTS.rtf"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_ED176700818D4441B54D8469A21940F1"
+ {
+ "Name" = "8:5"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:OOOggStat.exe"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_F3EE6A11A3FD45649208312CE4179F06"
+ {
+ "Name" = "8:1"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:libCMMLTags.dll"
+ }
+ }
+ }
+ "{6A471EEF-D31B-40F8-BCF6-C9E8EC783F36}:_CF4BE49C68DD4C1A89470A4E8416B0C5"
+ {
+ "Name" = "8:Filters"
+ "Condition" = "8:"
+ "AlwaysCreate" = "11:FALSE"
+ "DeleteAtUninstall" = "11:FALSE"
+ "Transitive" = "11:FALSE"
+ "Keys"
+ {
+ }
+ "Values"
+ {
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_2BBFD5275784465AAAFAC5F2CB05040D"
+ {
+ "Name" = "8:1"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:dsfOggDemux.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_5E4AD00ED49D4CA0975C30C98086D4A6"
+ {
+ "Name" = "8:11"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:dsfOggMux.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_6230F2E0B4B645CDA3194426B1766929"
+ {
+ "Name" = "8:6"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:dsfTheoraDecoder.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_6B91081F2148484E8A2255DC36EF9AF3"
+ {
+ "Name" = "8:14"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:dsfSubtitleVMR9.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_6D99517033AA491F83908CCB74AEB908"
+ {
+ "Name" = "8:10"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:dsfFLACEncoder.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_958423CE2CBF4520AADB909A75D1F892"
+ {
+ "Name" = "8:3"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:dsfSpeexEncoder.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_9A3611553FF043F1A8DFB5A7565E914F"
+ {
+ "Name" = "8:5"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:dsfVorbisEncoder.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_B6D8BEC207244CEF88C70FF16A3D722E"
+ {
+ "Name" = "8:9"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:dsfFLACDecoder.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_BB971E49A3D047FEABDEACDA94098376"
+ {
+ "Name" = "8:12"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:dsfAnxDemux.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_D019CD2ACE40474298A9B69DEE808F3C"
+ {
+ "Name" = "8:7"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:dsfTheoraEncoder.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_DE24CDD9D7B6442CBA40D880FEB6D8B4"
+ {
+ "Name" = "8:13"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:dsfNativeFLACSource.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_E27D798A77D946F5A5507669F0406A9E"
+ {
+ "Name" = "8:4"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:dsfVorbisDecoder.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_F2E149FD4E4C4CB3B183AC9B688A75FF"
+ {
+ "Name" = "8:8"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:dsfCMMLDecoder.dll"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_F5E20A303D7A4B66955871BC74D861C9"
+ {
+ "Name" = "8:2"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:dsfSpeexDecoder.dll"
+ }
+ }
+ }
+ }
+ "Values"
+ {
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_24A98D69A33B45A4ADBFC34B69319967"
+ {
+ "Name" = "8:Version"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:[ProductVersion]"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_6BECC19D48914027A4F01A1EE7FEE79E"
+ {
+ "Name" = "8:InstalledByVendor"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:[Manufacturer]"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_78C983BB87D542A881A501A3413D5142"
+ {
+ "Name" = "8:InstalledByProgramVersion"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:[ProductVersion]"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_F66BD37A4834412682AE0E493302BF1A"
+ {
+ "Name" = "8:InstalledByProgram"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:[ProductName]"
+ }
+ "{35AE352C-BC79-4EF9-ABD8-61F467188583}:_FDB36D71C4E54FC483582CEC2BAA86B3"
+ {
+ "Name" = "8:InstallLocation"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "ValueTypes" = "3:1"
+ "Value" = "8:[TARGETDIR]"
+ }
+ }
+ }
}
"Values"
{
@@ -2698,16 +3046,30 @@
}
"MergeModule"
{
- "{35A69C6E-5BA4-440D-803D-762B59A45393}:_8635BD1FEA5D4F26A480C449CD29BECB"
+ "{35A69C6E-5BA4-440D-803D-762B59A45393}:_77F28BEDC86D404EBCC84AE004027B9B"
{
"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:"
+ }
+ "{35A69C6E-5BA4-440D-803D-762B59A45393}:_8F04F8C00C684CAEBEE50837881AB3D6"
+ {
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:TRUE"
"SourcePath" = "8:vc_user_crt71_rtl_x86_---.msm"
"Properties"
{
}
"LanguageId" = "3:0"
- "Exclude" = "11:TRUE"
+ "Exclude" = "11:FALSE"
"Folder" = "8:"
"Feature" = "8:"
"IsolateTo" = "8:"
@@ -2717,7 +3079,7 @@
{
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_02E7D9728C8944F1BD021329177F5140"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libCMMLTags\\Debug\\libCMMLTags.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libCMMLTags\\Release\\libCMMLTags.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -2745,7 +3107,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_0A1E63E5852E4F759F1A27E8F097727B"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggDump\\Debug\\OOOggDump.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggDump\\Release\\OOOggDump.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -2773,7 +3135,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_0D0DD40A31F842C68B09BE0CBDE1996B"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACEncoder\\Debug\\dsfFLACEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACEncoder\\Release\\dsfFLACEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -2801,7 +3163,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_13E9F6D7ED35430BA31BDDF95E6327B3"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractVideoEncoder\\Debug\\dsfAbstractVideoEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractVideoEncoder\\Release\\dsfAbstractVideoEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -2829,7 +3191,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_14E3067B71584FB5A245A2DA9D65D139"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libWinCMMLParse\\Debug\\libWinCMMLParse.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libWinCMMLParse\\Release\\libWinCMMLParse.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -2855,37 +3217,9 @@
{
}
}
- "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_15FA302C746D4E4994FCC43E6F9B2175"
- {
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfanxmux\\debug\\dsfAnxMux.dll"
- "TargetName" = "8:"
- "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:FALSE"
- "IsolateTo" = "8:"
- "ProjectOutputGroupRegister" = "3:4"
- "OutputConfiguration" = "8:"
- "OutputGroupCanonicalName" = "8:Built"
- "OutputProjectGuid" = "8:{685D495F-1620-459A-9EE3-BAD4F619B2C2}"
- "ShowKeyOutput" = "11:TRUE"
- "ExcludeFilters"
- {
- }
- }
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_24A1793CB89A464FB683A8A3BDA774DB"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\libs\\libvorbis\\win32\\Vorbis_Dynamic_Debug\\vorbis_d.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\libs\\libvorbis\\win32\\Vorbis_Dynamic_Release\\vorbis.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -2913,7 +3247,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_273D851AE72C4D2EA8020A712DBFE5A3"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfNativeFLACSource\\Debug\\dsfNativeFLACSource.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfNativeFLACSource\\Release\\dsfNativeFLACSource.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -2941,7 +3275,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_3C7C3E6B832E481C8A36701A33FF3721"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggStat\\Debug\\OOOggStat.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggStat\\Release\\OOOggStat.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -2969,7 +3303,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_408749AC43894882BEEBFF43737E505B"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexDecoder\\Debug\\dsfSpeexDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexDecoder\\Release\\dsfSpeexDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -2997,7 +3331,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_4EB6175B98B54613A5087D8EA257D00A"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\libs\\libOOTheora\\Debug\\libOOTheora.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\libs\\libOOTheora\\Release\\libOOTheora.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3025,7 +3359,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraDecoder\\Debug\\dsfTheoraDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraDecoder\\Release\\dsfTheoraDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3053,7 +3387,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_578B89273D59478F861AA5BC3600D074"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggMux\\Debug\\dsfOggMux.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggMux\\Release\\dsfOggMux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3081,7 +3415,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_58F56CD02F64413B9459F3E151760A57"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOgg\\Debug\\libOOOgg.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOgg\\Release\\libOOOgg.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3109,7 +3443,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_5EB08DD30B564283AA9C9F27D80CF9E4"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOggSeek\\Debug\\libOOOggSeek.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOggSeek\\Release\\libOOOggSeek.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3137,7 +3471,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_65015192414F476999A68339F89BEA57"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\dsfCMMLDecoder\\Debug\\dsfCMMLDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\dsfCMMLDecoder\\Release\\dsfCMMLDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3165,7 +3499,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_83AF8D74700947168B69E69E5160F082"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\debug\\bin\\libFLAC.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\release\\bin\\libFLAC.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3193,7 +3527,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8976C400668B453CB941859C4F3C6E27"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACDecoder\\Debug\\dsfFLACDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACDecoder\\Release\\dsfFLACDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3221,7 +3555,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8D9A2E4C592D4118B80A4AE8394D8963"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexEncoder\\Debug\\dsfSpeexEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexEncoder\\Release\\dsfSpeexEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3249,7 +3583,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8F970C0B2593413CA2A3BBF5F2600387"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAnxDemux\\Debug\\dsfAnxDemux.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAnxDemux\\Release\\dsfAnxDemux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3277,7 +3611,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_A5AAB8CB90C548F1820BC101A765616C"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSeeking\\Debug\\dsfSeeking.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSeeking\\Release\\dsfSeeking.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3305,7 +3639,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_AC8962A7F212481095173AB7C8C89025"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraEncoder\\Debug\\dsfTheoraEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraEncoder\\Release\\dsfTheoraEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3333,7 +3667,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggValidate\\Debug\\OOOggValidate.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggValidate\\Release\\OOOggValidate.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3361,7 +3695,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_D2048C8B212841C88E42F6ADDCA8B0A2"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSubtitleVMR9\\Debug\\dsfSubtitleVMR9.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSubtitleVMR9\\Release\\dsfSubtitleVMR9.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3389,7 +3723,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_DB60960DC12343B89500B86D5AB10D02"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\debug\\bin\\libFLAC++.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\release\\bin\\libFLAC++.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3417,7 +3751,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_DCF4ED7597F8492AA49DC521111ED0F5"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggDemux\\Debug\\dsfOggDemux.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggDemux\\Release\\dsfOggDemux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3445,7 +3779,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_E1E372FA955046E6928BF533EA0AE6C3"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libVorbisComment\\Debug\\libVorbisComment.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libVorbisComment\\Release\\libVorbisComment.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3473,7 +3807,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\helper\\libfishsound\\win32\\Debug\\libfishsound.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\helper\\libfishsound\\win32\\Release\\libfishsound.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3501,7 +3835,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_EB09F87C612C40BCA34AC87060CFEFF1"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggCommentDump\\Debug\\OOOggCommentDump.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggCommentDump\\Release\\OOOggCommentDump.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3529,7 +3863,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_EFEA71FFF2864107815DBDECCCCA1178"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisDecoder\\Debug\\dsfVorbisDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisDecoder\\Release\\dsfVorbisDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3557,7 +3891,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_FD547F0196C24DFBB9CAFCCEC06561BC"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisEncoder\\Debug\\dsfVorbisEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisEncoder\\Release\\dsfVorbisEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
Modified: trunk/oggdsf/docs/CMML_4_Dummies.txt
===================================================================
--- trunk/oggdsf/docs/CMML_4_Dummies.txt 2004-12-03 20:47:32 UTC (rev 8331)
+++ trunk/oggdsf/docs/CMML_4_Dummies.txt 2004-12-06 01:33:52 UTC (rev 8332)
@@ -18,7 +18,7 @@
head element
ANY ORDER EXACTLY ONE title element
- ANY ORDER EXACTLY ONE base element
+ ANY ORDER OPTIONALLY ONE base element
ANY ORDER ZERO OR MORE meta elements
title element
Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2004-12-03 20:47:32 UTC (rev 8331)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2004-12-06 01:33:52 UTC (rev 8332)
@@ -1245,6 +1245,10 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfAudioResampleFilter", "..\..\src\lib\core\directshow\dsfAudioResampleFilter\dsfAudioResampleFilter.vcproj", "{14CE2180-B8A2-43F9-B010-C2D5EA556A36}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@@ -2532,6 +2536,22 @@
{C6EE2F72-1743-47CA-B8A8-001E7C9CEEBA}.Release_NoDotNET.ActiveCfg = Release
{C6EE2F72-1743-47CA-B8A8-001E7C9CEEBA}.Release_SSE.ActiveCfg = Release
{C6EE2F72-1743-47CA-B8A8-001E7C9CEEBA}.Release_SSE2.ActiveCfg = Release
+ {14CE2180-B8A2-43F9-B010-C2D5EA556A36}.Debug.ActiveCfg = Debug|Win32
+ {14CE2180-B8A2-43F9-B010-C2D5EA556A36}.Debug.Build.0 = Debug|Win32
+ {14CE2180-B8A2-43F9-B010-C2D5EA556A36}.Debug Unicode.ActiveCfg = Debug|Win32
+ {14CE2180-B8A2-43F9-B010-C2D5EA556A36}.Debug Unicode.Build.0 = Debug|Win32
+ {14CE2180-B8A2-43F9-B010-C2D5EA556A36}.MakeFile.ActiveCfg = Release|Win32
+ {14CE2180-B8A2-43F9-B010-C2D5EA556A36}.MakeFile.Build.0 = Release|Win32
+ {14CE2180-B8A2-43F9-B010-C2D5EA556A36}.Release.ActiveCfg = Release|Win32
+ {14CE2180-B8A2-43F9-B010-C2D5EA556A36}.Release.Build.0 = Release|Win32
+ {14CE2180-B8A2-43F9-B010-C2D5EA556A36}.Release Unicode.ActiveCfg = Release|Win32
+ {14CE2180-B8A2-43F9-B010-C2D5EA556A36}.Release Unicode.Build.0 = Release|Win32
+ {14CE2180-B8A2-43F9-B010-C2D5EA556A36}.Release_NoDotNET.ActiveCfg = Release|Win32
+ {14CE2180-B8A2-43F9-B010-C2D5EA556A36}.Release_NoDotNET.Build.0 = Release|Win32
+ {14CE2180-B8A2-43F9-B010-C2D5EA556A36}.Release_SSE.ActiveCfg = Release|Win32
+ {14CE2180-B8A2-43F9-B010-C2D5EA556A36}.Release_SSE.Build.0 = Release|Win32
+ {14CE2180-B8A2-43F9-B010-C2D5EA556A36}.Release_SSE2.ActiveCfg = Release|Win32
+ {14CE2180-B8A2-43F9-B010-C2D5EA556A36}.Release_SSE2.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionItems) = postSolution
EndGlobalSection
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h 2004-12-03 20:47:32 UTC (rev 8331)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h 2004-12-06 01:33:52 UTC (rev 8332)
@@ -55,11 +55,11 @@
STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void **ppv);
//Implement the Tranform filter interface
- HRESULT CMMLDecodeFilter::CheckInputType(const CMediaType* inInputMediaType);
- HRESULT CMMLDecodeFilter::CheckTransform(const CMediaType* inInputMediaType, const CMediaType* inOutputMediaType);
- HRESULT CMMLDecodeFilter::DecideBufferSize(IMemAllocator* inAllocator, ALLOCATOR_PROPERTIES* inPropertyRequest);
- HRESULT CMMLDecodeFilter::GetMediaType(int inPosition, CMediaType* outMediaType);
- HRESULT CMMLDecodeFilter::Transform(IMediaSample* inSample, IMediaSample* outSample);
+ HRESULT CheckInputType(const CMediaType* inInputMediaType);
+ HRESULT CheckTransform(const CMediaType* inInputMediaType, const CMediaType* inOutputMediaType);
+ HRESULT DecideBufferSize(IMemAllocator* inAllocator, ALLOCATOR_PROPERTIES* inPropertyRequest);
+ HRESULT GetMediaType(int inPosition, CMediaType* outMediaType);
+ HRESULT Transform(IMediaSample* inSample, IMediaSample* outSample);
//Implement ICMMLAppControl
virtual STDMETHODIMP_(bool) setCallbacks(ICMMLCallbacks* inCallbacks);
Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.cpp 2004-12-03 20:47:32 UTC (rev 8331)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.cpp 2004-12-06 01:33:52 UTC (rev 8332)
@@ -26,6 +26,16 @@
return pNewObject;
}
+STDMETHODIMP CMMLRawSourceFilter::NonDelegatingQueryInterface(REFIID riid, void **ppv)
+{
+ if (riid == IID_IFileSourceFilter) {
+ *ppv = (IFileSourceFilter*)this;
+ ((IUnknown*)*ppv)->AddRef();
+ return NOERROR;
+ }
+ return CBaseFilter::NonDelegatingQueryInterface(riid, ppv);
+}
+
CMMLRawSourceFilter::CMMLRawSourceFilter(void)
: CBaseFilter(NAME("CMMLRawSourceFilter"), NULL, m_pLock, CLSID_CMMLRawSourceFilter)
{
@@ -75,8 +85,3 @@
return S_OK;
}
-STDMETHODIMP CMMLRawSourceFilter::NonDelegatingQueryInterface(REFIID riid, void **ppv)
-{
-
- return CBaseFilter::NonDelegatingQueryInterface(riid, ppv);
-}
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.cpp 2004-12-03 20:47:32 UTC (rev 8331)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.cpp 2004-12-06 01:33:52 UTC (rev 8332)
@@ -55,13 +55,13 @@
, mUptoFrame(0)
{
- debugLog.open("g:\\logs\\vorbislog.log", ios_base::out);
+ //debugLog.open("g:\\logs\\vorbislog.log", ios_base::out);
ConstructCodec();
}
VorbisDecodeInputPin::~VorbisDecodeInputPin(void)
{
- debugLog.close();
+ //debugLog.close();
DestroyCodec();
}
//Is this needed ??
@@ -97,7 +97,7 @@
STDMETHODIMP VorbisDecodeInputPin::NewSegment(REFERENCE_TIME inStartTime, REFERENCE_TIME inStopTime, double inRate)
{
CAutoLock locLock(mStreamLock);
- debugLog<<"New segment "<<inStartTime<<" - "<<inStopTime<<endl;
+ //debugLog<<"New segment "<<inStartTime<<" - "<<inStopTime<<endl;
mUptoFrame = 0;
return AbstractTransformInputPin::NewSegment(inStartTime, inStopTime, inRate);
@@ -111,7 +111,7 @@
if (locThis->CheckStreaming() == S_OK) {
if (! locThis->mBegun) {
- locThis->debugLog<<"First Time"<<endl;
+ //locThis->debugLog<<"First Time"<<endl;
//Set up fishsound
fish_sound_command (locThis->mFishSound, FISH_SOUND_GET_INFO, &(locThis->mFishInfo), sizeof (FishSoundInfo));
locThis->mBegun = true;
@@ -126,8 +126,8 @@
unsigned long locActualSize = inFrames * locThis->mFrameSize;
unsigned long locTotalFrameCount = inFrames * locThis->mNumChannels;
- locThis->debugLog<<"m_tStart = "<<locThis->m_tStart<<endl;
- locThis->debugLog<<"mUptoFrame = "<<locThis->mUptoFrame<<endl;
+ //locThis->debugLog<<"m_tStart = "<<locThis->m_tStart<<endl;
+ //locThis->debugLog<<"mUptoFrame = "<<locThis->mUptoFrame<<endl;
//Make the start presentation time
REFERENCE_TIME locFrameStart = (((__int64)(locThis->mUptoFrame * UNITS)) / locThis->mSampleRate);
@@ -137,7 +137,7 @@
//Make the end presentation time
REFERENCE_TIME locFrameEnd = (((__int64)(locThis->mUptoFrame * UNITS)) / locThis->mSampleRate);
- locThis->debugLog<<"Sample time = "<<locFrameStart<<" - "<<locFrameEnd<<endl;
+ //locThis->debugLog<<"Sample time = "<<locFrameStart<<" - "<<locFrameEnd<<endl;
IMediaSample* locSample;
HRESULT locHR = locThis->mOutputPin->GetDeliveryBuffer(&locSample, &locFrameStart, &locFrameEnd, NULL);
Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h 2004-12-03 20:47:32 UTC (rev 8331)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h 2004-12-06 01:33:52 UTC (rev 8332)
@@ -63,7 +63,7 @@
protected:
- fstream debugLog;
+ //fstream debugLog;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxDemuxSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxDemuxSourceFilter.cpp 2004-12-03 20:47:32 UTC (rev 8331)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxDemuxSourceFilter.cpp 2004-12-06 01:33:52 UTC (rev 8332)
@@ -89,6 +89,6 @@
//anxDebug<<"After seek table instantiation"<<endl;
mSeekTable->buildTable();
//anxDebug<<"After build table..."<<endl;
- debugLog<<"After build table"<<endl;
+ //debugLog<<"After build table"<<endl;
return SetUpPins();
}
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.cpp 2004-12-03 20:47:32 UTC (rev 8331)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.cpp 2004-12-06 01:33:52 UTC (rev 8332)
@@ -46,12 +46,12 @@
, mAnnodexHeader(NULL)
{
- debugLog.open("G:\\logs\\anxmapper.log", ios_base::out);
+ //debugLog.open("G:\\logs\\anxmapper.log", ios_base::out);
}
AnxStreamMapper::~AnxStreamMapper(void)
{
- debugLog.close();
+ //debugLog.close();
}
bool AnxStreamMapper::isReady() {
@@ -62,17 +62,17 @@
for (unsigned long i = 1; i < mStreamList.size(); i++) {
locWasAny = true;
retVal = retVal && mStreamList[i]->streamReady();
- debugLog<<"Stream "<<i<<" ";
+ //debugLog<<"Stream "<<i<<" ";
if (retVal) {
- debugLog<<"READY !!!!!!"<<endl;
+ //debugLog<<"READY !!!!!!"<<endl;
} else {
- debugLog<<"NOT READY !!!!"<<endl;
+ //debugLog<<"NOT READY !!!!"<<endl;
}
}
if (locWasAny && retVal) {
- debugLog<<"Streams READY"<<endl;
+ //debugLog<<"Streams READY"<<endl;
} else {
- debugLog<<"Streams NOT READY"<<endl;
+ //debugLog<<"Streams NOT READY"<<endl;
}
return locWasAny && retVal;
}
@@ -140,7 +140,7 @@
int i = 0;
switch (mDemuxState) {
case SEEN_NOTHING:
- debugLog<<"SEEN_NOTHING"<<endl;
+ //debugLog<<"SEEN_NOTHING"<<endl;
//We must find an annodex BOS page.
if (!isAnnodexBOS(inOggPage)) {
mDemuxState = INVALID_STATE;
@@ -156,7 +156,7 @@
break; //Can never be here.
case SEEN_ANNODEX_BOS:
- debugLog<<"SEEN_ANNODEX_BOS"<<endl;
+ //debugLog<<"SEEN_ANNODEX_BOS"<<endl;
//We should be getting Anxdata headers here.
if (!isAnxDataPage(inOggPage, ANXDATA_ARE_BOS)) {
mDemuxState = INVALID_STATE;
@@ -173,7 +173,7 @@
//Add the CMML Stream
OggStream* locStream = new CMMLStream(inOggPage, mOwningFilter, true); //The page is only given for viewing
if (locStream != NULL) {
- debugLog<<"Adding CMML Stream"<<endl;
+ //debugLog<<"Adding CMML Stream"<<endl;
mStreamList.push_back(locStream);
}
@@ -184,15 +184,15 @@
break; //Can never be here.
case SEEN_AN_ANXDATA:
- debugLog<<"SEEN_AN_ANXDATA"<<endl;
+ //debugLog<<"SEEN_AN_ANXDATA"<<endl;
if (isAnnodexEOS(inOggPage)) {
//This is the end of the stream headers.
mDemuxState = OGG_STATE;
- debugLog<<"Found an Annodex EOS... transitioning."<<endl;
+ //debugLog<<"Found an Annodex EOS... transitioning."<<endl;
return true;
} else if (isAnxDataPage(inOggPage, ANXDATA_ARE_BOS)) {
//handle another anxdata page.
- debugLog<<"Found another anxdata..."<<endl;
+ //debugLog<<"Found another anxdata..."<<endl;
mSeenStreams.push_back(inOggPage->header()->StreamSerialNo());
mAnxDataHeaders.push_back(inOggPage->getPacket(0)->clone());
mDemuxState = SEEN_AN_ANXDATA;
@@ -204,7 +204,7 @@
}
break;
case OGG_STATE:
- debugLog<<"OGG_STATE"<<endl;
+ //debugLog<<"OGG_STATE"<<endl;
//We've seen the annodex EOS... so we can proceed as if it's a normal ogg file.
// The CMML stream is already made.
@@ -213,14 +213,14 @@
if (mSeenStreams[i] == inOggPage->header()->StreamSerialNo()) {
//If the page is a BOS we need to start a new stream
const bool ALLOW_OTHERS_TO_SEEK = true;
- debugLog<<"Creating strem.... ***"<<endl;
+ //debugLog<<"Creating strem.... ***"<<endl;
OggStream* locStream = OggStreamFactory::CreateStream(inOggPage, mOwningFilter, ALLOW_OTHERS_TO_SEEK);
//FIX::: Need to check for NULL
if (locStream != NULL) {
- debugLog<<"Creating strem.... ***"<<endl;
+ //debugLog<<"Creating strem.... ***"<<endl;
mStreamList.push_back(locStream);
} else {
- debugLog<<"Lost a packet..."<<endl;
+ //debugLog<<"Lost a packet..."<<endl;
}
mSeenStreams.erase(it);
delete inOggPage;
@@ -230,19 +230,19 @@
//If we are here, the stream is not in the list.
//At the moment we assume it's because it's been seen, and removed... this is a bad assumption !
- debugLog<<"Dispatchinig.........."<<endl;
+ //debugLog<<"Dispatchinig.........."<<endl;
locTemp = dispatchPage(inOggPage);
if (locTemp) {
- debugLog<<"Dispatch ok"<<endl;
+ //debugLog<<"Dispatch ok"<<endl;
} else {
- debugLog<<"Dispatch failed"<<endl;
+ //debugLog<<"Dispatch failed"<<endl;
}
return locTemp;
break;
case INVALID_STATE:
default:
- debugLog<<"INVALID"<<endl;
+ //debugLog<<"INVALID"<<endl;
return false;
break;
@@ -277,9 +277,9 @@
if (mDemuxState == SEEN_NOTHING) {
mAnxVersion = getAnxVersion(inOggPage);
- debugLog<<"Version is "<<mAnxVersion<<endl;
+ //debugLog<<"Version is "<<mAnxVersion<<endl;
}
- debugLog<<"Accepting Page..."<<endl;
+ //debugLog<<"Accepting Page..."<<endl;
switch (mAnxVersion) {
case ANX_VERSION_2_0:
//Potential memory leaks here !
@@ -369,12 +369,12 @@
bool AnxStreamMapper::toStartOfData() {
//Specialise for anx... adds one extra ignore packet to the flush to account for the anxdata pages only
// if it's 2.0 version.
- debugLog<<"ANX::: To start of data size = "<<mStreamList.size()<<endl;
+ //debugLog<<"ANX::: To start of data size = "<<mStreamList.size()<<endl;
if (isReady()) { //CHECK::: Should check for allow dsipatch ???
for (unsigned long i = 0; i < mStreamList.size(); i++) {
//Flush each stream, then ignore the codec headers.
if (mAnxVersion == ANX_VERSION_2_0) {
- debugLog<<"Flushing stream "<<i<<" for "<<mStreamList[i]->numCodecHeaders() + 1<<endl;
+ //debugLog<<"Flushing stream "<<i<<" for "<<mStreamList[i]->numCodecHeaders() + 1<<endl;
mStreamList[i]->flush(mStreamList[i]->numCodecHeaders() + 1); //+1 = AnxData Header...
} else {
mStreamList[i]->flush(mStreamList[i]->numCodecHeaders());
@@ -382,7 +382,7 @@
}
return true;
} else {
- debugLog<<"Something bad happened !!!!&&&&"<<endl;
+ //debugLog<<"Something bad happened !!!!&&&&"<<endl;
return false;
}
}
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.cpp 2004-12-03 20:47:32 UTC (rev 8331)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.cpp 2004-12-06 01:33:52 UTC (rev 8332)
@@ -42,12 +42,12 @@
, mGranuleOffset(0)
{
InitCodec(inBOSPage->getStampedPacket(0));
- debugLog.open("g:\\logs\\ffd_dump.out", ios_base::out);
+ //debugLog.open("g:\\logs\\ffd_dump.out", ios_base::out);
}
FFDShowVideoStream::~FFDShowVideoStream(void)
{
- debugLog.close();
+ //debugLog.close();
delete mFFDShowVideoFormatBlock;
}
@@ -148,15 +148,15 @@
__int64 locSamplesPerBlock = iLE_Math::CharArrToInt64(mHeaderPack->packetData() + 25);
- debugLog<<"t/block = "<<locTimePerBlock<<" Sam/block = "<<locSamplesPerBlock<<endl;
+ //debugLog<<"t/block = "<<locTimePerBlock<<" Sam/block = "<<locSamplesPerBlock<<endl;
mFFDShowVideoFormatBlock->AvgTimePerFrame = locTimePerBlock / locSamplesPerBlock;
- debugLog<<"Time per frame = "<<mFFDShowVideoFormatBlock->AvgTimePerFrame<<endl;
+ //debugLog<<"Time per frame = "<<mFFDShowVideoFormatBlock->AvgTimePerFrame<<endl;
__int64 locFPSec = (UNITS / locTimePerBlock) * locSamplesPerBlock;
- debugLog<<"Rate = "<<locFPSec<<" fps"<<endl;
+ //debugLog<<"Rate = "<<locFPSec<<" fps"<<endl;
unsigned short locBPSample = ((unsigned char)(mHeaderPack->packetData()[41])) + (((unsigned short)(mHeaderPack->packetData()[42])) * 256);
@@ -206,22 +206,22 @@
if ((mLastKnownTimeBase != inPacket->startTime()) && (inPacket->startTime() != -1)) {
mLastKnownTimeBase = inPacket->startTime();
mLastTimeStamp = mLastKnownTimeBase * mFFDShowVideoFormatBlock->AvgTimePerFrame;
- debugLog<<"Last Time base set to "<<mLastKnownTimeBase<<endl;
- debugLog<<"Last time stamp set to "<<mLastTimeStamp<<endl;
+ //debugLog<<"Last Time base set to "<<mLastKnownTimeBase<<endl;
+ //debugLog<<"Last time stamp set to "<<mLastTimeStamp<<endl;
//Granule Offset may not be needed any more.
mGranuleOffset = 0;
}
- debugLog<<"Packet stamps = "<<inPacket->startTime() << " - "<<inPacket->endTime()<<endl;
+ //debugLog<<"Packet stamps = "<<inPacket->startTime() << " - "<<inPacket->endTime()<<endl;
- debugLog<<"m_tStart = "<<mSourcePin->CurrentStartTime()<<endl;
+ //debugLog<<"m_tStart = "<<mSourcePin->CurrentStartTime()<<endl;
LONGLONG locStart = mLastTimeStamp - mSourcePin->CurrentStartTime();
LONGLONG locEnd = locStart + mFFDShowVideoFormatBlock->AvgTimePerFrame;
mGranuleOffset++;
- debugLog<<"Time Stamps = "<<locStart<<" - "<<locEnd<<endl;
- debugLog<<"Granule offset " << mGranuleOffset<<endl;
+ //debugLog<<"Time Stamps = "<<locStart<<" - "<<locEnd<<endl;
+ //debugLog<<"Granule offset " << mGranuleOffset<<endl;
mLastTimeStamp = (locEnd >= mLastTimeStamp) ? locEnd
: mLastTimeStamp;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.h 2004-12-03 20:47:32 UTC (rev 8331)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FFDShowVideoStream.h 2004-12-06 01:33:52 UTC (rev 8332)
@@ -68,5 +68,5 @@
LONGLONG mLastKnownTimeBase;
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-12-03 20:47:32 UTC (rev 8331)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp 2004-12-06 01:33:52 UTC (rev 8332)
@@ -114,7 +114,7 @@
mDemuxLock = new CCritSec;
mStreamLock = new CCritSec;
mStreamMapper = new OggStreamMapper(this);
- debugLog.open("g:\\logs\\sourcelog.log", ios_base::out | ios_base::ate | ios_base::app);
+ //debugLog.open("g:\\logs\\sourcelog.log", ios_base::out | ios_base::ate | ios_base::app);
//debugLog<<"Test..."<<endl;
//debugLog.seekp(0, ios_base::end);
//debugLog<<"Test2..."<<endl;
@@ -136,7 +136,7 @@
mDemuxLock = new CCritSec;
mStreamLock = new CCritSec;
- debugLog.open("g:\\logs\\sourcelog.log", ios_base::out);
+ //debugLog.open("g:\\logs\\sourcelog.log", ios_base::out);
//When it is derived, it's up to the superclass to set this.
//mStreamMapper = new OggStreamMapper(this);
@@ -220,18 +220,18 @@
STDMETHODIMP OggDemuxSourceFilter::GetCapabilities(DWORD* inCapabilities) {
if (mSeekTable->enabled()) {
- debugLog<<"GetCaps "<<mSeekingCap<<endl;
+ //debugLog<<"GetCaps "<<mSeekingCap<<endl;
*inCapabilities = mSeekingCap;
return S_OK;
} else {
- debugLog<<"Get Caps failed !!!!!!!"<<endl;
+ //debugLog<<"Get Caps failed !!!!!!!"<<endl;
*inCapabilities = 0;
return S_OK;;
}
}
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 {
@@ -242,7 +242,7 @@
STDMETHODIMP OggDemuxSourceFilter::CheckCapabilities(DWORD *pCapabilities){
- debugLog<<"CheckCaps : Not impl"<<endl;
+ //debugLog<<"CheckCaps : Not impl"<<endl;
return E_NOTIMPL;
}
STDMETHODIMP OggDemuxSourceFilter::IsFormatSupported(const GUID *pFormat){
@@ -263,7 +263,7 @@
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){
@@ -273,7 +273,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 {
@@ -282,21 +282,21 @@
}
}
STDMETHODIMP OggDemuxSourceFilter::GetCurrentPosition(LONGLONG *pCurrent){
- debugLog<<"GetCurrentPos = NOT_IMPL"<<endl;
+ //debugLog<<"GetCurrentPos = NOT_IMPL"<<endl;
return E_NOTIMPL;
//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){
CAutoLock locLock(m_pLock);
- debugLog<<"Set Positions "<<*pCurrent<<" to "<<*pStop<<" with flags "<<dwCurrentFlags<<" and "<<dwStopFlags<<endl;
+ //debugLog<<"Set Positions "<<*pCurrent<<" to "<<*pStop<<" with flags "<<dwCurrentFlags<<" and "<<dwStopFlags<<endl;
if (mSeekTable->enabled()) {
//debugLog<<"SetPos : Current = "<<*pCurrent<<" Flags = "<<dwCurrentFlags<<" Stop = "<<*pStop<<" dwStopFlags = "<<dwStopFlags<<endl;
//debugLog<<" : Delivering begin flush..."<<endl;
@@ -361,7 +361,7 @@
// mStreamMapper->getOggStream(i)->setLastEndGranPos(mSeekTable->getRealStartPos());
//}
} else {
- debugLog<<"Seek not IMPL"<<endl;
+ //debugLog<<"Seek not IMPL"<<endl;
return E_NOTIMPL;
}
@@ -382,7 +382,7 @@
return S_OK;
}
STDMETHODIMP OggDemuxSourceFilter::GetPositions(LONGLONG *pCurrent, LONGLONG *pStop){
- debugLog<<"Getpos : Not IMPL"<<endl;
+ //debugLog<<"Getpos : Not IMPL"<<endl;
//debugLog<<"GetPos : Current = HARDCODED 2 secs , Stop = "<<mSeekTable->fileDuration()/UNITS <<" secs."<<endl;
return E_NOTIMPL;
*pCurrent = 2 * UNITS;
@@ -392,16 +392,16 @@
STDMETHODIMP OggDemuxSourceFilter::GetAvailable(LONGLONG *pEarliest, LONGLONG *pLatest){
//debugLog<<"****GetAvailable : NOT IMPL"<<endl;
if (mSeekTable->enabled()) {
- debugLog<<"Get Avail ok"<<endl;
+ //debugLog<<"Get Avail ok"<<endl;
*pEarliest = 0;
- debugLog<<"+++++ Duration is "<<mSeekTable->fileDuration()<<endl;
+ //debugLog<<"+++++ Duration is "<<mSeekTable->fileDuration()<<endl;
*pLatest = mSeekTable->fileDuration();
} else {
return E_NOTIMPL;
}
}
STDMETHODIMP OggDemuxSourceFilter::SetRate(double dRate){
- debugLog<<"Set RATE : NOT IMPL"<<endl;
+ //debugLog<<"Set RATE : NOT IMPL"<<endl;
return E_NOTIMPL;
//debugLog<<"SetRate : "<<dRate<<endl;
return S_OK;;
@@ -583,7 +583,7 @@
//Mess with the locking mechanisms at your own risk.
- debugLog<<"Starting DataProcessLoop :"<<endl;
+ //debugLog<<"Starting DataProcessLoop :"<<endl;
DWORD locCommand = 0;
char* locBuff = new char[4096]; //Deleted before function returns...
//TODO::: Make this a member variable ^^^^^
@@ -601,11 +601,11 @@
//while (!locIsEOF && locKeepGoing) {
while(true) {
if(CheckRequest(&locCommand) == TRUE) {
- debugLog<<"DataProcessLoop : Thread Command issued... leaving loop."<<endl;
+ //debugLog<<"DataProcessLoop : Thread Command issued... leaving loop."<<endl;
delete[] locBuff;
return S_OK;
}
- debugLog<<"Looping..."<<endl;
+ //debugLog<<"Looping..."<<endl;
{
CAutoLock locSourceLock(mSourceFileLock);
//CAutoLock locDemuxLock(mDemuxLock);
@@ -629,8 +629,8 @@
locKeepGoing = ((mOggBuffer.feed((const unsigned char*)locBuff, locBytesRead)) == (OggDataBuffer::FEED_OK));;
}
if (!locKeepGoing) {
- debugLog << "DataProcessLoop : Feed in data buffer said stop"<<endl;
- debugLog<<"DataProcessLoop : Exiting. Deliver EOS"<<endl;
+ //debugLog << "DataProcessLoop : Feed in data buffer said stop"<<endl;
+ //debugLog<<"DataProcessLoop : Exiting. Deliver EOS"<<endl;
DeliverEOS();
}
{
@@ -641,8 +641,8 @@
//
}
if (locIsEOF) {
- debugLog << "DataProcessLoop : EOF"<<endl;
- debugLog<<"DataProcessLoop : Exiting. Deliver EOS"<<endl;
+ //debugLog << "DataProcessLoop : EOF"<<endl;
+ //debugLog<<"DataProcessLoop : Exiting. Deliver EOS"<<endl;
DeliverEOS();
}
}
@@ -700,7 +700,7 @@
mDataSource->seek(0); //TODO::: This is bad for streams.
//Memory leak
//FIXED
- debugLog<<"COMPLETED SETUP"<<endl;
+ //debugLog<<"COMPLETED SETUP"<<endl;
delete[] locBuff;
return S_OK;
}
@@ -714,7 +714,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);
@@ -722,15 +722,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-12-03 20:47:32 UTC (rev 8331)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h 2004-12-06 01:33:52 UTC (rev 8332)
@@ -196,7 +196,7 @@
OggStreamMapper* mStreamMapper;
//DEBUG
- fstream debugLog;
+ //fstream debugLog;
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStreamMapper.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStreamMapper.cpp 2004-12-03 20:47:32 UTC (rev 8331)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStreamMapper.cpp 2004-12-06 01:33:52 UTC (rev 8332)
@@ -60,17 +60,17 @@
//Sends the page to *only one* stream if it matches the serial number.
bool OggStreamMapper::dispatchPage(OggPage* inOggPage) //Gives away or deletes page.
{
- debugLog<<"Dispatch page..."<<endl;
+ //debugLog<<"Dispatch page..."<<endl;
for (unsigned long i = 0; i < mStreamList.size(); i++) {
if (mStreamList[i]->serialNo() == inOggPage->header()->StreamSerialNo()) {
//This is the correct stream
//DbgLog((LOG_TRACE, 2, TEXT("Mapper : Dispatching page to serial %u",inOggPage->header()->StreamSerialNo())));
- debugLog<<"Dispatch to stream "<<i<<endl;
+ //debugLog<<"Dispatch to stream "<<i<<endl;
return mStreamList[i]->acceptOggPage(inOggPage); //Give away page.
}
}
- debugLog<<"Shouldn't be here $$$$$$"<<endl;
+ //debugLog<<"Shouldn't be here $$$$$$"<<endl;
//::: CHAINING SUPPORT HACKED IN HERE !!!
//===================================
@@ -139,7 +139,7 @@
}
void OggStreamMapper::setAllowDispatch(bool inAllowDispatch) {
- debugLog<<"Setting allow dispatch..."<<endl;
+ //debugLog<<"Setting allow dispatch..."<<endl;
for (unsigned long i = 0; i < mStreamList.size(); i++) {
mStreamList[i]->setAllowDispatch(inAllowDispatch);;
}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStreamMapper.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStreamMapper.h 2004-12-03 20:47:32 UTC (rev 8331)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStreamMapper.h 2004-12-06 01:33:52 UTC (rev 8332)
@@ -66,5 +66,5 @@
vector<OggStream*> mStreamList;
OggDemuxSourceFilter* mOwningFilter;
- fstream debugLog;
+ //fstream debugLog;
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.cpp 2004-12-03 20:47:32 UTC (rev 8331)
+++ trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.cpp 2004-12-06 01:33:52 UTC (rev 8332)
@@ -15,8 +15,8 @@
AM_SEEKING_CanGetStopPos |
AM_SEEKING_CanGetDuration;
- string x = "g:\\logs\\seeker.log";
- seekDebug.open(x.c_str(), ios_base::out);
+ //string x = "g:\\logs\\seeker.log";
+ //seekDebug.open(x.c_str(), ios_base::out);
}
@@ -32,8 +32,8 @@
AM_SEEKING_CanGetStopPos |
AM_SEEKING_CanGetDuration;
- string x = "g:\\logs\\seeker.log";
- seekDebug.open(x.c_str(), ios_base::out);
+ //string x = "g:\\logs\\seeker.log";
+ //seekDebug.open(x.c_str(), ios_base::out);
}
@@ -57,7 +57,7 @@
mSeekDelegate->Release();
mSeekDelegate = NULL;
}
- seekDebug.close();
+ //seekDebug.close();
}
//IMediaSeeking Interface
STDMETHODIMP BasicSeekable::GetCapabilities(DWORD* inCapabilities) {
@@ -79,10 +79,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;
}
@@ -104,10 +104,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;
}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.h 2004-12-03 20:47:32 UTC (rev 8331)
+++ trunk/oggdsf/src/lib/core/directshow/dsfSeeking/BasicSeekable.h 2004-12-06 01:33:52 UTC (rev 8332)
@@ -47,5 +47,5 @@
DWORD mSeekingCap;
//Debug only.
- fstream seekDebug;
+ //fstream seekDebug;
};
Modified: trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/BasicSeekPassThrough.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/BasicSeekPassThrough.cpp 2004-12-03 20:47:32 UTC (rev 8331)
+++ trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/BasicSeekPassThrough.cpp 2004-12-06 01:33:52 UTC (rev 8332)
@@ -49,8 +49,8 @@
AM_SEEKING_CanGetStopPos |
AM_SEEKING_CanGetDuration;
- string x = "g:\\logs\\seeker.log";
- seekDebug.open(x.c_str(), ios_base::out);
+ //string x = "g:\\logs\\seeker.log";
+ //seekDebug.open(x.c_str(), ios_base::out);
}
@@ -66,8 +66,8 @@
AM_SEEKING_CanGetStopPos |
AM_SEEKING_CanGetDuration;
- string x = "g:\\logs\\seeker.log";
- seekDebug.open(x.c_str(), ios_base::out);
+ //string x = "g:\\logs\\seeker.log";
+ //seekDebug.open(x.c_str(), ios_base::out);
}
@@ -91,7 +91,7 @@
mSeekDelegate->Release();
mSeekDelegate = NULL;
}
- seekDebug.close();
+ //seekDebug.close();
}
//IMediaSeeking Interface
STDMETHODIMP BasicSeekPassThrough::GetCapabilities(DWORD* inCapabilities) {
@@ -113,10 +113,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;
}
@@ -138,10 +138,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;
}
Modified: trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/BasicSeekPassThrough.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/BasicSeekPassThrough.h 2004-12-03 20:47:32 UTC (rev 8331)
+++ trunk/oggdsf/src/lib/core/directshow/libDirectshowAbstracts/BasicSeekPassThrough.h 2004-12-06 01:33:52 UTC (rev 8332)
@@ -77,5 +77,5 @@
DWORD mSeekingCap;
//Debug only.
- fstream seekDebug;
+ //fstream seekDebug;
};
More information about the commits
mailing list