[xiph-commits] r7719 - in trunk/oggdsf: build/oggcodecs
sln/oggdsf_all src/lib/codecs/theora/filters/dsfTheoraDecoder
src/lib/core/directshow/dsfAbstractVideoDecoder
src/lib/core/directshow/dsfAbstractVideoEncoder
src/lib/core/directshow/dsfOggDemux
src/lib/core/ogg/libOOOggSeek src/lib/helper
src/lib/helper/iDSHelper src/lib/helper/libilliCore
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Thu Sep 9 05:27:58 PDT 2004
Author: illiminable
Date: 2004-09-09 05:27:58 -0700 (Thu, 09 Sep 2004)
New Revision: 7719
Added:
trunk/oggdsf/src/lib/helper/iDSHelper/
trunk/oggdsf/src/lib/helper/iDSHelper/DSStringer.cpp
trunk/oggdsf/src/lib/helper/iDSHelper/DSStringer.h
trunk/oggdsf/src/lib/helper/iDSHelper/ReadMe.txt
trunk/oggdsf/src/lib/helper/iDSHelper/iDSHelper.cpp
trunk/oggdsf/src/lib/helper/iDSHelper/iDSHelper.h
trunk/oggdsf/src/lib/helper/iDSHelper/iDSHelper.vcproj
trunk/oggdsf/src/lib/helper/iDSHelper/stdafx.cpp
trunk/oggdsf/src/lib/helper/iDSHelper/stdafx.h
Modified:
trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
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/filters/dsfTheoraDecoder/TheoraDecodeInputPin.cpp
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h
trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/dsfTheoraDecoder.vcproj
trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeFilter.h
trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeInputPin.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeInputPin.h
trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.h
trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoEncoder/AbstractVideoEncodeFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoEncoder/AbstractVideoEncodeFilter.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp
trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.cpp
trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.h
Log:
* Fixed huge memory leak in seek table builder.
* Lots of random debugging/hacking at the theora filter... looks like it's behond hope getting it to work with WMP9 or 10... time for a rewrite with a new plan.
* Added the start of a directshow helper library.
Modified: trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
===================================================================
--- trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-09-09 12:27:58 UTC (rev 7719)
@@ -69,6 +69,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_32EEF62464D24782B1B22FAA00E41E05"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -87,462 +93,474 @@
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
+ "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
+ "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
+ "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_578B89273D59478F861AA5BC3600D074"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_58F56CD02F64413B9459F3E151760A57"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_65015192414F476999A68339F89BEA57"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_65EFE52655DF4119A626446C8F593760"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_695A6D70DADB417491C0662D82245C2B"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_72A8CAFC6236498AA2DE5E1CBCAFC91B"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_81A3CDB604B64763884C387192BE6771"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
+ "OwnerKey" = "8:_32EEF62464D24782B1B22FAA00E41E05"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_B721259605524EFE965E8E131C1558D5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_83AF8D74700947168B69E69E5160F082"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_72A8CAFC6236498AA2DE5E1CBCAFC91B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_695A6D70DADB417491C0662D82245C2B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_65EFE52655DF4119A626446C8F593760"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_24A1793CB89A464FB683A8A3BDA774DB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_45085E80018147DC8FFEFF749ADD5C47"
+ "MsmKey" = "8:_82879CB7596040EAA4BEEED443CC323B"
"OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
- "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
- "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
+ "MsmKey" = "8:_83AF8D74700947168B69E69E5160F082"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
+ "MsmKey" = "8:_8976C400668B453CB941859C4F3C6E27"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
- "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_578B89273D59478F861AA5BC3600D074"
+ "MsmKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_58F56CD02F64413B9459F3E151760A57"
+ "MsmKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
+ "MsmKey" = "8:_8FDBDF6B593E4A31BDEECAA245B32EB0"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65015192414F476999A68339F89BEA57"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
+ "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65EFE52655DF4119A626446C8F593760"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
+ "OwnerKey" = "8:_32EEF62464D24782B1B22FAA00E41E05"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_695A6D70DADB417491C0662D82245C2B"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
- "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_B721259605524EFE965E8E131C1558D5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_72A8CAFC6236498AA2DE5E1CBCAFC91B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_695A6D70DADB417491C0662D82245C2B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_65EFE52655DF4119A626446C8F593760"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_6975AB52223F47EF969EAE4ACA799ACE"
+ "MsmKey" = "8:_9B429C9681E74D738DF0C5E07FA6F6C2"
"OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_72A8CAFC6236498AA2DE5E1CBCAFC91B"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_81A3CDB604B64763884C387192BE6771"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_83AF8D74700947168B69E69E5160F082"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_8976C400668B453CB941859C4F3C6E27"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_8FDBDF6B593E4A31BDEECAA245B32EB0"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -2532,7 +2550,7 @@
}
"MergeModule"
{
- "{35A69C6E-5BA4-440D-803D-762B59A45393}:_45085E80018147DC8FFEFF749ADD5C47"
+ "{35A69C6E-5BA4-440D-803D-762B59A45393}:_82879CB7596040EAA4BEEED443CC323B"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
@@ -2546,7 +2564,7 @@
"Feature" = "8:"
"IsolateTo" = "8:"
}
- "{35A69C6E-5BA4-440D-803D-762B59A45393}:_6975AB52223F47EF969EAE4ACA799ACE"
+ "{35A69C6E-5BA4-440D-803D-762B59A45393}:_9B429C9681E74D738DF0C5E07FA6F6C2"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
@@ -2731,6 +2749,34 @@
{
}
}
+ "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_32EEF62464D24782B1B22FAA00E41E05"
+ {
+ "SourcePath" = "8:..\\..\\src\\lib\\helper\\idshelper\\release\\iDSHelper.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:1"
+ "OutputConfiguration" = "8:"
+ "OutputGroupCanonicalName" = "8:Built"
+ "OutputProjectGuid" = "8:{053D669F-E874-44C6-9705-8A1DEF40C4E9}"
+ "ShowKeyOutput" = "11:TRUE"
+ "ExcludeFilters"
+ {
+ }
+ }
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_3C7C3E6B832E481C8A36701A33FF3721"
{
"SourcePath" = "8:..\\..\\src\\tools\\OOOggStat\\Release\\OOOggStat.exe"
Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln 2004-09-09 12:27:58 UTC (rev 7719)
@@ -152,6 +152,7 @@
{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487} = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+ {053D669F-E874-44C6-9705-8A1DEF40C4E9} = {053D669F-E874-44C6-9705-8A1DEF40C4E9}
{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
EndProjectSection
EndProject
@@ -1121,6 +1122,11 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iDSHelper", "..\..\src\lib\helper\iDSHelper\iDSHelper.vcproj", "{053D669F-E874-44C6-9705-8A1DEF40C4E9}"
+ ProjectSection(ProjectDependencies) = postProject
+ {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@@ -2024,6 +2030,22 @@
{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Release_SSE.Build.0 = Release_SSE|Win32
{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Release_SSE2.ActiveCfg = Release_SSE2|Win32
{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Release_SSE2.Build.0 = Release_SSE2|Win32
+ {053D669F-E874-44C6-9705-8A1DEF40C4E9}.Debug.ActiveCfg = Debug|Win32
+ {053D669F-E874-44C6-9705-8A1DEF40C4E9}.Debug.Build.0 = Debug|Win32
+ {053D669F-E874-44C6-9705-8A1DEF40C4E9}.Debug Unicode.ActiveCfg = Debug|Win32
+ {053D669F-E874-44C6-9705-8A1DEF40C4E9}.Debug Unicode.Build.0 = Debug|Win32
+ {053D669F-E874-44C6-9705-8A1DEF40C4E9}.MakeFile.ActiveCfg = Release|Win32
+ {053D669F-E874-44C6-9705-8A1DEF40C4E9}.MakeFile.Build.0 = Release|Win32
+ {053D669F-E874-44C6-9705-8A1DEF40C4E9}.Release.ActiveCfg = Release|Win32
+ {053D669F-E874-44C6-9705-8A1DEF40C4E9}.Release.Build.0 = Release|Win32
+ {053D669F-E874-44C6-9705-8A1DEF40C4E9}.Release Unicode.ActiveCfg = Release|Win32
+ {053D669F-E874-44C6-9705-8A1DEF40C4E9}.Release Unicode.Build.0 = Release|Win32
+ {053D669F-E874-44C6-9705-8A1DEF40C4E9}.Release_NoDotNET.ActiveCfg = Release|Win32
+ {053D669F-E874-44C6-9705-8A1DEF40C4E9}.Release_NoDotNET.Build.0 = Release|Win32
+ {053D669F-E874-44C6-9705-8A1DEF40C4E9}.Release_SSE.ActiveCfg = Release|Win32
+ {053D669F-E874-44C6-9705-8A1DEF40C4E9}.Release_SSE.Build.0 = Release|Win32
+ {053D669F-E874-44C6-9705-8A1DEF40C4E9}.Release_SSE2.ActiveCfg = Release|Win32
+ {053D669F-E874-44C6-9705-8A1DEF40C4E9}.Release_SSE2.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionItems) = postSolution
EndGlobalSection
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp 2004-09-09 12:27:58 UTC (rev 7719)
@@ -91,8 +91,17 @@
return pNewObject;
}
+STDMETHODIMP TheoraDecodeFilter::GetState(DWORD dw, FILTER_STATE *pState)
+{
+ CheckPointer(pState, E_POINTER);
+ *pState = m_State;
+ if (m_State == State_Paused) {
+ return VFW_S_CANT_CUE;
+ } else {
+ return S_OK;
+ }
+}
-
//QUERY::: Do we need these ? Aren't we all friedns here ??
//RESULT::: Keep them, set function must be kept... get could go... but keep for consistency
sTheoraFormatBlock* TheoraDecodeFilter::getTheoraFormatBlock()
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.h 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.h 2004-09-09 12:27:58 UTC (rev 7719)
@@ -60,8 +60,10 @@
//COM Creator Function
static CUnknown* WINAPI CreateInstance(LPUNKNOWN pUnk, HRESULT *pHr);
+ //IMediaFilter OVerride - This lets us tell the graph we may not produce data in pause state so don't block.
+ virtual STDMETHODIMP GetState(DWORD dw, FILTER_STATE *pState);
+
-
//VIRTUAL FUNCTIONS - AbstractAudioDecodeFilter
virtual bool ConstructPins();
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.cpp 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.cpp 2004-09-09 12:27:58 UTC (rev 7719)
@@ -39,6 +39,7 @@
, mYOffset(0)
{
+ debugLog.open("G:\\logs\\theoInputPin.log", ios_base::out);
ConstructCodec();
}
@@ -64,6 +65,7 @@
}
TheoraDecodeInputPin::~TheoraDecodeInputPin(void)
{
+ debugLog.close();
DestroyCodec();
}
@@ -73,11 +75,9 @@
int TheoraDecodeInputPin::TheoraDecoded (yuv_buffer* inYUVBuffer)
{
DbgLog((LOG_TRACE,1,TEXT("Decoded... Sending...")));
- ////Do we need to delete the pcm structure ????
- ////More of this can go to the abstract class.
-
- ////For convenience we do all these cast once and for all here.
+ debugLog<<"TheoraDecoded... "<<endl;
+
TheoraDecodeFilter* locFilter = reinterpret_cast<TheoraDecodeFilter*>(m_pFilter);
//
if (!mBegun) {
@@ -129,15 +129,74 @@
DbgLog((LOG_TRACE,1,TEXT("Frame Runs From %d"), locFrameStart));
DbgLog((LOG_TRACE,1,TEXT("Frame Runs To %d"), locFrameEnd));
- IMediaSample* locSample;
- HRESULT locHR = mOutputPin->GetDeliveryBuffer(&locSample, &locFrameStart, &locFrameEnd, NULL);
-
+ IMediaSample* locSample = NULL;
+ debugLog<<"Sample times = "<<locFrameStart<<" to "<<locFrameEnd<<endl;
+ DWORD locFlags = 0;//AM_GBF_PREVFRAMESKIPPED | AM_GBF_NOTASYNCPOINT;
+
+ FILTER_STATE locFS;
+ mParentFilter->GetState(0, &locFS);
+ debugLog<<"State Before = "<<locFS<<endl;
+ HRESULT locHR = mOutputPin->GetDeliveryBuffer(&locSample, &locFrameStart, &locFrameEnd, locFlags);
+ mParentFilter->GetState(0, &locFS);
+ debugLog<<"State After = "<<locFS<<endl;
if (locHR != S_OK) {
+ debugLog<<"Get DeliveryBuffer FAILED with "<<locHR<<endl;
+ debugLog<<"locSample is "<<(unsigned long)locSample<<endl;
//We get here when the application goes into stop mode usually.
+
+ switch (locHR) {
+ case VFW_E_SIZENOTSET:
+ debugLog<<"SIZE NOT SET"<<endl;
+ break;
+ case VFW_E_NOT_COMMITTED:
+ debugLog<<"NOT COMMITTED"<<endl;
+ break;
+ case VFW_E_TIMEOUT:
+ debugLog<<"TIMEOUT"<<endl;
+ break;
+ case VFW_E_STATE_CHANGED:
+ debugLog<<"STATE CHANGED"<<endl;
+ return S_OK;
+ default:
+ debugLog<<"SOMETHING ELSE !!!"<<endl;
+ break;
+ }
return locHR;
}
+ debugLog<<"GetDeliveryBuffer &** SUCCEEDED **"<<endl;
+ //Debuggin code
+ AM_MEDIA_TYPE* locMediaType = NULL;
+ locSample->GetMediaType(&locMediaType);
+ if (locMediaType == NULL) {
+ debugLog<<"No dynamic change..."<<endl;
+ } else {
+ debugLog<<"Attempting dynamic change..."<<endl;
+ if (locMediaType->majortype == MEDIATYPE_Video) {
+ debugLog<<"Still MEDIATYPE_Video"<<endl;
+ }
+
+ if (locMediaType->subtype == MEDIASUBTYPE_YV12) {
+ debugLog<<"Still MEDIASUBTYPE_YV12"<<endl;
+ }
+
+ if (locMediaType->formattype == FORMAT_VideoInfo) {
+ debugLog<<"Still FORMAT_VideoInfo"<<endl;
+ VIDEOINFOHEADER* locVF = (VIDEOINFOHEADER*)locMediaType->pbFormat;
+ debugLog<<"Size = "<<locVF->bmiHeader.biSizeImage<<endl;
+ debugLog<<"Dim = "<<locVF->bmiHeader.biWidth<<" x " <<locVF->bmiHeader.biHeight<<endl;
+ }
+
+ debugLog<<"Major : "<<DSStringer::GUID2String(&locMediaType->majortype);
+ debugLog<<"Minor : "<<DSStringer::GUID2String(&locMediaType->subtype);
+ debugLog<<"Format : "<<DSStringer::GUID2String(&locMediaType->formattype);
+ debugLog<<"Form Sz: "<<locMediaType->cbFormat;
+
+
+ }
+ //
+
////Create pointers for the samples buffer to be assigned to
BYTE* locBuffer = NULL;
@@ -288,6 +347,7 @@
//locSample->AddRef();
HRESULT locHR = mOutputPin->mDataQueue->Receive(locSample); //->DownstreamFilter()->Receive(locSample);
if (locHR != S_OK) {
+ debugLog<<"Data Q rejects sample... with "<<locHR<<endl;
return -1;
}
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeInputPin.h 2004-09-09 12:27:58 UTC (rev 7719)
@@ -36,8 +36,11 @@
//#include "TheoraDecodeInputPin.h"
//#include "TheoraDecodeFilter.h"
+#include "DSStringer.h"
#include "TheoraDecoder.h"
#include <math.h>
+#include <fstream>
+using namespace std;
class TheoraDecodeOutputPin;
@@ -63,7 +66,7 @@
long decodeData(BYTE* inBuf, long inNumBytes, LONGLONG inStart, LONGLONG inEnd) ;
protected:
-
+ fstream debugLog;
//FishSound* mFishSound;
//FishSoundInfo mFishInfo;
TheoraDecoder* mTheoraDecoder;
Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/dsfTheoraDecoder.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/dsfTheoraDecoder.vcproj 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/dsfTheoraDecoder.vcproj 2004-09-09 12:27:58 UTC (rev 7719)
@@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper\libilliCore;..\..\..\..\helper\iDSHelper"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFTHEORADECODER_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -80,7 +80,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper\libilliCore;..\..\..\..\helper\iDSHelper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFTHEORADECODER_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -143,7 +143,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper\libilliCore;..\..\..\..\helper\iDSHelper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFTHEORADECODER_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -207,7 +207,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
OptimizeForProcessor="3"
- AdditionalIncludeDirectories="..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper\libilliCore"
+ AdditionalIncludeDirectories="..\..\..\..\core\directshow\dsfAbstractVideoDecoder;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\libs\libOOTheora;..\..\libs\libtheora\include;..\..\..\..\core\ogg\libOOOgg;..\..\..\..\core\ogg\libogg\include;..\..\..\..\core\directshow\dsfSeeking;..\..\..\..\helper\libilliCore;..\..\..\..\helper\iDSHelper"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFTHEORADECODER_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeFilter.cpp 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeFilter.cpp 2004-09-09 12:27:58 UTC (rev 7719)
@@ -36,13 +36,14 @@
: CBaseFilter(inFilterName, NULL,m_pLock, inFilterGUID),
mVideoFormat(inVideoFormat)
{
-
+ debugLog.open("G:\\logs\\avdFitler.log", ios_base::out);
m_pLock = new CCritSec;
}
AbstractVideoDecodeFilter::~AbstractVideoDecodeFilter(void)
{
+ debugLog.close();
delete m_pLock;
DestroyPins();
}
@@ -53,6 +54,7 @@
}
STDMETHODIMP AbstractVideoDecodeFilter::NonDelegatingQueryInterface(REFIID riid, void **ppv) {
+
return CBaseFilter::NonDelegatingQueryInterface(riid, ppv);
}
@@ -69,9 +71,22 @@
STDMETHODIMP AbstractVideoDecodeFilter::Stop() {
CAutoLock locLock(m_pLock);
+ debugLog<<"**** STOP ****"<<endl;
mInputPin->ResetFrameCount();
return CBaseFilter::Stop();
}
+
+STDMETHODIMP AbstractVideoDecodeFilter::Pause() {
+ CAutoLock locLock(m_pLock);
+ debugLog<<"**** PAUSE ****"<<endl;
+ return CBaseFilter::Pause();
+}
+
+STDMETHODIMP AbstractVideoDecodeFilter::Run(REFERENCE_TIME tStart) {
+ CAutoLock locLock(m_pLock);
+ debugLog<<"**** RUN ****"<<endl;
+ return CBaseFilter::Run(tStart);
+}
int AbstractVideoDecodeFilter::GetPinCount(void) {
//TO DO::: Move this somewhere better
const long NUM_PINS = 2;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeFilter.h 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeFilter.h 2004-09-09 12:27:58 UTC (rev 7719)
@@ -34,6 +34,10 @@
#include "abstractvideodllstuff.h"
#include "BasicSeekable.h"
+#include <fstream>
+
+using namespace std;
+
class AbstractVideoDecodeInputPin;
class AbstractVideoDecodeOutputPin;
@@ -66,11 +70,16 @@
int GetPinCount(void);
virtual STDMETHODIMP Stop();
+ virtual STDMETHODIMP Pause();
+ virtual STDMETHODIMP Run(REFERENCE_TIME tStart);
+
unsigned short mVideoFormat;
protected:
+ fstream debugLog;
+
AbstractVideoDecodeInputPin* mInputPin;
AbstractVideoDecodeOutputPin* mOutputPin;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeInputPin.cpp 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeInputPin.cpp 2004-09-09 12:27:58 UTC (rev 7719)
@@ -50,25 +50,29 @@
, mSeekTimeBase(0)
{
+ debugLog.open("G:\\logs\\avdInputPin.log", ios_base::out);
//ConstructCodec();
mStreamLock = new CCritSec;
mAcceptableMediaType = inAcceptMediaType;
- IMediaSeeking* locSeeker = NULL;
- this->NonDelegatingQueryInterface(IID_IMediaSeeking, (void**)&locSeeker);
- mOutputPin->SetDelegate(locSeeker);
+ //IMediaSeeking* locSeeker = NULL;
+ //this->NonDelegatingQueryInterface(IID_IMediaSeeking, (void**)&locSeeker);
+ //mOutputPin->SetDelegate(locSeeker);
}
AbstractVideoDecodeInputPin::~AbstractVideoDecodeInputPin(void)
{
+ debugLog.close();
//DestroyCodec();
delete mStreamLock;
}
STDMETHODIMP AbstractVideoDecodeInputPin::NonDelegatingQueryInterface(REFIID riid, void **ppv) {
+ debugLog<<"Query Interface"<<endl;
if (riid == IID_IMediaSeeking) {
*ppv = (IMediaSeeking*)this;
((IUnknown*)*ppv)->AddRef();
+ debugLog<<"Queried for IMediaSeeking"<<endl;
return NOERROR;
}
@@ -100,22 +104,24 @@
outMediaSample->SetActualDataLength(inDataSize);
outMediaSample->SetPreroll(FALSE);
outMediaSample->SetDiscontinuity(FALSE);
- outMediaSample->SetSyncPoint(TRUE);
+ outMediaSample->SetSyncPoint(FALSE);
return true;
}
STDMETHODIMP AbstractVideoDecodeInputPin::Receive(IMediaSample* inSample) {
CAutoLock locLock(mStreamLock);
+ debugLog<<"Receive "<<endl;
HRESULT locHR;
BYTE* locBuff = NULL;
locHR = inSample->GetPointer(&locBuff);
if (FAILED(locHR)) {
-
+ debugLog<<"Receive : Get pointer failed..."<<locHR<<endl;
return locHR;
} else {
+ debugLog<<"Receive : Get pointer succeeds..."<<endl;
//New start time hacks
REFERENCE_TIME locStart = 0;
REFERENCE_TIME locEnd = 0;
@@ -140,6 +146,11 @@
AM_MEDIA_TYPE* locMediaType = NULL;
inSample->GetMediaType(&locMediaType);
+ if (locMediaType == NULL) {
+ debugLog<<"No dynamic change..."<<endl;
+ } else {
+ debugLog<<"Attempting dynamic change..."<<endl;
+ }
//if (locMediaType != NULL) {
//VIDEOINFOHEADER* locVideoHeader = (VIDEOINFOHEADER*)locMediaType->pbFormat;
@@ -150,8 +161,10 @@
long locResult = decodeData(locBuff, inSample->GetActualDataLength(), locStart, locEnd);
if (locResult == 0) {
+ debugLog<<"Receive : Decode OK"<<endl;
return S_OK;
} else {
+ debugLog<<"Receive : Decode OK"<<endl;
return S_FALSE;
}
}
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeInputPin.h 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeInputPin.h 2004-09-09 12:27:58 UTC (rev 7719)
@@ -75,6 +75,7 @@
virtual bool SetSampleParams(IMediaSample* outMediaSample, unsigned long inDataSize, REFERENCE_TIME* inStartTime, REFERENCE_TIME* inEndTime);
+ fstream debugLog;
HRESULT mHR;
bool mBegun;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.cpp 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.cpp 2004-09-09 12:27:58 UTC (rev 7719)
@@ -37,16 +37,18 @@
mParentFilter(inParentFilter)
, mDataQueue(NULL)
{
- //debugLog.open("g:\\logs\\absvidlog.log", ios_base::out|ios_base::binary);
+ debugLog.open("g:\\logs\\absvidlog.log", ios_base::out|ios_base::binary);
}
AbstractVideoDecodeOutputPin::~AbstractVideoDecodeOutputPin(void)
{
- //debugLog.close();
+ debugLog.close();
delete mDataQueue;
+ mDataQueue = NULL;
}
STDMETHODIMP AbstractVideoDecodeOutputPin::NonDelegatingQueryInterface(REFIID riid, void **ppv) {
+ debugLog<<"QueryInterface : {"<<riid.Data1<<"-"<<riid.Data2<<"-"<<riid.Data3<<"-"<<riid.Data4<<"}"<<endl;
if (riid == IID_IMediaSeeking) {
*ppv = (IMediaSeeking*)this;
((IUnknown*)*ppv)->AddRef();
@@ -56,8 +58,9 @@
return CBaseOutputPin::NonDelegatingQueryInterface(riid, ppv);
}
HRESULT AbstractVideoDecodeOutputPin::DecideBufferSize(IMemAllocator* inAllocator, ALLOCATOR_PROPERTIES* inPropertyRequest) {
-
//FIX::: Abstract this out properly
+
debugLog<<endl;
debugLog<<"DecideBufferSize :"<<endl;
//FIX::: Abstract this out properly
+ debugLog<<"Allocator is "<<(unsigned long)inAllocator<<endl;
//Our error variable
HRESULT locHR = S_OK;
@@ -65,6 +68,13 @@
ALLOCATOR_PROPERTIES locReqAlloc;
ALLOCATOR_PROPERTIES locActualAlloc;
+ debugLog<<"DecideBufferSize : Requested :"<<endl;
+ debugLog<<"DecideBufferSize : Align : "<<inPropertyRequest->cbAlign<<endl;
+ debugLog<<"DecideBufferSize : BuffSize : "<<inPropertyRequest->cbBuffer<<endl;
+ debugLog<<"DecideBufferSize : Prefix : "<<inPropertyRequest->cbPrefix<<endl;
+ debugLog<<"DecideBufferSize : NumBuffs : "<<inPropertyRequest->cBuffers<<endl;
+
+
const unsigned long MIN_BUFFER_SIZE = 16*16; //What should this be ????
const unsigned long DEFAULT_BUFFER_SIZE = 1024*1024;
const unsigned long MIN_NUM_BUFFERS = 1;
@@ -101,28 +111,50 @@
locReqAlloc.cBuffers = inPropertyRequest->cBuffers;
}
+ debugLog<<"DecideBufferSize : Modified Request :"<<endl;
+ debugLog<<"DecideBufferSize : Align : "<<locReqAlloc.cbAlign<<endl;
+ debugLog<<"DecideBufferSize : BuffSize : "<<locReqAlloc.cbBuffer<<endl;
+ debugLog<<"DecideBufferSize : Prefix : "<<locReqAlloc.cbPrefix<<endl;
+ debugLog<<"DecideBufferSize : NumBuffs : "<<locReqAlloc.cBuffers<<endl;
+
+
//Set the properties in the allocator
locHR = inAllocator->SetProperties(&locReqAlloc, &locActualAlloc);
+ debugLog<<"DecideBufferSize : SetProperties returns "<<locHR<<endl;
+ debugLog<<"DecideBufferSize : Actual Params :"<<endl;
+ debugLog<<"DecideBufferSize : Align : "<<locActualAlloc.cbAlign<<endl;
+ debugLog<<"DecideBufferSize : BuffSize : "<<locActualAlloc.cbBuffer<<endl;
+ debugLog<<"DecideBufferSize : Prefix : "<<locActualAlloc.cbPrefix<<endl;
+ debugLog<<"DecideBufferSize : NumBuffs : "<<locActualAlloc.cBuffers<<endl;
+
//Check the response
switch (locHR) {
case E_POINTER:
+ debugLog<<"DecideBufferSize : SetProperties - NULL POINTER"<<endl;
return locHR;
case VFW_E_ALREADY_COMMITTED:
+ debugLog<<"DecideBufferSize : SetProperties - Already COMMITED"<<endl;
return locHR;
case VFW_E_BADALIGN:
+ debugLog<<"DecideBufferSize : SetProperties - Bad ALIGN"<<endl;
return locHR;
case VFW_E_BUFFERS_OUTSTANDING:
+ debugLog<<"DecideBufferSize : SetProperties - BUFFS OUTSTANDING"<<endl;
return locHR;
case S_OK:
break;
+ default:
+ debugLog<<"DecideBufferSize : SetProperties - UNKNOWN ERROR"<<endl;
+ break;
+
}
@@ -130,19 +162,27 @@
//RESOLVED ::: Yep !
locHR = inAllocator->Commit();
+ debugLog<<"DecideBufferSize : Commit Returned "<<locHR<<endl;
+
switch (locHR) {
case E_FAIL:
+ debugLog<<"DecideBufferSize : Commit - FAILED "<<endl;
return locHR;
case E_POINTER:
+ debugLog<<"DecideBufferSize : Commit - NULL POINTER "<<endl;
return locHR;
case E_INVALIDARG:
+ debugLog<<"DecideBufferSize : Commit - INVALID ARG "<<endl;
return locHR;
case E_NOTIMPL:
+ debugLog<<"DecideBufferSize : Commit - NOT IMPL"<<endl;
return locHR;
case S_OK:
+ debugLog<<"DecideBufferSize : Commit - ** SUCCESS **"<<endl;
break;
default:
+ debugLog<<"DecideBufferSize : Commit - UNKNOWN ERROR "<<endl;
return locHR;
}
@@ -150,6 +190,7 @@
return S_OK;
}
HRESULT AbstractVideoDecodeOutputPin::CheckMediaType(const CMediaType *inMediaType) {
+ debugLog<<"CheckMediaType : "<<endl;
if ((inMediaType->majortype == MEDIATYPE_Video) && (inMediaType->subtype == MEDIASUBTYPE_YV12) && (inMediaType->formattype == FORMAT_VideoInfo)) {
//FIX::: SHould this stuff be in a check routine ??? Shouldn't it be in set mediatype ?
@@ -157,18 +198,20 @@
//debugLog << "CheckMediaType : Accepting..."<<endl;
VIDEOINFOHEADER* locVideoHeader = (VIDEOINFOHEADER*)inMediaType->Format();
- //debugLog << "CheckMediaType : Height = " << locVideoHeader->bmiHeader.biHeight<<endl;
- //debugLog << "CheckMediaType : Width = " << locVideoHeader->bmiHeader.biWidth<<endl<<endl;
-
- //debugLog << "CheckMediaType : mHeight was = " << mParentFilter->mInputPin->mHeight<<endl;
- //debugLog << "CheckMediaType : mWidth was = " << mParentFilter->mInputPin->mWidth<<endl<<endl;
+ debugLog << "CheckMediaType : Height = " << locVideoHeader->bmiHeader.biHeight<<endl;
+ debugLog << "CheckMediaType : Width = " << locVideoHeader->bmiHeader.biWidth<<endl;
+ debugLog << "CheckMediaType : Size = "<<locVideoHeader->bmiHeader.biSizeImage<<endl<<endl;
+ debugLog << "CheckMediaType : mHeight was = " << mParentFilter->mInputPin->mHeight<<endl;
+ debugLog << "CheckMediaType : mWidth was = " << mParentFilter->mInputPin->mWidth<<endl<<endl;
+ debugLog<<"CheckMediaType : Size was = "<<mParentFilter->mInputPin->mFrameSize<<endl<<endl;
mParentFilter->mInputPin->mHeight = (unsigned long)abs(locVideoHeader->bmiHeader.biHeight);
mParentFilter->mInputPin->mWidth = (unsigned long)abs(locVideoHeader->bmiHeader.biWidth);
-
-
-
+ mParentFilter->mInputPin->mFrameSize = (unsigned long)locVideoHeader->bmiHeader.biSizeImage;
+ debugLog<<"CheckMediaType : SUCCESS"<<endl;
+
return S_OK;
} else {
+ debugLog<<"CheckMediaType : FAILURE"<<endl;
return S_FALSE;
}
@@ -179,11 +222,11 @@
outMediaType->SetSubtype(&MEDIASUBTYPE_YV12);
outMediaType->SetFormatType(&FORMAT_VideoInfo);
outMediaType->SetTemporalCompression(FALSE);
- outMediaType->SetSampleSize(0);
+ outMediaType->SetSampleSize(0);
}
HRESULT AbstractVideoDecodeOutputPin::GetMediaType(int inPosition, CMediaType *outMediaType) {
-
+
if (inPosition < 0) {
return E_INVALIDARG;
}
@@ -192,6 +235,10 @@
FillMediaType(outMediaType);
VIDEOINFOHEADER* locVideoFormat = (VIDEOINFOHEADER*)outMediaType->AllocFormatBuffer(sizeof(VIDEOINFOHEADER));
FillVideoInfoHeader(locVideoFormat);
+
+ debugLog<<"Vid format size "<<locVideoFormat->bmiHeader.biSizeImage<<endl;
+ outMediaType->SetSampleSize(locVideoFormat->bmiHeader.biSizeImage);
+ debugLog<<"Returning from GetMediaType"<<endl;
return S_OK;
} else {
return VFW_S_NO_MORE_ITEMS;
@@ -203,7 +250,7 @@
HRESULT AbstractVideoDecodeOutputPin::DeliverNewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate)
{
//mPartialPacket = NULL;
- //debugLog << "DeliverNewSegment: start"<<endl;
+ debugLog << "DeliverNewSegment: start"<<endl;
CBasePin::NewSegment(tStart, tStop, dRate);
mDataQueue->NewSegment(tStart, tStop, dRate);
//debugLog << "DeliverNewSegment: end"<<endl;
@@ -212,7 +259,7 @@
}
HRESULT AbstractVideoDecodeOutputPin::DeliverEndOfStream(void)
{
- //debugLog << "DeliverEndOfStream: executed" << endl;
+ debugLog << "DeliverEndOfStream: executed" << endl;
//mPartialPacket = NULL;
mDataQueue->EOS();
return S_OK;
@@ -220,7 +267,7 @@
HRESULT AbstractVideoDecodeOutputPin::DeliverEndFlush(void)
{
- //debugLog << "DeliverEndFlush" << endl;
+ debugLog << "DeliverEndFlush" << endl;
mDataQueue->EndFlush();
return S_OK;
}
@@ -228,20 +275,56 @@
HRESULT AbstractVideoDecodeOutputPin::DeliverBeginFlush(void)
{
//mPartialPacket = NULL;
- //debugLog << "DeliverBeginFlush"<<endl;
+ debugLog << "DeliverBeginFlush"<<endl;
mDataQueue->BeginFlush();
return S_OK;
}
HRESULT AbstractVideoDecodeOutputPin::CompleteConnect (IPin *inReceivePin)
{
+ debugLog<<"ComlpeteConnect"<<endl;
HRESULT locHR = S_OK;
+
+ //Here when another pin connects to us, we internally connect the seek delegate
+ // from this output pin onto the input pin... and we release it on breakconnect.
+ //
+ IMediaSeeking* locSeeker = NULL;
+ mParentFilter->mInputPin->NonDelegatingQueryInterface(IID_IMediaSeeking, (void**)&locSeeker);
+ SetDelegate(locSeeker);
+ //
//This may cause issue if pins are disconnected and reconnected
//DELETE in DEStructor
mDataQueue = new COutputQueue (inReceivePin, &locHR, FALSE, TRUE, 1, TRUE, 15);
if (FAILED(locHR)) {
+ debugLog<<"Creating Output Q failed."<<endl;
locHR = locHR;
}
return CBaseOutputPin::CompleteConnect(inReceivePin);
+}
+
+HRESULT AbstractVideoDecodeOutputPin::BreakConnect(void) {
+ debugLog<<"Break Connect"<<endl;
+ //CAutoLock locLock(mFilterLock);
+ HRESULT locHR = CBaseOutputPin::BreakConnect();
+ debugLog<<"Base BreakConnect returns "<<locHR<<endl;
+ ReleaseDelegate();
+ delete mDataQueue;
+ mDataQueue = NULL;
+ return locHR;
+}
+
+//Testing
+HRESULT AbstractVideoDecodeOutputPin::InitAllocator(IMemAllocator **ppAlloc) {
+ debugLog<<"InitAllocator Called"<<endl;
+ HRESULT locHR = CBaseOutputPin::InitAllocator(ppAlloc);
+ debugLog<<"Base InitAlloc returns "<<locHR<<endl;
+ return locHR;
+}
+
+HRESULT AbstractVideoDecodeOutputPin::SetMediaType(const CMediaType *pmt) {
+ debugLog<<"SETTING MEDIA TYPE"<<endl;
+ HRESULT locHR = CBaseOutputPin::SetMediaType(pmt);
+ debugLog<<"ase SetMedia Type returns "<<locHR<<endl;
+ return locHR;
}
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.h 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoDecoder/AbstractVideoDecodeOutputPin.h 2004-09-09 12:27:58 UTC (rev 7719)
@@ -56,8 +56,14 @@
virtual HRESULT GetMediaType(int inPosition, CMediaType *outMediaType);
+ //Testing.,..
+ virtual HRESULT InitAllocator(IMemAllocator **ppAlloc);
+ virtual HRESULT SetMediaType(const CMediaType *pmt);
+
+ virtual HRESULT BreakConnect(void);
//Virtuals for data queue
+
virtual HRESULT CompleteConnect (IPin *inReceivePin);
virtual HRESULT DeliverNewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate);
virtual HRESULT DeliverEndOfStream(void);
@@ -70,7 +76,7 @@
AbstractVideoDecodeFilter* mParentFilter;
void FillMediaType(CMediaType* inMediaType);
- //fstream debugLog;
+ fstream debugLog;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoEncoder/AbstractVideoEncodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoEncoder/AbstractVideoEncodeFilter.cpp 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoEncoder/AbstractVideoEncodeFilter.cpp 2004-09-09 12:27:58 UTC (rev 7719)
@@ -35,7 +35,7 @@
: CBaseFilter(inFilterName, NULL,m_pLock, inFilterGUID),
mVideoFormat(inVideoFormat)
{
-
+
m_pLock = new CCritSec;
}
@@ -71,6 +71,8 @@
mInputPin->ResetFrameCount();
return CBaseFilter::Stop();
}
+
+
int AbstractVideoEncodeFilter::GetPinCount(void) {
const long NUM_PINS = 2;
return NUM_PINS;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoEncoder/AbstractVideoEncodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoEncoder/AbstractVideoEncodeFilter.h 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractVideoEncoder/AbstractVideoEncodeFilter.h 2004-09-09 12:27:58 UTC (rev 7719)
@@ -65,6 +65,7 @@
virtual STDMETHODIMP Stop();
+
unsigned short mVideoFormat;
protected:
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp 2004-09-09 12:27:58 UTC (rev 7719)
@@ -87,6 +87,7 @@
((IUnknown*)*ppv)->AddRef();
return NOERROR;
} else if (riid == IID_IAMMediaContent) {
+ debugLog<<"Queries for IAMMediaContent///"<<endl;
*ppv = (IAMMediaContent*)this;
((IUnknown*)*ppv)->AddRef();
return NOERROR;
@@ -113,7 +114,7 @@
mDemuxLock = new CCritSec;
mStreamLock = new CCritSec;
mStreamMapper = new OggStreamMapper(this);
- //debugLog.open("g:\\logs\\sourcelog.log", ios_base::out);
+ debugLog.open("g:\\logs\\sourcelog.log", ios_base::out);
//debugLog << "**************** Starting LOg ********************"<<endl;
}
@@ -132,7 +133,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);
@@ -239,10 +240,10 @@
STDMETHODIMP OggDemuxSourceFilter::IsFormatSupported(const GUID *pFormat){
ASSERT(pFormat != NULL);
if (*pFormat == TIME_FORMAT_MEDIA_TIME) {
- //debugLog<<"IsFormatSupported : TRUE"<<endl;
+ debugLog<<"IsFormatSupported : TRUE"<<endl;
return S_OK;
} else {
- //debugLog<<"IsFormatSupported : FALSE !!!"<<endl;
+ debugLog<<"IsFormatSupported : FALSE !!!"<<endl;
return S_FALSE;
}
@@ -254,7 +255,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){
@@ -264,7 +265,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 {
@@ -273,21 +274,21 @@
}
STDMETHODIMP OggDemuxSourceFilter::GetCurrentPosition(LONGLONG *pCurrent){
- //debugLog <<"GetCurrPos = HARD CODED = 6 secs"<< endl;
+ debugLog <<"GetCurrPos = HARD CODED = 6 secs"<< endl;
*pCurrent = 6 * UNITS;
return S_OK;
}
STDMETHODIMP OggDemuxSourceFilter::ConvertTimeFormat(LONGLONG *pTarget, const GUID *pTargetFormat, LONGLONG Source, const GUID *pSourceFormat){
- //debugLog<<"ConvertTimeForamt : NOT IMPL"<<endl;
+ debugLog<<"ConvertTimeForamt : NOT IMPL"<<endl;
return E_NOTIMPL;
}
STDMETHODIMP OggDemuxSourceFilter::SetPositions(LONGLONG *pCurrent,DWORD dwCurrentFlags,LONGLONG *pStop,DWORD dwStopFlags){
CAutoLock locLock(m_pLock);
-
+ debugLog<<"Set Positions"<<endl;
if (mSeekTable->enabled()) {
- //debugLog<<"SetPos : Current = "<<*pCurrent<<" Flags = "<<dwCurrentFlags<<" Stop = "<<*pStop<<" dwStopFlags = "<<dwStopFlags<<endl;
+ debugLog<<"SetPos : Current = "<<*pCurrent<<" Flags = "<<dwCurrentFlags<<" Stop = "<<*pStop<<" dwStopFlags = "<<dwStopFlags<<endl;
//debugLog<<" : Delivering begin flush..."<<endl;
@@ -297,7 +298,7 @@
DeliverBeginFlush();
- //debugLog<<" : Begin flush Delviered."<<endl;
+ debugLog<<" : Begin flush Delviered."<<endl;
//Find the byte position for this time.
unsigned long locStartPos = mSeekTable->getStartPos(*pCurrent);
@@ -334,7 +335,7 @@
- //debugLog<<" : Seek complete."<<endl;
+ debugLog<<" : Seek complete."<<endl;
//debugLog<<" : Notifying whether to send excess... ";
if (locSendExcess) {
//debugLog<<"YES"<<endl;
@@ -367,7 +368,7 @@
return S_OK;
}
STDMETHODIMP OggDemuxSourceFilter::GetPositions(LONGLONG *pCurrent, LONGLONG *pStop){
- //debugLog<<"GetPos : Current = HARDCODED 2 secs , Stop = "<<mSeekTable->fileDuration()/UNITS <<" secs."<<endl;
+ debugLog<<"GetPos : Current = HARDCODED 2 secs , Stop = "<<mSeekTable->fileDuration()/UNITS <<" secs."<<endl;
*pCurrent = 2 * UNITS;
*pStop = mSeekTable->fileDuration();
return S_OK;
@@ -396,10 +397,10 @@
}
STDMETHODIMP OggDemuxSourceFilter::IsUsingTimeFormat(const GUID *pFormat){
if (*pFormat == TIME_FORMAT_MEDIA_TIME) {
- //debugLog<<"IsUsingTimeFormat : MEDIA TIME TRUE"<<endl;
+ debugLog<<"IsUsingTimeFormat : MEDIA TIME TRUE"<<endl;
return S_OK;
} else {
- //debugLog<<"IsUsingTimeFormat : MEDIA TIME FALSE !!!!"<<endl;
+ debugLog<<"IsUsingTimeFormat : MEDIA TIME FALSE !!!!"<<endl;
return S_FALSE;
}
@@ -498,9 +499,9 @@
void OggDemuxSourceFilter::DeliverBeginFlush() {
CAutoLock locLock(m_pLock);
-
- //debugLog << "Delivering Begin Flush"<<endl;
+
+ debugLog << "Delivering Begin Flush"<<endl;
for (unsigned long i = 0; i < mStreamMapper->numStreams(); i++) {
mStreamMapper->getOggStream(i)->getPin()->DeliverBeginFlush();
//mStreamMapper->getOggStream(i)->flush();
@@ -515,7 +516,7 @@
void OggDemuxSourceFilter::DeliverEndFlush() {
CAutoLock locLock(m_pLock);
- //debugLog << "Delivering End Flush"<<endl;
+ debugLog << "Delivering End Flush"<<endl;
for (unsigned long i = 0; i < mStreamMapper->numStreams(); i++) {
mStreamMapper->getOggStream(i)->flush();
mStreamMapper->getOggStream(i)->getPin()->DeliverEndFlush();
@@ -612,9 +613,8 @@
//Shuold we flush ehre ?
delete locBuff;
- //Memory leak
- //FIXED
+
//return value ??
return S_OK;
}
@@ -674,7 +674,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);
@@ -682,7 +682,7 @@
}
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;
if (ThreadExists() == FALSE) {
@@ -699,6 +699,7 @@
}
STDMETHODIMP OggDemuxSourceFilter::Stop(void) {
CAutoLock locLock(m_pLock);
+ debugLog<<"** Stop Called ** "<<endl;
CallWorker(THREAD_EXIT);
Close();
DeliverBeginFlush();
@@ -716,6 +717,7 @@
return E_NOTIMPL;
}
STDMETHODIMP OggDemuxSourceFilter::get_Title(BSTR* outTitle) {
+ debugLog<<"Try to get_Title"<<endl;
return E_NOTIMPL;
}
STDMETHODIMP OggDemuxSourceFilter::get_Rating(BSTR* outRating) {
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp 2004-09-09 12:27:58 UTC (rev 7719)
@@ -151,6 +151,10 @@
}
mFilePos += inOggPage->pageSize();
//stDebug<<"File Pos : "<<mFilePos<<endl;
+
+ //Memory leak ::: Need to delete the page.
+ delete inOggPage;
+
return true;
}
Added: trunk/oggdsf/src/lib/helper/iDSHelper/DSStringer.cpp
===================================================================
--- trunk/oggdsf/src/lib/helper/iDSHelper/DSStringer.cpp 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/helper/iDSHelper/DSStringer.cpp 2004-09-09 12:27:58 UTC (rev 7719)
@@ -0,0 +1,16 @@
+#include "StdAfx.h"
+#include ".\dsstringer.h"
+#include "StringHelper.h"
+string DSStringer::GUID2String(const GUID* inGUID) {
+ string retStr = "{" + StringHelper::numToString(inGUID->Data1) +
+ "-" + StringHelper::numToString(inGUID->Data2) +
+ "-" + StringHelper::numToString(inGUID->Data3) +
+ "-";
+
+ for (int i = 0; i < 8; i++) {
+ retStr += inGUID->Data4[i];
+ }
+ retStr += "}";
+ return retStr;
+
+}
\ No newline at end of file
Added: trunk/oggdsf/src/lib/helper/iDSHelper/DSStringer.h
===================================================================
--- trunk/oggdsf/src/lib/helper/iDSHelper/DSStringer.h 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/helper/iDSHelper/DSStringer.h 2004-09-09 12:27:58 UTC (rev 7719)
@@ -0,0 +1,12 @@
+#pragma once
+#include "iDSHelper.h"
+#include <string>
+
+using namespace std;
+
+class IDSHELPER_API DSStringer
+{
+public:
+
+ static string GUID2String(const GUID* inGUID);
+};
Added: trunk/oggdsf/src/lib/helper/iDSHelper/ReadMe.txt
===================================================================
--- trunk/oggdsf/src/lib/helper/iDSHelper/ReadMe.txt 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/helper/iDSHelper/ReadMe.txt 2004-09-09 12:27:58 UTC (rev 7719)
@@ -0,0 +1,32 @@
+========================================================================
+ DYNAMIC LINK LIBRARY : iDSHelper Project Overview
+========================================================================
+
+AppWizard has created this iDSHelper DLL for you.
+This file contains a summary of what you will find in each of the files that
+make up your iDSHelper application.
+
+
+iDSHelper.vcproj
+ This is the main project file for VC++ projects generated using an Application Wizard.
+ It contains information about the version of Visual C++ that generated the file, and
+ information about the platforms, configurations, and project features selected with the
+ Application Wizard.
+
+iDSHelper.cpp
+ This is the main DLL source file.
+
+/////////////////////////////////////////////////////////////////////////////
+Other standard files:
+
+StdAfx.h, StdAfx.cpp
+ These files are used to build a precompiled header (PCH) file
+ named iDSHelper.pch and a precompiled types file named StdAfx.obj.
+
+/////////////////////////////////////////////////////////////////////////////
+Other notes:
+
+AppWizard uses "TODO:" comments to indicate parts of the source code you
+should add to or customize.
+
+/////////////////////////////////////////////////////////////////////////////
Added: trunk/oggdsf/src/lib/helper/iDSHelper/iDSHelper.cpp
===================================================================
--- trunk/oggdsf/src/lib/helper/iDSHelper/iDSHelper.cpp 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/helper/iDSHelper/iDSHelper.cpp 2004-09-09 12:27:58 UTC (rev 7719)
@@ -0,0 +1,20 @@
+// iDSHelper.cpp : Defines the entry point for the DLL application.
+//
+
+#include "stdafx.h"
+#include "iDSHelper.h"
+BOOL APIENTRY DllMain( HANDLE hModule,
+ DWORD ul_reason_for_call,
+ LPVOID lpReserved
+ )
+{
+ switch (ul_reason_for_call)
+ {
+ case DLL_PROCESS_ATTACH:
+ case DLL_THREAD_ATTACH:
+ case DLL_THREAD_DETACH:
+ case DLL_PROCESS_DETACH:
+ break;
+ }
+ return TRUE;
+}
Added: trunk/oggdsf/src/lib/helper/iDSHelper/iDSHelper.h
===================================================================
--- trunk/oggdsf/src/lib/helper/iDSHelper/iDSHelper.h 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/helper/iDSHelper/iDSHelper.h 2004-09-09 12:27:58 UTC (rev 7719)
@@ -0,0 +1,12 @@
+// The following ifdef block is the standard way of creating macros which make exporting
+// from a DLL simpler. All files within this DLL are compiled with the IDSHELPER_EXPORTS
+// symbol defined on the command line. this symbol should not be defined on any project
+// that uses this DLL. This way any other project whose source files include this file see
+// IDSHELPER_API functions as being imported from a DLL, whereas this DLL sees symbols
+// defined with this macro as being exported.
+#ifdef IDSHELPER_EXPORTS
+#define IDSHELPER_API __declspec(dllexport)
+#else
+#define IDSHELPER_API __declspec(dllimport)
+#endif
+
Added: trunk/oggdsf/src/lib/helper/iDSHelper/iDSHelper.vcproj
===================================================================
--- trunk/oggdsf/src/lib/helper/iDSHelper/iDSHelper.vcproj 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/helper/iDSHelper/iDSHelper.vcproj 2004-09-09 12:27:58 UTC (rev 7719)
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="iDSHelper"
+ ProjectGUID="{053D669F-E874-44C6-9705-8A1DEF40C4E9}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="2"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\libilliCore"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IDSHELPER_EXPORTS"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="3"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="4"
+ CallingConvention="2"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/iDSHelper.dll"
+ LinkIncremental="2"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/iDSHelper.pdb"
+ SubSystem="2"
+ ImportLibrary="$(OutDir)/iDSHelper.lib"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="2"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\libilliCore"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IDSHELPER_EXPORTS"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="3"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"
+ CallingConvention="2"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/iDSHelper.dll"
+ LinkIncremental="1"
+ GenerateDebugInformation="TRUE"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary="$(OutDir)/iDSHelper.lib"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ <File
+ RelativePath=".\DSStringer.cpp">
+ </File>
+ <File
+ RelativePath=".\iDSHelper.cpp">
+ </File>
+ <File
+ RelativePath=".\stdafx.cpp">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"/>
+ </FileConfiguration>
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ <File
+ RelativePath=".\DSStringer.h">
+ </File>
+ <File
+ RelativePath=".\iDSHelper.h">
+ </File>
+ <File
+ RelativePath=".\stdafx.h">
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ </Filter>
+ <File
+ RelativePath=".\ReadMe.txt">
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Added: trunk/oggdsf/src/lib/helper/iDSHelper/stdafx.cpp
===================================================================
--- trunk/oggdsf/src/lib/helper/iDSHelper/stdafx.cpp 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/helper/iDSHelper/stdafx.cpp 2004-09-09 12:27:58 UTC (rev 7719)
@@ -0,0 +1,8 @@
+// stdafx.cpp : source file that includes just the standard includes
+// iDSHelper.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file
Added: trunk/oggdsf/src/lib/helper/iDSHelper/stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/helper/iDSHelper/stdafx.h 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/helper/iDSHelper/stdafx.h 2004-09-09 12:27:58 UTC (rev 7719)
@@ -0,0 +1,13 @@
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently, but
+// are changed infrequently
+//
+
+#pragma once
+
+
+#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+// Windows Header Files:
+#include <windows.h>
+
+// TODO: reference additional headers your program requires here
Modified: trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.cpp
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.cpp 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.cpp 2004-09-09 12:27:58 UTC (rev 7719)
@@ -119,6 +119,5 @@
retStr+= digitToHex(inChar % 16);
return retStr;
-
-
}
+
Modified: trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.h
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.h 2004-09-09 00:34:52 UTC (rev 7718)
+++ trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.h 2004-09-09 12:27:58 UTC (rev 7719)
@@ -51,4 +51,6 @@
static wstring StringHelper::toWStr(string inString);
static string StringHelper::toNarrowStr(wstring inString);
+ //static string numToHexString(unsigned __int64 inNum, unsigned char inWidth);
+
};
More information about the commits
mailing list