[xiph-commits] r11016 - branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder

[illiminable at svn.xiph.org]

Author: illiminable
Date: 2006-03-17 21:30:50 -0800 (Fri, 17 Mar 2006)
New Revision: 11016

Modified:
   branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/dsfSpeexDecoder.vcproj
   branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/speexdecoderdllstuff.cpp
   branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/speexdecoderdllstuff.h
Log:
* Speex decode filter builds for wm5

Modified: branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/dsfSpeexDecoder.vcproj
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/dsfSpeexDecoder.vcproj	2006-03-18 05:19:06 UTC (rev 11015)
+++ branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/dsfSpeexDecoder.vcproj	2006-03-18 05:30:50 UTC (rev 11016)
@@ -987,6 +987,7 @@
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFSPEEXDECODER_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
 				MinimalRebuild="true"
 				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="false"
 				UsePrecompiledHeader="2"
 				WarningLevel="4"
 				DisableSpecificWarnings="4275"
@@ -1002,7 +1003,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
+				AdditionalDependencies="strmbase.lib strmiids.lib"
 				OutputFile="$(OutDir)/dsfSpeexDecoder.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""

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-03-18 05:19:06 UTC (rev 11015)
+++ branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/speexdecoderdllstuff.cpp	2006-03-18 05:30:50 UTC (rev 11016)
@@ -45,13 +45,13 @@
 
 	
     HRESULT hr;
-    IFilterMapper2* locFilterMapper = NULL;
+    
 
     hr = AMovieDllRegisterServer2(TRUE);
 
 
-	
-
+#ifndef WINCE	
+	IFilterMapper2* locFilterMapper = NULL;
     hr = CoCreateInstance(CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, IID_IFilterMapper2, (void **)&locFilterMapper);
 
 
@@ -65,7 +65,7 @@
     );
 
     locFilterMapper->Release();
-
+#endif
     return hr;
 
 }
@@ -73,14 +73,15 @@
 STDAPI DllUnregisterServer()
 {
    HRESULT hr;
-    IFilterMapper2* locFilterMapper = NULL;
+    
 
     hr = AMovieDllRegisterServer2(FALSE);
 	if (FAILED(hr)) {
 		
         return hr;
 	}
- 
+#ifndef WINCE
+	IFilterMapper2* locFilterMapper = NULL;
     hr = CoCreateInstance(CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER,
             IID_IFilterMapper2, (void **)&locFilterMapper);
 
@@ -94,6 +95,7 @@
 
 	//
     locFilterMapper->Release();
+#endif
     return hr;
 
 }

Modified: branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/speexdecoderdllstuff.h
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/speexdecoderdllstuff.h	2006-03-18 05:19:06 UTC (rev 11015)
+++ branches/oggdsf_ce_port/src/lib/codecs/speex/filters/dsfSpeexDecoder/speexdecoderdllstuff.h	2006-03-18 05:30:50 UTC (rev 11016)
@@ -49,9 +49,6 @@
 #define LIBOOOGG_API __declspec(dllimport)
 #endif
 
-// {7605E26C-DE38-4b82-ADD8-FE2568CC0B25}
-DEFINE_GUID(CLSID_SpeexDecodeFilter, 
-0x7605e26c, 0xde38, 0x4b82, 0xad, 0xd8, 0xfe, 0x25, 0x68, 0xcc, 0xb, 0x25);
 //
 //// {25A9729D-12F6-420e-BD53-1D631DC217DF}
 //DEFINE_GUID(MEDIASUBTYPE_Speex, 
@@ -62,18 +59,42 @@
 //0x78701a27, 0xefb5, 0x4157, 0x95, 0x53, 0x38, 0xa7, 0x85, 0x4e, 0x3e, 0x81);
 
 
+
+
+// {7605E26C-DE38-4b82-ADD8-FE2568CC0B25}
+//DEFINE_GUID(CLSID_SpeexDecodeFilter, 
+//0x7605e26c, 0xde38, 0x4b82, 0xad, 0xd8, 0xfe, 0x25, 0x68, 0xcc, 0xb, 0x25);
+static const GUID CLSID_SpeexDecodeFilter =
+{ 0x7605e26c, 0xde38, 0x4b82, { 0xad, 0xd8, 0xfe, 0x25, 0x68, 0xcc, 0xb, 0x25 } };
+
+
 // {60891713-C24F-4767-B6C9-6CA05B3338FC}
-DEFINE_GUID(MEDIATYPE_OggPacketStream, 
-0x60891713, 0xc24f, 0x4767, 0xb6, 0xc9, 0x6c, 0xa0, 0x5b, 0x33, 0x38, 0xfc);
+//DEFINE_GUID(MEDIATYPE_OggPacketStream, 
+//0x60891713, 0xc24f, 0x4767, 0xb6, 0xc9, 0x6c, 0xa0, 0x5b, 0x33, 0x38, 0xfc);
+static const GUID MEDIATYPE_OggPacketStream =
+{ 0x60891713, 0xc24f, 0x4767, { 0xb6, 0xc9, 0x6c, 0xa0, 0x5b, 0x33, 0x38, 0xfc } };
 
 // {95388704-162C-42a9-8149-C3577C12AAF9}
-DEFINE_GUID(FORMAT_OggIdentHeader, 
-0x95388704, 0x162c, 0x42a9, 0x81, 0x49, 0xc3, 0x57, 0x7c, 0x12, 0xaa, 0xf9);
+//DEFINE_GUID(FORMAT_OggIdentHeader, 
+//0x95388704, 0x162c, 0x42a9, 0x81, 0x49, 0xc3, 0x57, 0x7c, 0x12, 0xaa, 0xf9);
+static const GUID FORMAT_OggIdentHeader =
+{ 0x95388704, 0x162c, 0x42a9, { 0x81, 0x49, 0xc3, 0x57, 0x7c, 0x12, 0xaa, 0xf9 } };
 
 // {43F0F818-10B0-4c86-B9F1-F6B6E2D33462}
-DEFINE_GUID(IID_IOggDecoder, 
-0x43f0f818, 0x10b0, 0x4c86, 0xb9, 0xf1, 0xf6, 0xb6, 0xe2, 0xd3, 0x34, 0x62);
+//DEFINE_GUID(IID_IOggDecoder, 
+//0x43f0f818, 0x10b0, 0x4c86, 0xb9, 0xf1, 0xf6, 0xb6, 0xe2, 0xd3, 0x34, 0x62);
+static const GUID IID_IOggDecoder =
+{ 0x43f0f818, 0x10b0, 0x4c86, { 0xb9, 0xf1, 0xf6, 0xb6, 0xe2, 0xd3, 0x34, 0x62 } };
 
+
+// {83D7F506-53ED-4f15-B6D8-7D8E9E72A918}
+//DEFINE_GUID(IID_IOggOutputPin, 
+//0x83d7f506, 0x53ed, 0x4f15, 0xb6, 0xd8, 0x7d, 0x8e, 0x9e, 0x72, 0xa9, 0x18);
+static const GUID IID_IOggOutputPin =
+{ 0x83d7f506, 0x53ed, 0x4f15, { 0xb6, 0xd8, 0x7d, 0x8e, 0x9e, 0x72, 0xa9, 0x18 } };
+
+
+
 const REGPINTYPES SpeexDecodeOutputTypes = {
     &MEDIATYPE_Audio,
 	&MEDIASUBTYPE_PCM
@@ -111,7 +132,7 @@
 };
 
 
-
+#ifndef WINCE
 const REGFILTER2 SpeexDecodeFilterReg = {
 		1,
 		MERIT_NORMAL,
@@ -119,8 +140,18 @@
         SpeexDecodePinReg
 		
 };
-	   
+#else
+const AMOVIESETUP_FILTER SpeexDecodeFilterReg = {
+		&CLSID_SpeexDecodeFilter,
+		L"Speex Decode Filter",
+		MERIT_NORMAL,
+		2,
+        SpeexDecodePinReg
+		
+};
 
+#endif
+
 struct sSpeexFormatBlock {
 	unsigned long speexVersion;
 	unsigned long samplesPerSec;