[xiph-commits] r8650 - in trunk/oggdsf: build/oggcodecs
src/lib/codecs/theora/filters/dsfTheoraDecoder
src/lib/codecs/theora/libs/libOOTheora
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Fri Jan 7 05:40:55 PST 2005
Author: illiminable
Date: 2005-01-07 05:40:55 -0800 (Fri, 07 Jan 2005)
New Revision: 8650
Modified:
trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.h
trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.cpp
trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h
Log:
* Keyframe marking in the theora filter.
* Warning-- in libOOtheora
Modified: trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
===================================================================
--- trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2005-01-07 13:27:10 UTC (rev 8649)
+++ trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2005-01-07 13:40:55 UTC (rev 8650)
@@ -21,378 +21,384 @@
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
+ "MsmKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_E6B7C1CA6BF74C998B68B4C3379FB830"
+ "MsmKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
+ "MsmKey" = "8:_141113E874984C0483C694B14F3C16A3"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
+ "MsmKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
+ "MsmKey" = "8:_1ED42AE022EB477985E46FA18A63F9A5"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
+ "MsmKey" = "8:_24A1793CB89A464FB683A8A3BDA774DB"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+ "MsmKey" = "8:_27330A8D56F34785A52342ADD956700F"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_D3E41A5878FC4EC0B0F443CF3E5991BA"
+ "MsmKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
+ "MsmKey" = "8:_2C5F38B64D1B4026848AEB8788C27EFC"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
+ "MsmKey" = "8:_2D5D4F4E3F6E43359F3202D733153812"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_B9749E2A902A46BEAE555C07E32980BB"
+ "MsmKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
+ "MsmKey" = "8:_3A86D30B7A3948869605033FC8CEA4B2"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_A0E68123D9D541DFA9691752981C903A"
+ "MsmKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_9F87CF49E6BC48AE9DECD5A3F35FEC24"
+ "MsmKey" = "8:_408749AC43894882BEEBFF43737E505B"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_950B983745EC40EF9FF08E742A6E9510"
+ "MsmKey" = "8:_42F89A4130A36CD4BA74B00F4B424775"
+ "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
+ "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
+ "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
+ "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
+ "OwnerKey" = "8:_A0E68123D9D541DFA9691752981C903A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
+ "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
+ "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
+ "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
+ "OwnerKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
+ "MsmKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
+ "MsmKey" = "8:_52EEBD17D1BC463493F06DCBC4C2CD44"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
+ "MsmKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
+ "MsmKey" = "8:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
+ "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_52EEBD17D1BC463493F06DCBC4C2CD44"
+ "MsmKey" = "8:_578B89273D59478F861AA5BC3600D074"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
+ "MsmKey" = "8:_58F56CD02F64413B9459F3E151760A57"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
+ "MsmKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_3A86D30B7A3948869605033FC8CEA4B2"
+ "MsmKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
+ "MsmKey" = "8:_65015192414F476999A68339F89BEA57"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_27330A8D56F34785A52342ADD956700F"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_141113E874984C0483C694B14F3C16A3"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_E6B7C1CA6BF74C998B68B4C3379FB830"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_08F41A479D744DC3928D5928DFE72E6F"
- "OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_D3E41A5878FC4EC0B0F443CF3E5991BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_141113E874984C0483C694B14F3C16A3"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_1ED42AE022EB477985E46FA18A63F9A5"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_B9749E2A902A46BEAE555C07E32980BB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_24A1793CB89A464FB683A8A3BDA774DB"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_27330A8D56F34785A52342ADD956700F"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_A0E68123D9D541DFA9691752981C903A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_9F87CF49E6BC48AE9DECD5A3F35FEC24"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_2C5F38B64D1B4026848AEB8788C27EFC"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_950B983745EC40EF9FF08E742A6E9510"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_2D5D4F4E3F6E43359F3202D733153812"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_3A86D30B7A3948869605033FC8CEA4B2"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_408749AC43894882BEEBFF43737E505B"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_42F89A4130A36CD4BA74B00F4B424775"
- "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
- "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
- "OwnerKey" = "8:_A0E68123D9D541DFA9691752981C903A"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
- "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
- "OwnerKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_52EEBD17D1BC463493F06DCBC4C2CD44"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_52EEBD17D1BC463493F06DCBC4C2CD44"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_3A86D30B7A3948869605033FC8CEA4B2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
- "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_578B89273D59478F861AA5BC3600D074"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_58F56CD02F64413B9459F3E151760A57"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_27330A8D56F34785A52342ADD956700F"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_141113E874984C0483C694B14F3C16A3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65015192414F476999A68339F89BEA57"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
+ "MsmKey" = "8:_7E4D5C646DFE464CB9F0A1FEB606236B"
+ "OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_81A3CDB604B64763884C387192BE6771"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -483,294 +489,294 @@
}
"Entry"
{
- "MsmKey" = "8:_D7835E050C942DE27CB20AF3D1EC70F4"
- "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
+ "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_D9BE90D398094F15B881B22369C3A231"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
+ "OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
+ "OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
+ "OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_E6B7C1CA6BF74C998B68B4C3379FB830"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
- "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_E6B7C1CA6BF74C998B68B4C3379FB830"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
- "OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
- "OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
- "OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_D3E41A5878FC4EC0B0F443CF3E5991BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_B9749E2A902A46BEAE555C07E32980BB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_A0E68123D9D541DFA9691752981C903A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_9F87CF49E6BC48AE9DECD5A3F35FEC24"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_950B983745EC40EF9FF08E742A6E9510"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_83AF8D74700947168B69E69E5160F082"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_52EEBD17D1BC463493F06DCBC4C2CD44"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_3A86D30B7A3948869605033FC8CEA4B2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_27330A8D56F34785A52342ADD956700F"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_24A1793CB89A464FB683A8A3BDA774DB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_141113E874984C0483C694B14F3C16A3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "MsmKey" = "8:_D7171409D45842C5BB8E3557617F0575"
"OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
+ "MsmKey" = "8:_D7835E050C942DE27CB20AF3D1EC70F4"
+ "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_D9BE90D398094F15B881B22369C3A231"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_E6B7C1CA6BF74C998B68B4C3379FB830"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1133,7 +1139,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:oggcodecs"
"ProductCode" = "8:{D65F0073-A820-4085-B997-A061171595A7}"
- "PackageCode" = "8:{89D97255-B269-4080-A244-C8926444E905}"
+ "PackageCode" = "8:{C7A6B9D4-1636-488B-BFF8-7A0EEDFB4693}"
"UpgradeCode" = "8:{1A644FEB-7597-4FAB-AADE-C2C7C64C5984}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
@@ -3256,7 +3262,7 @@
}
"MergeModule"
{
- "{35A69C6E-5BA4-440D-803D-762B59A45393}:_08F41A479D744DC3928D5928DFE72E6F"
+ "{35A69C6E-5BA4-440D-803D-762B59A45393}:_7E4D5C646DFE464CB9F0A1FEB606236B"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
@@ -3270,7 +3276,7 @@
"Feature" = "8:"
"IsolateTo" = "8:"
}
- "{35A69C6E-5BA4-440D-803D-762B59A45393}:_E95ADEAD396A4EDC9DA91E553455B90B"
+ "{35A69C6E-5BA4-440D-803D-762B59A45393}:_D7171409D45842C5BB8E3557617F0575"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
@@ -3653,7 +3659,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_52EEBD17D1BC463493F06DCBC4C2CD44"
{
- "SourcePath" = "8:..\\..\\src\\lib\\helper\\libtemporaluri\\release\\libTemporalURI.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\helper\\libTemporalURI\\Release\\libTemporalURI.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3989,7 +3995,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_9F87CF49E6BC48AE9DECD5A3F35FEC24"
{
- "SourcePath" = "8:..\\..\\src\\tests\\testtemporal\\release\\testTemporal.exe"
+ "SourcePath" = "8:..\\..\\src\\tests\\testTemporal\\Release\\testTemporal.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp 2005-01-07 13:27:10 UTC (rev 8649)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp 2005-01-07 13:40:55 UTC (rev 8650)
@@ -384,9 +384,11 @@
//This packet is given to the decoder.
StampedOggPacket* locPacket = new StampedOggPacket(locNewBuff, inInputSample->GetActualDataLength(), false, false, locStart, locEnd, StampedOggPacket::OGG_END_ONLY);
+
+ bool locIsKeyFrame = mTheoraDecoder->isKeyFrame(locPacket);
yuv_buffer* locYUV = mTheoraDecoder->decodeTheora(locPacket);
if (locYUV != NULL) {
- if (TheoraDecoded(locYUV, outOutputSample) != 0) {
+ if (TheoraDecoded(locYUV, outOutputSample, locIsKeyFrame) != 0) {
//debugLog<<"Decoded *** FALSE ***"<<endl;
return S_FALSE;
}
@@ -401,7 +403,7 @@
}
-int TheoraDecodeFilter::TheoraDecoded (yuv_buffer* inYUVBuffer, IMediaSample* outSample)
+int TheoraDecodeFilter::TheoraDecoded (yuv_buffer* inYUVBuffer, IMediaSample* outSample, bool inIsKeyFrame)
{
//debugLog<<"TheoraDecoded... #################### "<<endl;
@@ -445,7 +447,7 @@
REFERENCE_TIME locFrameEnd = (mFrameCount * mFrameDuration);
- debugLog<<"Sample times = "<<locFrameStart<<" to "<<locFrameEnd<<" frame "<<mFrameCount<<endl;
+ debugLog<<"Sample times = "<<locFrameStart<<" to "<<locFrameEnd<<" frame "<<mFrameCount<<" KF = "<<((inIsKeyFrame) ? "YES" : "NO")<<endl;
//FILTER_STATE locFS;
//GetState(0, &locFS);
@@ -590,9 +592,9 @@
//Set the sample parameters.
//BOOL locIsKeyFrame = (locInterFrameNo == 0);
- BOOL locIsKeyFrame = TRUE;
- if (locIsKeyFrame == TRUE) {
- //debugLog<<"KEY FRAME ++++++"<<endl;
+ BOOL locIsKeyFrame = FALSE;
+ if (inIsKeyFrame) {
+ locIsKeyFrame = TRUE;
};
SetSampleParams(outSample, mFrameSize, &locFrameStart, &locFrameEnd, locIsKeyFrame);
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.h 2005-01-07 13:27:10 UTC (rev 8649)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.h 2005-01-07 13:40:55 UTC (rev 8650)
@@ -82,7 +82,7 @@
TheoraDecoder* mTheoraDecoder;
- int TheoraDecoded (yuv_buffer* inYUVBuffer, IMediaSample* outSample);
+ int TheoraDecoded (yuv_buffer* inYUVBuffer, IMediaSample* outSample, bool inIsKeyFrame);
__int64 mSeekTimeBase;
Modified: trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.cpp 2005-01-07 13:27:10 UTC (rev 8649)
+++ trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.cpp 2005-01-07 13:40:55 UTC (rev 8650)
@@ -68,8 +68,9 @@
delete locOldPack->packet;
delete locOldPack;
- int locRetVal = theora_decode_YUVout(&mTheoraState, &mYUVBuffer);
- //Error check
+ //Ignore return value... always returns 0 (or crashes :)
+ theora_decode_YUVout(&mTheoraState, &mYUVBuffer);
+
return &mYUVBuffer;
}
@@ -97,6 +98,15 @@
return locOldPacket; //Gives a poitner to the caller.
}
+bool TheoraDecoder::isKeyFrame(StampedOggPacket* inPacket)
+{
+ const unsigned char KEY_FRAME_FLAG = 0x40;
+ if ((inPacket->packetSize() > 0) && (inPacket->packetData() != NULL)) {
+ return ((inPacket->packetData()[0] & KEY_FRAME_FLAG) == KEY_FRAME_FLAG) ? false : true;
+ } else {
+ return false;
+ }
+}
bool TheoraDecoder::decodeHeader(StampedOggPacket* inHeaderPacket) { //inHeaderPacket is accepted and deleted.
ogg_packet* locOldPack = simulateOldOggPacket(inHeaderPacket); //Accepts packet and deletes it.
Modified: trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h 2005-01-07 13:27:10 UTC (rev 8649)
+++ trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h 2005-01-07 13:40:55 UTC (rev 8650)
@@ -51,7 +51,7 @@
ogg_packet* simulateOldOggPacket(StampedOggPacket* inPacket);
- bool isKeyFrame(const StampedOggPacket* inPacket);
+ bool isKeyFrame(StampedOggPacket* inPacket);
//unsigned char* convertYUV(yuv_buffer* inBuffer, unsigned long inFormat);
theora_info mTheoraInfo;
protected:
More information about the commits
mailing list