[xiph-commits] r11018 -
branches/oggdsf_ce_port/src/lib/codecs/cmml/dsfCMMLDecoder
illiminable at svn.xiph.org
illiminable at svn.xiph.org
Fri Mar 17 21:44:45 PST 2006
Author: illiminable
Date: 2006-03-17 21:44:39 -0800 (Fri, 17 Mar 2006)
New Revision: 11018
Modified:
branches/oggdsf_ce_port/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecoderIIDs.h
branches/oggdsf_ce_port/src/lib/codecs/cmml/dsfCMMLDecoder/cmmldecoderdllstuff.cpp
branches/oggdsf_ce_port/src/lib/codecs/cmml/dsfCMMLDecoder/cmmldecoderdllstuff.h
branches/oggdsf_ce_port/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.vcproj
Log:
* CMML Decode filter builds for WM5
Modified: branches/oggdsf_ce_port/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecoderIIDs.h
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecoderIIDs.h 2006-03-18 05:36:24 UTC (rev 11017)
+++ branches/oggdsf_ce_port/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecoderIIDs.h 2006-03-18 05:44:39 UTC (rev 11018)
@@ -1,5 +1,7 @@
#pragma once
#pragma message("Getting CMML IIDS")
// {6188AD0C-62CB-4658-A14E-CD23CF84EC31}
-DEFINE_GUID(IID_ICMMLAppControl,
-0x6188ad0c, 0x62cb, 0x4658, 0xa1, 0x4e, 0xcd, 0x23, 0xcf, 0x84, 0xec, 0x31);
+//DEFINE_GUID(IID_ICMMLAppControl,
+//0x6188ad0c, 0x62cb, 0x4658, 0xa1, 0x4e, 0xcd, 0x23, 0xcf, 0x84, 0xec, 0x31);
+static const GUID IID_ICMMLAppControl =
+{ 0x6188ad0c, 0x62cb, 0x4658, { 0xa1, 0x4e, 0xcd, 0x23, 0xcf, 0x84, 0xec, 0x31 } };
Modified: branches/oggdsf_ce_port/src/lib/codecs/cmml/dsfCMMLDecoder/cmmldecoderdllstuff.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/cmml/dsfCMMLDecoder/cmmldecoderdllstuff.cpp 2006-03-18 05:36:24 UTC (rev 11017)
+++ branches/oggdsf_ce_port/src/lib/codecs/cmml/dsfCMMLDecoder/cmmldecoderdllstuff.cpp 2006-03-18 05:44:39 UTC (rev 11018)
@@ -48,13 +48,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);
@@ -68,7 +68,7 @@
);
locFilterMapper->Release();
-
+#endif
return hr;
}
@@ -76,14 +76,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);
@@ -97,6 +98,7 @@
//
locFilterMapper->Release();
+#endif
return hr;
}
Modified: branches/oggdsf_ce_port/src/lib/codecs/cmml/dsfCMMLDecoder/cmmldecoderdllstuff.h
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/cmml/dsfCMMLDecoder/cmmldecoderdllstuff.h 2006-03-18 05:36:24 UTC (rev 11017)
+++ branches/oggdsf_ce_port/src/lib/codecs/cmml/dsfCMMLDecoder/cmmldecoderdllstuff.h 2006-03-18 05:44:39 UTC (rev 11018)
@@ -38,10 +38,8 @@
#include <initguid.h>
#include "CMMLDecoderIIDs.h"
-// {966D76B4-7D2F-4f01-B840-94E425D2214F}
-DEFINE_GUID(MEDIASUBTYPE_SubtitleVMR9,
-0x966d76b4, 0x7d2f, 0x4f01, 0xb8, 0x40, 0x94, 0xe4, 0x25, 0xd2, 0x21, 0x4f);
+
//// {53696C76-6961-40b2-B136-436F6E726164}
//DEFINE_GUID(FORMAT_CMML,
//0x53696c76, 0x6961, 0x40b2, 0xb1, 0x36, 0x43, 0x6f, 0x6e, 0x72, 0x61, 0x64);
@@ -51,22 +49,58 @@
//DEFINE_GUID(MEDIASUBTYPE_CMML,
//0x5a656e74, 0x6172, 0x6f26, 0xb7, 0x9c, 0xd6, 0x41, 0x6e, 0x64, 0x72, 0x82);
//
+
+
+// {966D76B4-7D2F-4f01-B840-94E425D2214F}
+//DEFINE_GUID(MEDIASUBTYPE_SubtitleVMR9,
+//0x966d76b4, 0x7d2f, 0x4f01, 0xb8, 0x40, 0x94, 0xe4, 0x25, 0xd2, 0x21, 0x4f);
+static const GUID MEDIASUBTYPE_SubtitleVMR9 =
+{ 0x966d76b4, 0x7d2f, 0x4f01, { 0xb8, 0x40, 0x94, 0xe4, 0x25, 0xd2, 0x21, 0x4f} };
+
// {BF1121D1-8739-45e1-BCD8-90B828F643AB}
-DEFINE_GUID(CLSID_CMMLDecodeFilter,
-0xbf1121d1, 0x8739, 0x45e1, 0xbc, 0xd8, 0x90, 0xb8, 0x28, 0xf6, 0x43, 0xab);
+static const GUID CLSID_CMMLDecodeFilter =
+{ 0xbf1121d1, 0x8739, 0x45e1, {0xbc, 0xd8, 0x90, 0xb8, 0x28, 0xf6, 0x43, 0xab} };
+
// {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 } };
+
+
+
+//// {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);
+
//This structure defines the type of input we accept on the input pin... Stream/Annodex
const REGPINTYPES CMMLDecodeOutputTypes = {
@@ -106,7 +140,7 @@
};
-
+#ifndef WINCE
const REGFILTER2 CMMLDecodeFilterReg = {
1,
MERIT_PREFERRED + 2,
@@ -114,7 +148,16 @@
CMMLDecodePinReg
};
-
+#else
+const AMOVIESETUP_FILTER CMMLDecodeFilterReg = {
+ &CLSID_CMMLDecodeFilter,
+ L"CMML Decode Filter",
+ MERIT_PREFERRED + 2,
+ 2,
+ CMMLDecodePinReg
+
+};
+#endif
struct sCMMLFormatBlock {
__int64 granuleNumerator;
Modified: branches/oggdsf_ce_port/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.vcproj
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.vcproj 2006-03-18 05:36:24 UTC (rev 11017)
+++ branches/oggdsf_ce_port/src/lib/codecs/cmml/dsfCMMLDecoder/dsfCMMLDecoder.vcproj 2006-03-18 05:44:39 UTC (rev 11018)
@@ -990,6 +990,7 @@
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFCMMLDECODER_EXPORTS;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
MinimalRebuild="true"
RuntimeLibrary="3"
+ TreatWChar_tAsBuiltInType="false"
UsePrecompiledHeader="2"
WarningLevel="4"
DisableSpecificWarnings="4251"
@@ -1005,7 +1006,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Winmm.lib Strmiids.lib Quartz.lib"
+ AdditionalDependencies="strmbase.lib strmiids.lib"
OutputFile="$(OutDir)/dsfCMMLDecoder.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""
More information about the commits
mailing list