Re: [Mingw-w64-public] Small Header additions
Yes. I don't think it's a problem that one GUID would be different, it would be just a good example for future improvements, but your patch is fine as well. On 02/04/15 17:13, Martell Malone wrote: Will I consider this reviewed? Just need the go ahead On Wed, Feb 4, 2015 at 3:23 PM, Martell Malone martellmal...@gmail.com mailto:martellmal...@gmail.com wrote: I know that it's not what we do in other cases, but something like that would avoid hardcoding this uuid in two places: DEFINE_GUID(KSCATEGORY_ ENCODER, STATIC_KSCATEGORY_ENCODER); Yes I was going todo it that way but I saw that many of the others from that header were defined already and with the full string So I didn't want todo it just for this one GUID On Wed, Feb 4, 2015 at 3:18 PM, Jacek Caban ja...@codeweavers.com mailto:ja...@codeweavers.com wrote: Hi Martell, Those patches look good to me now. I just have one suggestion. On 02/04/15 16:14, Martell Malone wrote: 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); I know that it's not what we do in other cases, but something like that would avoid hardcoding this uuid in two places: DEFINE_GUID(KSCATEGORY_ENCODER, STATIC_KSCATEGORY_ENCODER); Thanks, 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 mailto:Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public -- 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 -- 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
Re: [Mingw-w64-public] Small Header additions
Will I consider this reviewed? Just need the go ahead On Wed, Feb 4, 2015 at 3:23 PM, Martell Malone martellmal...@gmail.com wrote: I know that it's not what we do in other cases, but something like that would avoid hardcoding this uuid in two places: DEFINE_GUID(KSCATEGORY_ ENCODER, STATIC_KSCATEGORY_ENCODER); Yes I was going todo it that way but I saw that many of the others from that header were defined already and with the full string So I didn't want todo it just for this one GUID On Wed, Feb 4, 2015 at 3:18 PM, Jacek Caban ja...@codeweavers.com wrote: Hi Martell, Those patches look good to me now. I just have one suggestion. On 02/04/15 16:14, Martell Malone wrote: 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); I know that it's not what we do in other cases, but something like that would avoid hardcoding this uuid in two places: DEFINE_GUID(KSCATEGORY_ENCODER, STATIC_KSCATEGORY_ENCODER); Thanks, 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 -- 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
Re: [Mingw-w64-public] Small Header additions
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,0x00FF,0x,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_DVM,0x2000,0x,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
[Mingw-w64-public] Small Header additions
Small header changes for various missing uuid's and 2 classes Please Review 0001-Added-IEnumPIDMap-and-IMPEG2PIDMap-to-bdaiface.h.patch Description: Binary data 0001-Add-some-missing-uuid-s.patch Description: Binary data 0001-include-ksmedia-uuids-in-libuuid.patch Description: Binary data -- 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
Re: [Mingw-w64-public] Small Header additions
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,0x00FF,0x,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_DVM,0x2000,0x,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 + 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
Re: [Mingw-w64-public] Small Header additions
Hi Martell, Those patches look good to me now. I just have one suggestion. On 02/04/15 16:14, Martell Malone wrote: 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); I know that it's not what we do in other cases, but something like that would avoid hardcoding this uuid in two places: DEFINE_GUID(KSCATEGORY_ENCODER, STATIC_KSCATEGORY_ENCODER); Thanks, 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
Re: [Mingw-w64-public] Small Header additions
I know that it's not what we do in other cases, but something like that would avoid hardcoding this uuid in two places: DEFINE_GUID(KSCATEGORY_ ENCODER, STATIC_KSCATEGORY_ENCODER); Yes I was going todo it that way but I saw that many of the others from that header were defined already and with the full string So I didn't want todo it just for this one GUID On Wed, Feb 4, 2015 at 3:18 PM, Jacek Caban ja...@codeweavers.com wrote: Hi Martell, Those patches look good to me now. I just have one suggestion. On 02/04/15 16:14, Martell Malone wrote: 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); I know that it's not what we do in other cases, but something like that would avoid hardcoding this uuid in two places: DEFINE_GUID(KSCATEGORY_ENCODER, STATIC_KSCATEGORY_ENCODER); Thanks, 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 -- 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