[xiph-commits] r11031 - in branches/oggdsf_ce_port/src: lib/core/directshow/dsfOggDemux2 tests/testLoadLib

[illiminable at svn.xiph.org]

Author: illiminable
Date: 2006-03-20 00:26:32 -0800 (Mon, 20 Mar 2006)
New Revision: 11031

Modified:
   branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/ds_guids.h
   branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.cpp
   branches/oggdsf_ce_port/src/tests/testLoadLib/testLoadLib.cpp
Log:
* Speex decoder registers for WM5
* Theora decoder registers for WM5 with registration tool, but appears to sometimes fail to load dependant modules when done manually.
* More changes to oggdemux, but still crashes registration tool

Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/ds_guids.h
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/ds_guids.h	2006-03-20 05:48:03 UTC (rev 11030)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/ds_guids.h	2006-03-20 08:26:32 UTC (rev 11031)
@@ -113,12 +113,44 @@
 //Structure defining the registration details of the filter
 
 #ifdef WINCE
+
+
+const AMOVIESETUP_MEDIATYPE OggDemuxPacketSourceOutputTypes = {
+    &MEDIATYPE_OggPacketStream,
+	&MEDIASUBTYPE_None
+};
+
+
+const AMOVIESETUP_PIN OggDemuxPacketSourcePinReg = {
+	
+    L"Ogg Packet Out",					//Name (obsoleted)
+	FALSE,								//Renders from this pin ?? Not sure about this.
+	TRUE,								//Is an output pin
+	TRUE,								//Can have zero instances of this pin
+	TRUE,								//Can have more than one instance of this pin
+	&GUID_NULL,							//Connects to filter (obsoleted)
+	NULL,								//Connects to pin (obsoleted)
+	1,									//upport two media type
+	&OggDemuxPacketSourceOutputTypes				//Pointer to media type (Audio/Vorbis or Audio/Speex)
+	
+};
+
+
+
+
+
+
+
+
+
+
+
 static const AMOVIESETUP_FILTER OggDemuxPacketSourceFilterReg = {
     &CLSID_OggDemuxPacketSourceFilter,      // Filter CLSID.
     L"Ogg Demux Packet Source Filter",              // Filter name.
     MERIT_NORMAL,           // Merit.
     0,                      // Number of pin types.
-    NULL                // Pointer to pin information.
+    &OggDemuxPacketSourcePinReg                // Pointer to pin information.
 };
 #else
 const REGFILTER2 OggDemuxPacketSourceFilterReg = {

Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.cpp	2006-03-20 05:48:03 UTC (rev 11030)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/oggdllstuff.cpp	2006-03-20 08:26:32 UTC (rev 11031)
@@ -49,6 +49,8 @@
 	
 	//TO DO::: Should we be releasing the filter mapper even when we return early ?
     HRESULT hr;
+
+	MessageBox(NULL, L"Ogg", L"Ogg", MB_OK);
     
 	
 #ifdef WINCE

Modified: branches/oggdsf_ce_port/src/tests/testLoadLib/testLoadLib.cpp
===================================================================
--- branches/oggdsf_ce_port/src/tests/testLoadLib/testLoadLib.cpp	2006-03-20 05:48:03 UTC (rev 11030)
+++ branches/oggdsf_ce_port/src/tests/testLoadLib/testLoadLib.cpp	2006-03-20 08:26:32 UTC (rev 11031)
@@ -252,24 +252,28 @@
 				HRESULT (__stdcall*locProc)(); 
 				HRESULT locRes;
 
+				locErr = GetLastError();
 				locLib = LoadLibrary(L"dsfVorbisDecoder.dll");
 				locErr = GetLastError();
-				locProc = (HRESULT (__stdcall*)())GetProcAddress(locLib, L"DllRegisterServer");
-				locRes = locProc();
+				//locProc = (HRESULT (__stdcall*)())GetProcAddress(locLib, L"DllRegisterServer");
+				//locRes = locProc();
 				FreeLibrary(locLib);
 
+				locErr = GetLastError();
 				locLib = LoadLibrary(L"dsfSpeexDecoder.dll");
 				locErr = GetLastError();
-				locProc = (HRESULT (__stdcall*)())GetProcAddress(locLib, L"DllRegisterServer");
-				locRes = locProc();
+				//locProc = (HRESULT (__stdcall*)())GetProcAddress(locLib, L"DllRegisterServer");
+				//locRes = locProc();
 				FreeLibrary(locLib);
 
+				locErr = GetLastError();
 				locLib = LoadLibrary(L"dsfTheoraDecoder.dll");
 				locErr = GetLastError();
-				locProc = (HRESULT (__stdcall*)())GetProcAddress(locLib, L"DllRegisterServer");
-				locRes = locProc();
+				//locProc = (HRESULT (__stdcall*)())GetProcAddress(locLib, L"DllRegisterServer");
+				//locRes = locProc();
 				FreeLibrary(locLib);
 
+				locErr = GetLastError();
 				locLib = LoadLibrary(L"dsfOggDemux2.dll");
 				locErr = GetLastError();
 				locProc = (HRESULT (__stdcall*)())GetProcAddress(locLib, L"DllRegisterServer");