[xiph-commits] r11182 - in branches/oggdsf_ce_port:
build/oggcodecs_wm5 src/lib/codecs/speex/filters/dsfSpeexDecoder
src/lib/core/directshow/libDirectshowAbstracts
illiminable at svn.xiph.org
illiminable at svn.xiph.org
Thu Apr 20 09:02:53 PDT 2006
Author: illiminable
Date: 2006-04-20 09:02:40 -0700 (Thu, 20 Apr 2006)
New Revision: 11182
Modified:
branches/oggdsf_ce_port/build/oggcodecs_wm5/oggcodecs_wm5.vddproj
branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeFilter.cpp
branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeFilter.h
branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/speexdecoderdllstuff.cpp
branches/oggdsf_ce_port/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.cpp
branches/oggdsf_ce_port/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.h
Log:
* Few changes to speex filter so it can load on WM5
* Allowed decoders to queue output pcm again - was disabled in the past for some reason.
* Add speex decoder registry stuff
* Add speex decoder to the distribution package for wm5
Modified: branches/oggdsf_ce_port/build/oggcodecs_wm5/oggcodecs_wm5.vddproj
===================================================================
--- branches/oggdsf_ce_port/build/oggcodecs_wm5/oggcodecs_wm5.vddproj 2006-04-20 15:35:59 UTC (rev 11181)
+++ branches/oggdsf_ce_port/build/oggcodecs_wm5/oggcodecs_wm5.vddproj 2006-04-20 16:02:40 UTC (rev 11182)
@@ -44,6 +44,54 @@
}
"Entry"
{
+ "MsmKey" = "8:_78CB361988C2A119353CA3205DA869C2"
+ "OwnerKey" = "8:_07061F9B96124E73928A0D625D4EAC43"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_78CB361988C2A119353CA3205DA869C2"
+ "OwnerKey" = "8:_FC0F711C0A9A47699D526C0B5B30DF9E"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_78CB361988C2A119353CA3205DA869C2"
+ "OwnerKey" = "8:_BC04D4D4A1EE423EBFA34E91DF63319A"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_78CB361988C2A119353CA3205DA869C2"
+ "OwnerKey" = "8:_898F68EFD6EB479185D2277F89249261"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_78CB361988C2A119353CA3205DA869C2"
+ "OwnerKey" = "8:_7CC0F388C7734C2B8ECED59713F156C7"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_78CB361988C2A119353CA3205DA869C2"
+ "OwnerKey" = "8:_78B83888966E4D28897A832EC1CB59EB"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_78CB361988C2A119353CA3205DA869C2"
+ "OwnerKey" = "8:_4811BCC1ADF5454F89B779DF82058CA2"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_78CB361988C2A119353CA3205DA869C2"
+ "OwnerKey" = "8:_3C1ED3991BEE4DE79ABEF31F6AEBC705"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_7CC0F388C7734C2B8ECED59713F156C7"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -74,6 +122,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_EF0A11FDECB40AC0752058C4C404456C"
+ "OwnerKey" = "8:_3C1ED3991BEE4DE79ABEF31F6AEBC705"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_FC0F711C0A9A47699D526C0B5B30DF9E"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -152,6 +206,24 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{BA458234-9B71-4F46-8107-E91156377184}:_78CB361988C2A119353CA3205DA869C2"
+ {
+ "SourcePath" = "8:Microsoft_VC80_DebugCRT_x86.msm"
+ "TargetName" = "8:Microsoft_VC80_DebugCRT_x86.msm"
+ "Tag" = "8:"
+ "Folder" = "8:_4F94174C36AD4B1B8302678AD372CE00"
+ "Condition" = "8:"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "Register" = "3:0"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:TRUE"
+ "IsolateTo" = "8:"
+ }
"{BA458234-9B71-4F46-8107-E91156377184}:_99D03DD0E510464783D60DEE08696E18"
{
"SourcePath" = "8:V:\\Program Files\\Microsoft Visual Studio 8\\VC\\ce\\Dll\\armv4i\\msvcr80d.dll"
@@ -170,6 +242,24 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{BA458234-9B71-4F46-8107-E91156377184}:_EF0A11FDECB40AC0752058C4C404456C"
+ {
+ "SourcePath" = "8:WSOCK32.dll"
+ "TargetName" = "8:WSOCK32.dll"
+ "Tag" = "8:"
+ "Folder" = "8:_4F94174C36AD4B1B8302678AD372CE00"
+ "Condition" = "8:"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "Register" = "3:0"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:TRUE"
+ "IsolateTo" = "8:"
+ }
}
"Folder"
{
@@ -1339,6 +1429,105 @@
"Condition" = "8:"
"Keys"
{
+ "{B1EBC968-6B66-4532-A885-748B79AF4477}:_AD08E5173CCB435F9FDF71988D11FBFA"
+ {
+ "Name" = "8:Pins"
+ "Condition" = "8:"
+ "Keys"
+ {
+ "{B1EBC968-6B66-4532-A885-748B79AF4477}:_67C7390933284EC2ABDA9B9933862F70"
+ {
+ "Name" = "8:Speex Input"
+ "Condition" = "8:"
+ "Keys"
+ {
+ "{B1EBC968-6B66-4532-A885-748B79AF4477}:_0153EA5E18474EAF97FE09083D7587EF"
+ {
+ "Name" = "8:Types"
+ "Condition" = "8:"
+ "Keys"
+ {
+ "{B1EBC968-6B66-4532-A885-748B79AF4477}:_4D0E0CF8E7AA4ECB9C9AC13BA1867884"
+ {
+ "Name" = "8:{60891713-C24F-4767-B6C9-6CA05B3338FC}"
+ "Condition" = "8:"
+ "Keys"
+ {
+ "{B1EBC968-6B66-4532-A885-748B79AF4477}:_905FBFCF20F44FC280E49C0565FCC485"
+ {
+ "Name" = "8:{E436EB8E-524F-11CE-9F53-0020AF0BA770}"
+ "Condition" = "8:"
+ "Keys"
+ {
+ }
+ "Values"
+ {
+ }
+ }
+ }
+ "Values"
+ {
+ }
+ }
+ }
+ "Values"
+ {
+ }
+ }
+ }
+ "Values"
+ {
+ }
+ }
+ "{B1EBC968-6B66-4532-A885-748B79AF4477}:_BA2D3D2669184AA898FC168E5A3BC286"
+ {
+ "Name" = "8:PCM Output"
+ "Condition" = "8:"
+ "Keys"
+ {
+ "{B1EBC968-6B66-4532-A885-748B79AF4477}:_110ECB9E50DC47C284F5FF6CBB6627C0"
+ {
+ "Name" = "8:Types"
+ "Condition" = "8:"
+ "Keys"
+ {
+ "{B1EBC968-6B66-4532-A885-748B79AF4477}:_1D13503CA7EE421CB29BACC2C79903B4"
+ {
+ "Name" = "8:{73647561-0000-0010-8000-00AA00389B71}"
+ "Condition" = "8:"
+ "Keys"
+ {
+ "{B1EBC968-6B66-4532-A885-748B79AF4477}:_450F8903E37742E2A9C733DE118DC8AE"
+ {
+ "Name" = "8:{00000001-0000-0010-8000-00AA00389B71}"
+ "Condition" = "8:"
+ "Keys"
+ {
+ }
+ "Values"
+ {
+ }
+ }
+ }
+ "Values"
+ {
+ }
+ }
+ }
+ "Values"
+ {
+ }
+ }
+ }
+ "Values"
+ {
+ }
+ }
+ }
+ "Values"
+ {
+ }
+ }
"{B1EBC968-6B66-4532-A885-748B79AF4477}:_E41CDD5075FB4C99AE38791D5427A309"
{
"Name" = "8:InprocServer32"
@@ -1353,7 +1542,7 @@
"Name" = "8:"
"Condition" = "8:"
"ValueTypes" = "3:1"
- "Value" = "8:\\Storage Card\\Program Files\\oggcodecs_wm5\\dsfSpeexDecoder.dll"
+ "Value" = "8:\\Windows\\dsfSpeexDecoder.dll"
}
"{C3684F64-58E2-4092-8E3C-D7483080DE5A}:_CC219369DA4C4202A3369BDEFC98B910"
{
@@ -1367,6 +1556,13 @@
}
"Values"
{
+ "{C3684F64-58E2-4092-8E3C-D7483080DE5A}:_7D6343868848431ABF12BFC46B02A4A3"
+ {
+ "Name" = "8:Merit"
+ "Condition" = "8:"
+ "ValueTypes" = "3:3"
+ "Value" = "3:6291456"
+ }
"{C3684F64-58E2-4092-8E3C-D7483080DE5A}:_7F63F66517F042FC8EC15C78A14E94B3"
{
"Name" = "8:"
Modified: branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeFilter.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeFilter.cpp 2006-04-20 15:35:59 UTC (rev 11181)
+++ branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeFilter.cpp 2006-04-20 16:02:40 UTC (rev 11182)
@@ -42,7 +42,12 @@
&CLSID_SpeexDecodeFilter, // CLSID
SpeexDecodeFilter::CreateInstance, // Method to create an instance of Speex Decoder
NULL, // Initialization function
+#ifdef WINCE
+ &SpeexDecodeFilterReg
+#else
NULL // Set-up information (for filters)
+#endif
+
}
};
@@ -50,6 +55,20 @@
// Generic way of determining the number of items in the template
int g_cTemplates = sizeof(g_Templates) / sizeof(g_Templates[0]);
+
+#ifdef WINCE
+LPAMOVIESETUP_FILTER SpeexDecodeFilter::GetSetupData()
+{
+ return (LPAMOVIESETUP_FILTER)&SpeexDecodeFilterReg;
+}
+
+HRESULT SpeexDecodeFilter::Register()
+{
+ return CBaseFilter::Register();
+}
+#endif
+
+
SpeexDecodeFilter::SpeexDecodeFilter()
: AbstractTransformFilter(NAME("Speex Audio Decoder"), CLSID_SpeexDecodeFilter)
, mSpeexFormatInfo(NULL)
Modified: branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeFilter.h
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeFilter.h 2006-04-20 15:35:59 UTC (rev 11181)
+++ branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/SpeexDecodeFilter.h 2006-04-20 16:02:40 UTC (rev 11182)
@@ -62,6 +62,10 @@
virtual sSpeexFormatBlock* getSpeexFormatBlock();
virtual void setSpeexFormat(BYTE* inFormatBlock);
+#ifdef WINCE
+ virtual LPAMOVIESETUP_FILTER GetSetupData(); // { return (LPAMOVIESETUP_FILTER)&VorbisDecodeFilterReg; }
+ virtual HRESULT Register();
+#endif
protected:
//Pure Virtuals from AbstracttransformFilter
virtual bool ConstructPins();
Modified: branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/speexdecoderdllstuff.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/speexdecoderdllstuff.cpp 2006-04-20 15:35:59 UTC (rev 11181)
+++ branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/speexdecoderdllstuff.cpp 2006-04-20 16:02:40 UTC (rev 11182)
@@ -47,7 +47,11 @@
HRESULT hr;
+#ifdef WINCE
+ hr = AMovieDllRegisterServer();//AMovieDLLRegisterServer(TRUE);
+#else
hr = AMovieDllRegisterServer2(TRUE);
+#endif
#ifndef WINCE
@@ -74,8 +78,11 @@
{
HRESULT hr;
-
+#ifdef WINCE
+ hr = AMovieDllUnregisterServer();
+#else
hr = AMovieDllRegisterServer2(FALSE);
+#endif
if (FAILED(hr)) {
return hr;
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.cpp 2006-04-20 15:35:59 UTC (rev 11181)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.cpp 2006-04-20 16:02:40 UTC (rev 11182)
@@ -208,7 +208,7 @@
mParentFilter->mInputPin->NonDelegatingQueryInterface(IID_IMediaSeeking, (void**)&locSeeker);
SetDelegate(locSeeker);
- mDataQueue = new COutputQueue (inReceivePin, &locHR, FALSE, FALSE, 1, TRUE, mActualBufferCount); //Deleted in destructor
+ mDataQueue = new COutputQueue (inReceivePin, &locHR, FALSE, TRUE, 1, TRUE, mActualBufferCount); //Deleted in destructor
if (FAILED(locHR)) {
//Handle data Q failure
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.h
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.h 2006-04-20 15:35:59 UTC (rev 11181)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/libDirectshowAbstracts/AbstractTransformOutputPin.h 2006-04-20 16:02:40 UTC (rev 11182)
@@ -74,6 +74,9 @@
virtual HRESULT DeliverEndOfStream(void);
virtual HRESULT DeliverEndFlush(void);
virtual HRESULT DeliverBeginFlush(void);
+
+ //Temp
+ virtual unsigned long actualBufferCount() { return mActualBufferCount; }
protected:
//Helper methods
More information about the commits
mailing list