[xiph-commits] r11015 - in branches/oggdsf_ce_port/src/lib:
codecs/vorbis/filters/dsfVorbisDecoder
core/directshow/libDirectshowAbstracts
illiminable at svn.xiph.org
illiminable at svn.xiph.org
Fri Mar 17 21:19:18 PST 2006
Author: illiminable
Date: 2006-03-17 21:19:06 -0800 (Fri, 17 Mar 2006)
New Revision: 11015
Modified:
branches/oggdsf_ce_port/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/dsfVorbisDecoder.vcproj
branches/oggdsf_ce_port/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/vorbisdecoderdllstuff.cpp
branches/oggdsf_ce_port/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/vorbisdecoderdllstuff.h
branches/oggdsf_ce_port/src/lib/core/directshow/libDirectshowAbstracts/libDirectshowAbstracts.vcproj
Log:
* Vorbis decode filter builds for wm5
Modified: branches/oggdsf_ce_port/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/dsfVorbisDecoder.vcproj
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/dsfVorbisDecoder.vcproj 2006-03-18 04:46:35 UTC (rev 11014)
+++ branches/oggdsf_ce_port/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/dsfVorbisDecoder.vcproj 2006-03-18 05:19:06 UTC (rev 11015)
@@ -979,6 +979,7 @@
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFVORBISDECODER_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)/dsfVorbisDecoder.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""
Modified: branches/oggdsf_ce_port/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/vorbisdecoderdllstuff.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/vorbisdecoderdllstuff.cpp 2006-03-18 04:46:35 UTC (rev 11014)
+++ branches/oggdsf_ce_port/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/vorbisdecoderdllstuff.cpp 2006-03-18 05:19:06 UTC (rev 11015)
@@ -44,13 +44,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);
@@ -64,7 +64,7 @@
);
locFilterMapper->Release();
-
+#endif
return hr;
}
@@ -72,14 +72,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);
@@ -93,6 +94,7 @@
//
locFilterMapper->Release();
+#endif
return hr;
}
Modified: branches/oggdsf_ce_port/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/vorbisdecoderdllstuff.h
===================================================================
--- branches/oggdsf_ce_port/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/vorbisdecoderdllstuff.h 2006-03-18 04:46:35 UTC (rev 11014)
+++ branches/oggdsf_ce_port/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/vorbisdecoderdllstuff.h 2006-03-18 05:19:06 UTC (rev 11015)
@@ -58,10 +58,6 @@
#define LIBOOOGG_API __declspec(dllimport)
#endif
-// {05A1D945-A794-44ef-B41A-2F851A117155}
-DEFINE_GUID(CLSID_VorbisDecodeFilter,
-0x5a1d945, 0xa794, 0x44ef, 0xb4, 0x1a, 0x2f, 0x85, 0x1a, 0x11, 0x71, 0x55);
-
//// {8A0566AC-42B3-4ad9-ACA3-93B906DDF98A}
//DEFINE_GUID(MEDIASUBTYPE_Vorbis,
//0x8a0566ac, 0x42b3, 0x4ad9, 0xac, 0xa3, 0x93, 0xb9, 0x6, 0xdd, 0xf9, 0x8a);
@@ -71,23 +67,46 @@
//0x44e04f43, 0x58b3, 0x4de1, 0x9b, 0xaa, 0x89, 0x1, 0xf8, 0x52, 0xda, 0xe4);
+//static const GUID <<name>> =
+//{ 0xb15c4790, 0xc332, 0x4162, { 0xb7, 0xd, 0xb4, 0x3e, 0x5a, 0x69, 0xd8, 0x51 } };
+
+
+
+// {05A1D945-A794-44ef-B41A-2F851A117155}
+//DEFINE_GUID(CLSID_VorbisDecodeFilter,
+//0x5a1d945, 0xa794, 0x44ef, 0xb4, 0x1a, 0x2f, 0x85, 0x1a, 0x11, 0x71, 0x55);
+static const GUID CLSID_VorbisDecodeFilter =
+{ 0x5a1d945, 0xa794, 0x44ef, { 0xb4, 0x1a, 0x2f, 0x85, 0x1a, 0x11, 0x71, 0x55 } };
+
+
+
// {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);
+//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 VorbisDecodeOutputTypes = {
&MEDIATYPE_Audio,
&MEDIASUBTYPE_PCM
@@ -98,6 +117,7 @@
&MEDIASUBTYPE_None
};
+
const REGFILTERPINS VorbisDecodePinReg[] = {
{
L"Vorbis Input", //Name (obsoleted)
@@ -125,8 +145,20 @@
}
};
+#ifdef WINCE
+const AMOVIESETUP_FILTER VorbisDecodeFilterReg = {
+ &CLSID_VorbisDecodeFilter,
+ L"Vorbis Decode Filter",
+ MERIT_NORMAL,
+ 2,
+ VorbisDecodePinReg
+
+};
+
+#else
+
const REGFILTER2 VorbisDecodeFilterReg = {
1,
MERIT_NORMAL,
@@ -134,8 +166,10 @@
VorbisDecodePinReg
};
-
+
+#endif
+
struct sVorbisFormatBlock {
unsigned long vorbisVersion;
unsigned long samplesPerSec;
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/libDirectshowAbstracts/libDirectshowAbstracts.vcproj
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/libDirectshowAbstracts/libDirectshowAbstracts.vcproj 2006-03-18 04:46:35 UTC (rev 11014)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/libDirectshowAbstracts/libDirectshowAbstracts.vcproj 2006-03-18 05:19:06 UTC (rev 11015)
@@ -830,6 +830,7 @@
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"
MinimalRebuild="true"
RuntimeLibrary="3"
+ TreatWChar_tAsBuiltInType="false"
UsePrecompiledHeader="2"
WarningLevel="4"
/>
More information about the commits
mailing list