>
> The interface seems correct, why do you add this warning? Same for
> IMPEG2PIDMap
All the other interfaces in the file also have this warning so I didn't
want to remove it.
Attached updated patch :)
Those two should be in wmcodecdsp.idl AFAICS.
>
Yes as discussed on IRC there are a few uuid's in the wrong place already.
Updated patch to put these 2 and more in the correct place :)
What do you need this for? Those UUIDs don't seem to belong to libuuid.a.
> libksuser.a may be what you're looking for.
>
Added a missing GUID to libksuser.a :)
On Wed, Feb 4, 2015 at 11:46 AM, Jacek Caban <ja...@codeweavers.com> wrote:
> Hi Martell,
>
> On 02/04/15 12:10, Martell Malone wrote:
> > +#warning COM interfaces layout in this header has not been verified.
> > +#warning COM interfaces with incorrect layout may not work at all.
> > +__MINGW_BROKEN_INTERFACE(INTERFACE)
>
> The interface seems correct, why do you add this warning? Same for
> IMPEG2PIDMap.
>
>
> +OUR_GUID_ENTRY(MEDIASUBTYPE_RAW_AAC1,0x000000FF,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71)
>
> +OUR_GUID_ENTRY(MEDIASUBTYPE_DVM,0x00002000,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71)
>
>
> Those two should be in wmcodecdsp.idl AFAICS.
>
> diff --git a/mingw-w64-crt/libsrc/uuid.c b/mingw-w64-crt/libsrc/uuid.c
> index 22d806d..79d0c3e 100644
> --- a/mingw-w64-crt/libsrc/uuid.c
> +++ b/mingw-w64-crt/libsrc/uuid.c
> @@ -23,6 +23,7 @@
> #include <oleacc.h>
> #include <uiautomation.h>
> #include <urlmon.h>
> +#include <ksmedia.h>
>
>
> What do you need this for? Those UUIDs don't seem to belong to libuuid.a.
> libksuser.a may be what you're looking for.
>
> Jacek
>
>
>
>
> ------------------------------------------------------------------------------
> Dive into the World of Parallel Programming. The Go Parallel Website,
> sponsored by Intel and developed in partnership with Slashdot Media, is
> your
> hub for all things parallel software development, from weekly thought
> leadership blogs to news, videos, case studies, tutorials and more. Take a
> look and join the conversation now. http://goparallel.sourceforge.net/
> _______________________________________________
> Mingw-w64-public mailing list
> Mingw-w64-public@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
>
From 0b800b7531278cbde1f4bb0096fd219a53b72305 Mon Sep 17 00:00:00 2001
From: Martell Malone <martellmal...@gmail.com>
Date: Wed, 4 Feb 2015 09:52:04 +0000
Subject: [PATCH] Added IEnumPIDMap and IMPEG2PIDMap to bdaiface.h
---
mingw-w64-headers/include/bdaiface.h | 79 ++++++++++++++++++++++++++++++++++++
1 file changed, 79 insertions(+)
diff --git a/mingw-w64-headers/include/bdaiface.h
b/mingw-w64-headers/include/bdaiface.h
index ec57204..50908cb 100644
--- a/mingw-w64-headers/include/bdaiface.h
+++ b/mingw-w64-headers/include/bdaiface.h
@@ -10,6 +10,75 @@
#include <bdatypes.h>
#include <dshow.h>
+#if (_WIN32_WINNT >= 0x0600)
+
+#ifndef __IEnumPIDMap_FWD_DEFINED__
+#define __IEnumPIDMap_FWD_DEFINED__
+typedef interface IEnumPIDMap IEnumPIDMap;
+#endif
+
+#ifndef __IMPEG2PIDMap_FWD_DEFINED__
+#define __IMPEG2PIDMap_FWD_DEFINED__
+typedef interface IMPEG2PIDMap IMPEG2PIDMap;
+#endif
+
+#undef INTERFACE
+#define INTERFACE IEnumPIDMap
+DECLARE_INTERFACE_(IEnumPIDMap,IUnknown)
+{
+ BEGIN_INTERFACE
+
+ /* IUnknown methods */
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE;
+ STDMETHOD_(ULONG, AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG, Release)(THIS) PURE;
+ /* IEnumPIDMap methods */
+ STDMETHOD_(HRESULT,Next)(THIS_ ULONG req, PID_MAP *map, ULONG count) PURE;
+ STDMETHOD_(HRESULT,Skip)(THIS_ ULONG rec) PURE;
+ STDMETHOD_(HRESULT,Reset)(THIS) PURE;
+ STDMETHOD_(HRESULT,Clone)(THIS_ IEnumPIDMap **pIEnumPIDMap) PURE;
+
+ END_INTERFACE
+};
+#ifdef COBJMACROS
+#define IEnumPIDMap_QueryInterface(This,riid,ppvObject)
(This)->lpVtbl->QueryInterface(This,riid,ppvObject)
+#define IEnumPIDMap_AddRef(This) (This)->lpVtbl->AddRef(This)
+#define IEnumPIDMap_Release(This) (This)->lpVtbl->Release(This)
+#define IEnumPIDMap_Next(This,req,map,count)
(This)->lpVtbl->Next(This,req,map,count)
+#define IEnumPIDMap_Skip(This,rec) (This)->lpVtbl->Skip(This,rec)
+#define IEnumPIDMap_Reset(This) (This)->lpVtbl->Reset(This)
+#define IEnumPIDMap_Clone(This,pIEnumPIDMap)
(This)->lpVtbl->Clone(This,pIEnumPIDMap)
+#endif /*COBJMACROS*/
+
+#undef INTERFACE
+#define INTERFACE IMPEG2PIDMap
+DECLARE_INTERFACE_(IMPEG2PIDMap,IUnknown)
+{
+ BEGIN_INTERFACE
+
+ /* IUnknown methods */
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE;
+ STDMETHOD_(ULONG, AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG, Release)(THIS) PURE;
+
+ /* IMPEG2PIDMap methods */
+ STDMETHOD_(HRESULT,MapPID)(THIS_ ULONG numPid,ULONG
*pPid,MEDIA_SAMPLE_CONTENT MediaSampleContent) PURE;
+ STDMETHOD_(HRESULT,UnmapPID)(THIS_ ULONG numPid,ULONG *pPid) PURE;
+ STDMETHOD_(HRESULT,EnumPIDMap)(THIS_ IEnumPIDMap **pIEnumPIDMap) PURE;
+
+ END_INTERFACE
+};
+#ifdef COBJMACROS
+#define IMPEG2PIDMap_QueryInterface(This,riid,ppvObject)
(This)->lpVtbl->QueryInterface(This,riid,ppvObject)
+#define IMPEG2PIDMap_AddRef(This) (This)->lpVtbl->AddRef(This)
+#define IMPEG2PIDMap_Release(This) (This)->lpVtbl->Release(This)
+#define IMPEG2PIDMap_MapPID(This,numPid,pPid,MediaSampleContent)
(This)->lpVtbl->MapPID(This,numPid,pPid,MediaSampleContent)
+#define IMPEG2PIDMap_UnmapPID(This,numPid,pPid)
(This)->lpVtbl->UnmapPID(This,numPid,pPid)
+#define IMPEG2PIDMap_EnumPIDMap(This,pIEnumPIDMap)
(This)->lpVtbl->EnumPIDMap(This,pIEnumPIDMap)
+#endif /*COBJMACROS*/
+
+
+#endif
#if (_WIN32_WINNT >= 0x0601)
typedef enum ApplicationTypeType {
--
2.2.2
From b279c43c7b314beebede575eda50f8d1dcea5f30 Mon Sep 17 00:00:00 2001
From: martell <martellmal...@gmail.com>
Date: Wed, 4 Feb 2015 15:04:02 +0000
Subject: [PATCH] fix the location of some guid's
---
mingw-w64-headers/include/uuids.h | 2 --
mingw-w64-headers/include/wmcodecdsp.idl | 9 +++++++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/mingw-w64-headers/include/uuids.h
b/mingw-w64-headers/include/uuids.h
index 3b5e7d4..daaf0ad 100644
--- a/mingw-w64-headers/include/uuids.h
+++ b/mingw-w64-headers/include/uuids.h
@@ -26,7 +26,6 @@
OUR_GUID_ENTRY(MEDIATYPE_LMRT,0x74726c6d,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,
OUR_GUID_ENTRY(MEDIATYPE_URL_STREAM,0x736c7275,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71)
OUR_GUID_ENTRY(MEDIASUBTYPE_CLPL,0x4C504C43,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71)
OUR_GUID_ENTRY(MEDIASUBTYPE_YUYV,0x56595559,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71)
-OUR_GUID_ENTRY(MEDIASUBTYPE_I420,0x30323449,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71)
OUR_GUID_ENTRY(MEDIASUBTYPE_IYUV,0x56555949,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71)
OUR_GUID_ENTRY(MEDIASUBTYPE_YVU9,0x39555659,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71)
OUR_GUID_ENTRY(MEDIASUBTYPE_Y411,0x31313459,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71)
@@ -45,7 +44,6 @@
OUR_GUID_ENTRY(MEDIASUBTYPE_CFCC,0x43434643,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x
OUR_GUID_ENTRY(MEDIASUBTYPE_IJPG,0x47504A49,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71)
OUR_GUID_ENTRY(MEDIASUBTYPE_Plum,0x6D756C50,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71)
OUR_GUID_ENTRY(MEDIASUBTYPE_DVCS,0x53435644,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71)
-OUR_GUID_ENTRY(MEDIASUBTYPE_H264,0x34363248,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71)
OUR_GUID_ENTRY(MEDIASUBTYPE_DVSD,0x44535644,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71)
OUR_GUID_ENTRY(MEDIASUBTYPE_MDVF,0x4656444D,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71)
OUR_GUID_ENTRY(MEDIASUBTYPE_RGB1,0xe436eb78,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70)
diff --git a/mingw-w64-headers/include/wmcodecdsp.idl
b/mingw-w64-headers/include/wmcodecdsp.idl
index 9adb584..2bc54cb 100644
--- a/mingw-w64-headers/include/wmcodecdsp.idl
+++ b/mingw-w64-headers/include/wmcodecdsp.idl
@@ -17,6 +17,15 @@ interface IWMValidate : IUnknown
HRESULT SetIdentifier([in] GUID guidValidationID);
}
+cpp_quote("DEFINE_GUID(MEDIASUBTYPE_I420,0x30323449,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);")
+cpp_quote("DEFINE_GUID(MEDIASUBTYPE_RAW_AAC1,0x000000ff,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);")
+cpp_quote("DEFINE_GUID(MEDIASUBTYPE_DVM,0x00002000,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);")
+cpp_quote("DEFINE_GUID(MEDIASUBTYPE_H264,0x34363248,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);")
+cpp_quote("DEFINE_GUID(MEDIASUBTYPE_h264,0x34363268,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);")
+cpp_quote("DEFINE_GUID(MEDIASUBTYPE_AVC1,0x31435641,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);")
+cpp_quote("DEFINE_GUID(MEDIASUBTYPE_X264,0x34363258,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);")
+cpp_quote("DEFINE_GUID(MEDIASUBTYPE_x264,0x34363278,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);")
+
[
uuid(f371728a-6052-4d47-827c-d039335dfe0a)
]
--
2.2.2
From 5080eefe9af6f7809cd18ed094cd251e7e263769 Mon Sep 17 00:00:00 2001
From: martell <martellmal...@gmail.com>
Date: Wed, 4 Feb 2015 13:49:50 +0000
Subject: [PATCH] add GUID for KSCATEGORY_ENCODER
---
mingw-w64-crt/libsrc/ksuser.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/mingw-w64-crt/libsrc/ksuser.c b/mingw-w64-crt/libsrc/ksuser.c
index 01905cb..3cc7f1e 100644
--- a/mingw-w64-crt/libsrc/ksuser.c
+++ b/mingw-w64-crt/libsrc/ksuser.c
@@ -107,6 +107,7 @@
DEFINE_GUID(KSCATEGORY_CROSSBAR,0xa799a801,0xa46d,0x11d0,0xa1,0x8c,0,0xa0,0x24,0
DEFINE_GUID(KSCATEGORY_DATACOMPRESSOR,0x1e84c900,0x7e70,0x11d0,0xa5,0xd6,0x28,0xdb,0x4,0xc1,0,0);
DEFINE_GUID(KSCATEGORY_DATADECOMPRESSOR,0x2721ae20,0x7e70,0x11d0,0xa5,0xd6,0x28,0xdb,0x4,0xc1,0,0);
DEFINE_GUID(KSCATEGORY_DATATRANSFORM,0x2eb07ea0,0x7e70,0x11d0,0xa5,0xd6,0x28,0xdb,0x4,0xc1,0,0);
+DEFINE_GUID(KSCATEGORY_ENCODER,0x19689bf6,0xc384,0x48fd,0xad,0x51,0x90,0xe5,0x8c,0x79,0xf7,0xb);
DEFINE_GUID(KSCATEGORY_ESCALANTE_PLATFORM_DRIVER,0x74f3aea8,0x9768,0x11d1,0x8e,0x7,0,0xa0,0xc9,0x5e,0xc2,0x2e);
DEFINE_GUID(KSCATEGORY_FILESYSTEM,0x760fed5e,0x9357,0x11d0,0xa3,0xcc,0,0xa0,0xc9,0x22,0x31,0x96);
DEFINE_GUID(KSCATEGORY_INTERFACETRANSFORM,0xcf1dda2d,0x9743,0x11d0,0xa3,0xee,0,0xa0,0xc9,0x22,0x31,0x96);
--
2.2.2
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
