[xiph-commits] r8484 - in trunk/oggdsf: build/oggcodecs
src/lib/core/ogg/libOOOgg src/tests/testLibOOOgg
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Sat Dec 18 21:36:20 PST 2004
Author: illiminable
Date: 2004-12-18 21:36:20 -0800 (Sat, 18 Dec 2004)
New Revision: 8484
Modified:
trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.h
trunk/oggdsf/src/tests/testLibOOOgg/testLibOOOgg.cpp
Log:
* Add some debugging stuff.
Modified: trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
===================================================================
--- trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-12-18 02:31:27 UTC (rev 8483)
+++ trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-12-19 05:36:20 UTC (rev 8484)
@@ -87,572 +87,596 @@
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_408749AC43894882BEEBFF43737E505B"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_42F89A4130A36CD4BA74B00F4B424775"
+ "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_D3E41A5878FC4EC0B0F443CF3E5991BA"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_B9749E2A902A46BEAE555C07E32980BB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_950B983745EC40EF9FF08E742A6E9510"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_141113E874984C0483C694B14F3C16A3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
- "OwnerKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
+ "MsmKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_408749AC43894882BEEBFF43737E505B"
+ "MsmKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
- "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
+ "MsmKey" = "8:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
+ "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
- "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
+ "MsmKey" = "8:_578B89273D59478F861AA5BC3600D074"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
- "OwnerKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
+ "MsmKey" = "8:_58F56CD02F64413B9459F3E151760A57"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
+ "MsmKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
- "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_578B89273D59478F861AA5BC3600D074"
+ "MsmKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_58F56CD02F64413B9459F3E151760A57"
+ "MsmKey" = "8:_65015192414F476999A68339F89BEA57"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65015192414F476999A68339F89BEA57"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
+ "OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_81A3CDB604B64763884C387192BE6771"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_83AF8D74700947168B69E69E5160F082"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8976C400668B453CB941859C4F3C6E27"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8B57C7289F10C058A4E606BDCC6C9CFC"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_D3E41A5878FC4EC0B0F443CF3E5991BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8FDBDF6B593E4A31BDEECAA245B32EB0"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_950B983745EC40EF9FF08E742A6E9510"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_B9749E2A902A46BEAE555C07E32980BB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_AC8962A7F212481095173AB7C8C89025"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_B9749E2A902A46BEAE555C07E32980BB"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_950B983745EC40EF9FF08E742A6E9510"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_D3E41A5878FC4EC0B0F443CF3E5991BA"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_D9BE90D398094F15B881B22369C3A231"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_83AF8D74700947168B69E69E5160F082"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_24A1793CB89A464FB683A8A3BDA774DB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_141113E874984C0483C694B14F3C16A3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_B9749E2A902A46BEAE555C07E32980BB"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
+ "MsmKey" = "8:_81A3CDB604B64763884C387192BE6771"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
+ "MsmKey" = "8:_83AF8D74700947168B69E69E5160F082"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
+ "MsmKey" = "8:_8976C400668B453CB941859C4F3C6E27"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
+ "MsmKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_83AF8D74700947168B69E69E5160F082"
+ "MsmKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
+ "MsmKey" = "8:_8FDBDF6B593E4A31BDEECAA245B32EB0"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
+ "MsmKey" = "8:_950B983745EC40EF9FF08E742A6E9510"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
+ "MsmKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
+ "MsmKey" = "8:_AC8962A7F212481095173AB7C8C89025"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
+ "MsmKey" = "8:_B2784574F1B848EABBE013669B46808C"
+ "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
+ "MsmKey" = "8:_B6A0B75A2A7A47922297CCEFC5F6F6BA"
+ "OwnerKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
+ "MsmKey" = "8:_B9749E2A902A46BEAE555C07E32980BB"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
+ "MsmKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
+ "MsmKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
+ "MsmKey" = "8:_D3E41A5878FC4EC0B0F443CF3E5991BA"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
+ "MsmKey" = "8:_D9BE90D398094F15B881B22369C3A231"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_24A1793CB89A464FB683A8A3BDA774DB"
+ "MsmKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
+ "MsmKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_141113E874984C0483C694B14F3C16A3"
+ "MsmKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
+ "MsmKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
+ "MsmKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- "OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
+ "MsmKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -811,10 +835,10 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{A582A373-4685-4296-BEFE-614B80A702C3}:_4812D148C77C9833CE1C0D8D175B84A4"
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_42F89A4130A36CD4BA74B00F4B424775"
{
- "SourcePath" = "8:msxml3.dll"
- "TargetName" = "8:msxml3.dll"
+ "SourcePath" = "8:dsfOggDemux.dll"
+ "TargetName" = "8:dsfOggDemux.dll"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
"Condition" = "8:"
@@ -826,11 +850,31 @@
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
- "Register" = "3:4"
+ "Register" = "3:1"
"Exclude" = "11:TRUE"
"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"
@@ -891,8 +935,28 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{A582A373-4685-4296-BEFE-614B80A702C3}:_8B57C7289F10C058A4E606BDCC6C9CFC"
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_8FDBDF6B593E4A31BDEECAA245B32EB0"
{
+ "SourcePath" = "8:..\\..\\COPYRIGHTS.rtf"
+ "TargetName" = "8:COPYRIGHTS.rtf"
+ "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:"
+ }
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_B2784574F1B848EABBE013669B46808C"
+ {
"SourcePath" = "8:libFLAC.dll"
"TargetName" = "8:libFLAC.dll"
"Tag" = "8:"
@@ -911,10 +975,10 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{A582A373-4685-4296-BEFE-614B80A702C3}:_8FDBDF6B593E4A31BDEECAA245B32EB0"
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_B6A0B75A2A7A47922297CCEFC5F6F6BA"
{
- "SourcePath" = "8:..\\..\\COPYRIGHTS.rtf"
- "TargetName" = "8:COPYRIGHTS.rtf"
+ "SourcePath" = "8:libOOOgg.dll"
+ "TargetName" = "8:libOOOgg.dll"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
"Condition" = "8:"
@@ -927,8 +991,8 @@
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
+ "Exclude" = "11:TRUE"
+ "IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{A582A373-4685-4296-BEFE-614B80A702C3}:_D9BE90D398094F15B881B22369C3A231"
@@ -1007,7 +1071,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:oggcodecs"
"ProductCode" = "8:{D65F0073-A820-4085-B997-A061171595A7}"
- "PackageCode" = "8:{B958AF43-C156-45F7-9114-DD842A2D713C}"
+ "PackageCode" = "8:{79C906F9-3E83-4C28-BF9E-B9A45284BF98}"
"UpgradeCode" = "8:{1A644FEB-7597-4FAB-AADE-C2C7C64C5984}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
@@ -3130,40 +3194,12 @@
}
"MergeModule"
{
- "{35A69C6E-5BA4-440D-803D-762B59A45393}:_37172A348F2F449696731FD35BDCFE5B"
- {
- "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}:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
- {
- "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:"
- }
}
"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"
@@ -3191,7 +3227,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"
@@ -3219,7 +3255,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"
@@ -3247,7 +3283,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_13E9F6D7ED35430BA31BDDF95E6327B3"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfabstractvideoencoder\\release\\dsfAbstractVideoEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractVideoEncoder\\Debug\\dsfAbstractVideoEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3275,7 +3311,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"
@@ -3303,7 +3339,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_14E3067B71584FB5A245A2DA9D65D139"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libwincmmlparse\\release\\libWinCMMLParse.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libWinCMMLParse\\Debug\\libWinCMMLParse.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3331,7 +3367,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"
@@ -3359,7 +3395,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"
@@ -3387,7 +3423,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"
@@ -3415,7 +3451,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"
@@ -3443,7 +3479,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"
@@ -3471,7 +3507,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"
@@ -3499,7 +3535,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"
@@ -3527,7 +3563,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"
@@ -3555,7 +3591,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"
@@ -3583,7 +3619,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"
@@ -3611,7 +3647,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"
@@ -3639,7 +3675,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"
@@ -3667,7 +3703,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"
@@ -3695,7 +3731,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"
@@ -3723,7 +3759,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"
@@ -3751,7 +3787,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"
@@ -3779,7 +3815,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"
@@ -3807,7 +3843,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"
@@ -3835,7 +3871,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"
@@ -3863,7 +3899,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"
@@ -3891,7 +3927,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"
@@ -3919,7 +3955,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"
@@ -3947,7 +3983,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"
@@ -3975,7 +4011,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"
@@ -4003,7 +4039,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"
@@ -4031,7 +4067,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"
@@ -4059,7 +4095,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"
@@ -4087,7 +4123,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"
@@ -4115,7 +4151,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"
@@ -4143,7 +4179,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/core/ogg/libOOOgg/OggPageInterleaver.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp 2004-12-18 02:31:27 UTC (rev 8483)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp 2004-12-19 05:36:20 UTC (rev 8484)
@@ -35,12 +35,12 @@
: mFileWriter(inFileWriter)
, mNotifier(inNotifier)
{
- //debugLog.open("G:\\logs\\interleaver.log", ios_base::out);
+ debugLog.open("G:\\logs\\interleaver.log", ios_base::out);
}
OggPageInterleaver::~OggPageInterleaver(void)
{
- //debugLog.close();
+ debugLog.close();
//Need to delete stream objects
}
@@ -52,6 +52,8 @@
}
void OggPageInterleaver::notifyArrival() {
+ debugLog<<endl;
+ debugLog<<"notifyArrival : "<<endl;
processData();
}
void OggPageInterleaver::processData() {
@@ -82,27 +84,27 @@
//
//Temp
-
- //debugLog<<endl<<"Process Data : "<<endl;
- //debugLog<<"==============="<<endl;
+ debugLog<<endl;
+ debugLog<<"ProcessData : "<<endl;
+
if (isAllEOS()) {
- //debugLog<<"Process Data : All are EOS."<<endl;
+ debugLog<<"ProcessData : All Streams EOS."<<endl;
//Finish up
while (!isAllEmpty()) {
- //debugLog<<"Process Data : Finishing - Still not empty..."<<endl;
+ debugLog<<"ProcessData : All Streams EOS : Flushing."<<endl;
writeLowest();
}
- //debugLog<<"Process Data : Notifying completion... 1"<<endl;
+ debugLog<<"ProcessData : All Streams EOS : Notify complete."<<endl;
mNotifier->NotifyComplete();
} else {
- //debugLog<<"Process Data : *NOT* all EOS"<<endl;
+ debugLog<<"ProcessData : All Streams *NOT* EOS."<<endl;
while (isProcessable()) {
- //debugLog<<"Process Data : Still processable data..."<<endl;
+ debugLog<<"ProcessData : Writing lowest"<<endl;
writeLowest();
}
- //debugLog<<"Process Data : No more processable data..."<<endl;
+ debugLog<<"ProcessData : No more processable data"<<endl;
if (isAllEOS() && isAllEmpty()) {
- //debugLog<<"Process Data : All EOS and all Empty... Notifying complete 2..."<<endl;
+ debugLog<<"ProcessData : All EOS and all Empty... Notifying complete..."<<endl;
mNotifier->NotifyComplete();
}
}
@@ -122,13 +124,14 @@
LOOG_INT64 locCurrLowTime = locLowestStream->scaledFrontTime();
LOOG_INT64 locTestLowTime = mInputStreams[i]->scaledFrontTime();
- //__int64 locCurrLowTimeUNS = locLowestStream->frontTime();
- //__int64 locTestLowTimeUNS = mInputStreams[i]->frontTime();
+ //debuging
+ LOOG_INT64 locCurrLowTimeUNS = locLowestStream->frontTime();
+ LOOG_INT64 locTestLowTimeUNS = mInputStreams[i]->frontTime();
+ //debugging end
+ debugLog<<"writeLowest : Scaled : Curr = "<<locCurrLowTime<<" -- Test["<<i<<"] = "<<locTestLowTime<<endl;
+ debugLog<<"writeLowest : UNSCAL : Curr = "<<locCurrLowTimeUNS<<" -- Test["<<i<<"] = "<<locTestLowTimeUNS<<endl;
- //debugLog<<"writeLowest Scaled : Curr = "<<locCurrLowTime<<" -- Test["<<i<<"] = "<<locTestLowTime<<endl;
- //debugLog<<"writeLowest UNSCAL : Curr = "<<locCurrLowTimeUNS<<" -- Test["<<i<<"] = "<<locTestLowTimeUNS<<endl;
-
//In english this means... any bos pages go first... then any no gran pos pages (-1 gran pos)..
// then any remaining streams with headers then whoevers got the lowest time.
@@ -146,8 +149,29 @@
)
{
+ //DeBUGGIN BLOCK
+ if ( (mInputStreams[i]->peekFront() != NULL) &&
+ (mInputStreams[i]->peekFront()->header()->isBOS()) ) {
+ 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;
+ }
+
+ if ((mInputStreams[i]->peekFront() != NULL) &&
+ (!mInputStreams[i]->sentAllHeaders()) ) {
+
+ debugLog<<"WriteLowest : Selecting because sent all headers"<<endl;
+ }
+
+ if (locTestLowTime < locCurrLowTime) {
+
+ debugLog<<"WriteLowest : Selecting because test time "<<locTestLowTime<<" less than "<<locCurrLowTime<<endl;
+ }
+ //END BEBUGGING BLOCK
locLowestStream = mInputStreams[i];
- //debugLog<<"writeLowest : Selecting stream "<<i<<" @ Gran = "<<locLowestStream->frontTime()<<" & Time = "<<locLowestStream->scaledFrontTime()<<endl;
+ debugLog<<"writeLowest : Selecting stream "<<i<<" @ Gran = "<<locLowestStream->frontTime()<<" & Time = "<<locLowestStream->scaledFrontTime()<<endl;
}
}
}
@@ -155,7 +179,7 @@
if (locLowestStream == NULL) {
throw 0;
} else {
- //debugLog<<"writeLowest : Writing..."<<endl;
+ debugLog<<"writeLowest : Writing..."<<endl;
//TODO::: Handle case where the popped page is a null pointer.
mFileWriter->acceptOggPage(locLowestStream->popFront()); //Gives away page
@@ -168,6 +192,11 @@
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;
+ }
return retVal;
}
bool OggPageInterleaver::isAllEOS() {
@@ -175,12 +204,17 @@
//ASSERT(mInputStreams.size() >= 1)
for (size_t i = 0; i < mInputStreams.size(); i++) {
if (mInputStreams[i]->isEOS()) {
- //debugLog<<"***** Stream "<<i<<" is EOS"<<endl;
+ debugLog<<"isAllEOS : ***** Stream "<<i<<" is EOS"<<endl;
} else {
- //debugLog<<"***** Stream "<<i<<" not EOS"<<endl;
+ debugLog<<"isAllEOS : ***** Stream "<<i<<" not EOS"<<endl;
}
retVal = retVal && (mInputStreams[i]->isEOS() || !mInputStreams[i]->isActive());
}
+ if (retVal) {
+ debugLog<<"isAllEOS : TRUE"<<endl;
+ } else {
+ debugLog<<"isAllEOS : FALSE"<<endl;
+ }
return retVal;
}
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.h 2004-12-18 02:31:27 UTC (rev 8483)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.h 2004-12-19 05:36:20 UTC (rev 8484)
@@ -63,7 +63,7 @@
INotifyComplete* mNotifier;
//DEBUG ONLY
- //fstream debugLog;
+ fstream debugLog;
//
private:
OggPageInterleaver& operator=(const OggPageInterleaver& other); /* Don't assign me */
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp 2004-12-18 02:31:27 UTC (rev 8483)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp 2004-12-19 05:36:20 UTC (rev 8484)
@@ -124,13 +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);
createFreshPage();
return true;
}
@@ -149,9 +151,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 : ";
//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;
mPendingPage->header()->setGranulePos(mLastGranulePos);
}
@@ -196,7 +201,8 @@
}
bool OggPaginator::deliverCurrentPage() {
- //debugLog<<"Delivering page"<<endl;
+ debugLog<<endl;
+ debugLog<<"deliverCurrentPage : "<<endl;
mPendingPage->header()->setSegmentTable((const unsigned char*)mSegmentTable, mSegmentTableSize);
mPendingPage->header()->setDataSize(mCurrentPageSize - mPendingPage->headerSize()); //This is odd
@@ -214,7 +220,8 @@
}
bool OggPaginator::createFreshPage() {
- //debugLog<<"Creating fresh page"<<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;
@@ -225,8 +232,10 @@
//If it's the first page it gets the BOS Flag
if (mSequenceNo == 0) {
+ debugLog<<"createFreshPage : Setting as BOS"<<endl;
mPendingPage->header()->setHeaderFlags(OggPageHeader::BOS);
} else {
+ debugLog<<"createFreshPage : Setting NO FLAGS"<<endl;
mPendingPage->header()->setHeaderFlags(OggPageHeader::NO_FLAGS);
}
@@ -237,7 +246,8 @@
}
bool OggPaginator::addPacketToPage(StampedOggPacket* inOggPacket) {
- //debugLog<<"Add packet to page"<<endl;
+ debugLog<<endl;
+ debugLog<<"addPacketToPage : "<<endl;
mPendingPageHasData = true;
//while some packet left
// add as much as possible
@@ -256,16 +266,20 @@
unsigned long locPacketStartPoint = 0;
unsigned long locConsumed = 0;
+ 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) {
- //debugLog<<"Packet remaining = "<<locPacketRemaining<<endl;
+
locConsumed = addAsMuchPacketAsPossible(inOggPacket, locPacketStartPoint, locPacketRemaining);
- //debugLog<<"Consumed = "<<locConsumed<<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;
}
@@ -274,9 +288,10 @@
//Every header gets it's own page.
if (((mPacketCount < mSettings->mNumHeaders) || (mPacketCount >= mSettings->mMaxPacksPerPage)) && (mPendingPageHasData)) {
- //debugLog<<"Flushing a header page..."<<endl;
- //debugLog<<"PacketCount = "<<mPacketCount<<endl;
- //debugLog<<"Num Headers = "<<mSettings->mNumHeaders<<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();
}
mPacketCount++;
@@ -291,7 +306,15 @@
//debugLog<<"Segtable size = "<<mSegmentTableSize<<endl;
//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;
+
//The amount of space left in the page is the minimum of
// a) The (number of segments left * 255) take 1.
// b) The number of bytes less than the desired maximum page size.
@@ -301,6 +324,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<<"Space left = "<<locSpaceLeft<<endl;
//debugLog<<"Space left = "<<locSpaceLeft<<endl;
//Round down to nearest multiple of 255
@@ -309,6 +333,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;
//ASSERT(locSpaceLeft >=0);
//debugLog<<"Adjust space left = "<<locSpaceLeft<<endl;
@@ -320,22 +345,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<<"How much to add..."<<endl;
- //debugLog<<"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;
mPendingPage->header()->setHeaderFlags(mPendingPage->header()->HeaderFlags() | OggPageHeader::CONTINUATION);
}
if (locHowMuchToAdd > 0) {
+ 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;
deliverCurrentPage();
}
return locHowMuchToAdd;
@@ -343,9 +370,10 @@
}
bool OggPaginator::addPartOfPacketToPage(StampedOggPacket* inOggPacket, unsigned long inStartFrom, unsigned long inLength) {
-
- //debugLog<<"Add part of packet to page"<<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.
memcpy((void*)locBuff, (const void*)(inOggPacket->packetData() + inStartFrom), inLength);
@@ -358,6 +386,7 @@
// as the total packet size.
bool locIsLastOfPacket = (inStartFrom + inLength == inOggPacket->packetSize());
+ debugLog<<"addPartOfPacketToPage : This is the last bit of the packet..."<<endl;
//Create a new packet
StampedOggPacket* locPartialPacket = new StampedOggPacket( locBuff,
inLength,
@@ -367,6 +396,7 @@
inOggPacket->endTime(),
inOggPacket->mStampType); //Given to page.
+ debugLog<<"addPartOfPacketToPage : Adding Partial Packet to page"<<endl;
//Add the packet to the page.
mPendingPage->addPacket(locPartialPacket);
@@ -382,10 +412,8 @@
//Now do the segment table bookkeeping.
unsigned long locNumSegsNeeded = (inLength / 255);
+ debugLog<<"addPartOfPacketToPage : Num 255 segs to add = "<<locNumSegsNeeded<<" ("<<inLength<<")"<<endl;
- //debugLog<<"Amount to add = "<<inLength<<endl;
- //debugLog<<"Segs needed = "<<locNumSegsNeeded<<endl;
-
//Always do one less than the total... the last segment is a special case
//We fill all but the last segemnt with 255
for (unsigned long i = 0; i < locNumSegsNeeded; i++) {
@@ -398,7 +426,8 @@
if (locIsLastOfPacket) {
//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<<"Is last of packet... adding terminator "<<(unsigned long)(inLength % 255)<<endl;
+
+ debugLog<<"addPartOfPacketToPage : Adding last seg = "<<(unsigned long)(inLength % 255)<<endl;
mSegmentTable[mSegmentTableSize] = (unsigned char)(inLength % 255);
mSegmentTableSize++;
@@ -409,22 +438,23 @@
//Since if it was the last part of the packet we've already added all the segments, then we do nothing.
//ASSERT((inLength % 255) == 0);
- //if ((inLength % 255) != 0) {
- // debugLog<<"ASSERTION FAILED !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"<<endl;
- //}
+ if ((inLength % 255) != 0) {
+ debugLog<<"addPartOfPacketToPage : ASSERTION FAILED !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"<<endl;
+ }
//mSegmentTable[mSegmentTableSize] = (unsigned char)(255);
//mSegmentTableSize++;
//locNumSegsNeeded++;
}
- //debugLog<<"Seg table is "<<(unsigned long)mSegmentTableSize<<endl;
+
mCurrentPageSize += (locNumSegsNeeded + inLength);
+ debugLog<<"addPartOfPacketToPage : Current Page Size = "<<mCurrentPageSize<<endl;
- //debugLog<<"Page is now "<<mCurrentPageSize<<endl;
+
if (locIsLastOfPacket) {
- //debugLog<<"Setting time for end of page"<<endl;
+ debugLog<<"addPartOfPacketToPage : Updating gran pos to : "<<inOggPacket->endTime()<<endl;
mPendingPage->header()->setGranulePos(inOggPacket->endTime());
}
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h 2004-12-18 02:31:27 UTC (rev 8483)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h 2004-12-19 05:36:20 UTC (rev 8484)
@@ -85,7 +85,7 @@
OggPage* mPendingPage;
unsigned char* mHeaderBuff;
- //fstream debugLog;
+ fstream debugLog;
unsigned long mLastGranulePos;
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.cpp 2004-12-18 02:31:27 UTC (rev 8483)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.cpp 2004-12-19 05:36:20 UTC (rev 8484)
@@ -45,3 +45,14 @@
OggPaginatorSettings::~OggPaginatorSettings(void)
{
}
+
+string OggPaginatorSettings::toString() {
+ string retStr = "Serial Num : " + StringHelper::numToString(mMaxPageSize)
+ + "Max Page Size : " + StringHelper::numToString(mMaxPageSize)
+ + "Target Page Size : " + StringHelper::numToString(mTargetPageSize)
+ + "Min Page Size : " + StringHelper::numToString(mMinPageSize)
+ + "Num Headers : " + StringHelper::numToString(mNumHeaders)
+ + "Max Packs per Page : " + StringHelper::numToString(mMaxPacksPerPage) + "\n";
+
+ return retStr;
+}
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.h 2004-12-18 02:31:27 UTC (rev 8483)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.h 2004-12-19 05:36:20 UTC (rev 8484)
@@ -30,7 +30,7 @@
//===========================================================================
#pragma once
-
+#include "StringHelper.h"
class LIBOOOGG_API OggPaginatorSettings
{
public:
@@ -44,4 +44,6 @@
unsigned long mNumHeaders;
unsigned long mMaxPacksPerPage;
+ string toString();
+
};
Modified: trunk/oggdsf/src/tests/testLibOOOgg/testLibOOOgg.cpp
===================================================================
--- trunk/oggdsf/src/tests/testLibOOOgg/testLibOOOgg.cpp 2004-12-18 02:31:27 UTC (rev 8483)
+++ trunk/oggdsf/src/tests/testLibOOOgg/testLibOOOgg.cpp 2004-12-19 05:36:20 UTC (rev 8484)
@@ -134,6 +134,7 @@
locSettings->mTargetPageSize = 8192;
locSettings->mSerialNo = 77;
locSettings->mNumHeaders = 6;
+ locSettings->mMaxPacksPerPage = 1;
locPaginator.setParameters(locSettings);
locPaginator.setPageCallback(&locFileWriter);
More information about the commits
mailing list