[xiph-commits] r11017 -
branches/oggdsf_ce_port/src/lib/codecs/theora/filters/dsfTheoraDecoder
illiminable at svn.xiph.org
illiminable at svn.xiph.org
Fri Mar 17 21:36:30 PST 2006
Author: illiminable
Date: 2006-03-17 21:36:24 -0800 (Fri, 17 Mar 2006)
New Revision: 11017
Modified:
branches/oggdsf_ce_port/src/lib/codecs/theora/filters/dsfTheoraDecoder/dsfTheoraDecoder.vcproj
branches/oggdsf_ce_port/src/lib/codecs/theora/filters/dsfTheoraDecoder/theoradecodedllstuff.cpp
branches/oggdsf_ce_port/src/lib/codecs/theora/filters/dsfTheoraDecoder/theoradecoderdllstuff.h
Log:
* Theora decode filter builds for wm5
Modified: branches/oggdsf_ce_port/src/lib/codecs/theora/filters/dsfTheoraDecoder/dsfTheoraDecoder.vcproj
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/theora/filters/dsfTheoraDecoder/dsfTheoraDecoder.vcproj 2006-03-18 05:30:50 UTC (rev 11016)
+++ branches/oggdsf_ce_port/src/lib/codecs/theora/filters/dsfTheoraDecoder/dsfTheoraDecoder.vcproj 2006-03-18 05:36:24 UTC (rev 11017)
@@ -979,6 +979,7 @@
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFTHEORADECODER_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
MinimalRebuild="true"
RuntimeLibrary="3"
+ TreatWChar_tAsBuiltInType="false"
UsePrecompiledHeader="2"
WarningLevel="4"
/>
@@ -993,7 +994,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
+ AdditionalDependencies="strmbase.lib strmiids.lib"
OutputFile="$(OutDir)/dsfTheoraDecoder.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""
Modified: branches/oggdsf_ce_port/src/lib/codecs/theora/filters/dsfTheoraDecoder/theoradecodedllstuff.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/theora/filters/dsfTheoraDecoder/theoradecodedllstuff.cpp 2006-03-18 05:30:50 UTC (rev 11016)
+++ branches/oggdsf_ce_port/src/lib/codecs/theora/filters/dsfTheoraDecoder/theoradecodedllstuff.cpp 2006-03-18 05:36:24 UTC (rev 11017)
@@ -46,13 +46,13 @@
//TO DO::: Should we be releasing the filter mapper even when we return early ?
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);
@@ -66,7 +66,7 @@
);
locFilterMapper->Release();
-
+#endif
return hr;
}
@@ -74,14 +74,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);
@@ -95,6 +96,7 @@
//
locFilterMapper->Release();
+#endif
return hr;
}
Modified: branches/oggdsf_ce_port/src/lib/codecs/theora/filters/dsfTheoraDecoder/theoradecoderdllstuff.h
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/theora/filters/dsfTheoraDecoder/theoradecoderdllstuff.h 2006-03-18 05:30:50 UTC (rev 11016)
+++ branches/oggdsf_ce_port/src/lib/codecs/theora/filters/dsfTheoraDecoder/theoradecoderdllstuff.h 2006-03-18 05:36:24 UTC (rev 11017)
@@ -49,9 +49,37 @@
#endif
// {05187161-5C36-4324-A734-22BF37509F2D}
-DEFINE_GUID(CLSID_TheoraDecodeFilter,
-0x5187161, 0x5c36, 0x4324, 0xa7, 0x34, 0x22, 0xbf, 0x37, 0x50, 0x9f, 0x2d);
+//DEFINE_GUID(CLSID_TheoraDecodeFilter,
+//0x5187161, 0x5c36, 0x4324, 0xa7, 0x34, 0x22, 0xbf, 0x37, 0x50, 0x9f, 0x2d);
+static const GUID CLSID_TheoraDecodeFilter =
+{ 0x5187161, 0x5c36, 0x4324, { 0xa7, 0x34, 0x22, 0xbf, 0x37, 0x50, 0x9f, 0x2d } };
+// {60891713-C24F-4767-B6C9-6CA05B3338FC}
+//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);
+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);
+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 } };
+
+
//// {D124B2B1-8968-4ae8-B288-FE16EA34B0CE}
//DEFINE_GUID(MEDIASUBTYPE_Theora,
//0xd124b2b1, 0x8968, 0x4ae8, 0xb2, 0x88, 0xfe, 0x16, 0xea, 0x34, 0xb0, 0xce);
@@ -61,22 +89,22 @@
//0xa99f116c, 0xdffa, 0x412c, 0x95, 0xde, 0x72, 0x5f, 0x99, 0x87, 0x48, 0x26);
-// {60891713-C24F-4767-B6C9-6CA05B3338FC}
-DEFINE_GUID(MEDIATYPE_OggPacketStream,
-0x60891713, 0xc24f, 0x4767, 0xb6, 0xc9, 0x6c, 0xa0, 0x5b, 0x33, 0x38, 0xfc);
+//// {60891713-C24F-4767-B6C9-6CA05B3338FC}
+//DEFINE_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);
+//
+//// {43F0F818-10B0-4c86-B9F1-F6B6E2D33462}
+//DEFINE_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);
-// {95388704-162C-42a9-8149-C3577C12AAF9}
-DEFINE_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);
-
-// {83D7F506-53ED-4f15-B6D8-7D8E9E72A918}
-DEFINE_GUID(IID_IOggOutputPin,
-0x83d7f506, 0x53ed, 0x4f15, 0xb6, 0xd8, 0x7d, 0x8e, 0x9e, 0x72, 0xa9, 0x18);
-
const REGPINTYPES TheoraDecodeOutputTypes = {
&MEDIATYPE_Video,
&MEDIASUBTYPE_YV12
@@ -114,7 +142,7 @@
};
-
+#ifndef WINCE
const REGFILTER2 TheoraDecodeFilterReg = {
1,
MERIT_NORMAL,
@@ -123,7 +151,17 @@
};
+#else
+const AMOVIESETUP_FILTER TheoraDecodeFilterReg = {
+ &CLSID_TheoraDecodeFilter,
+ L"Theora Decode Fiter",
+ MERIT_NORMAL,
+ 2,
+ TheoraDecodePinReg
+
+};
+#endif
struct sTheoraFormatBlock {
unsigned long theoraVersion;
unsigned long outerFrameWidth;
More information about the commits
mailing list