From 66760060b3012eebe646fe00efc642fb9d812698 Mon Sep 17 00:00:00 2001 From: Hidenori Takeshima Date: Wed, 20 Mar 2002 22:49:01 +0000 Subject: [PATCH] Added some missing GUIDs. --- include/uuids.h | 89 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 73 insertions(+), 16 deletions(-) diff --git a/include/uuids.h b/include/uuids.h index 2f38951689f..47b6cea1572 100644 --- a/include/uuids.h +++ b/include/uuids.h @@ -46,7 +46,14 @@ OUR_GUID_ENTRY(MEDIATYPE_Midi,0x7364696D, OUR_GUID_ENTRY(MEDIATYPE_URL_STREAM,0x736c7275, 0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71) -OUR_GUID_ENTRY(MEDIATYPE_Stream,0xe436eb83,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) +OUR_GUID_ENTRY(MEDIATYPE_Stream, + 0xe436eb83,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) +OUR_GUID_ENTRY(MEDIATYPE_MPEG1SystemStream, + 0xE436EB82,0x524F,0x11CE,0x9F,0x53,0x00,0x20,0xAF,0x0B,0xA7,0x70) +OUR_GUID_ENTRY(MEDIATYPE_MPEG2_PES, + 0xE06D8020,0xDB46,0x11CF,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA) +OUR_GUID_ENTRY(MEDIATYPE_DVD_ENCRYPTED_PACK, + 0xED0B916A,0x044D,0x11D1,0xAA,0x78,0x00,0xC0,0x4F,0xC3,0x1D,0x60) /* --- Media SubType --- */ @@ -74,26 +81,38 @@ OUR_GUID_ENTRY(MEDIASUBTYPE_YV12,0x32315659, 0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71) /* RGB */ -OUR_GUID_ENTRY(MEDIASUBTYPE_RGB1,0xe436eb78,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_RGB4,0xe436eb79,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_RGB8,0xe436eb7a,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_RGB555,0xe436eb7c,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_RGB565,0xe436eb7b,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_RGB24,0xe436eb7d,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_RGB32,0xe436eb7e,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_ARGB32,0x773c9ac0,0x3274,0x11d0,0xb7,0x24,0x00,0xaa,0x00,0x6c,0x1a,0x01) +OUR_GUID_ENTRY(MEDIASUBTYPE_RGB1, + 0xe436eb78,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_RGB4, + 0xe436eb79,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_RGB8, + 0xe436eb7a,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_RGB555, + 0xe436eb7c,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_RGB565, + 0xe436eb7b,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_RGB24, + 0xe436eb7d,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_RGB32, + 0xe436eb7e,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_ARGB32, + 0x773c9ac0,0x3274,0x11d0,0xb7,0x24,0x00,0xaa,0x00,0x6c,0x1a,0x01) /* Audio */ OUR_GUID_ENTRY(MEDIASUBTYPE_PCM,0x00000001, 0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71) /* Stream */ -OUR_GUID_ENTRY(MEDIASUBTYPE_Avi,0xe436eb88,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_QTMovie,0xE436EB89,0x524F,0x11CE,0x9F,0x53,0x00,0x20,0xAF,0x0B,0xA7,0x70) -OUR_GUID_ENTRY(MEDIATYPE_MPEG1SystemStream,0xE436EB82,0x524F,0x11CE,0x9F,0x53,0x00,0x20,0xAF,0x0B,0xA7,0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_WAVE,0xe436eb8b,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_AU,0xe436eb8c,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) -OUR_GUID_ENTRY(MEDIASUBTYPE_AIFF,0xe436eb8d,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_Avi, + 0xe436eb88,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_QTMovie, + 0xE436EB89,0x524F,0x11CE,0x9F,0x53,0x00,0x20,0xAF,0x0B,0xA7,0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_WAVE, + 0xe436eb8b,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_AU, + 0xe436eb8c,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_AIFF, + 0xe436eb8d,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70) OUR_GUID_ENTRY(MEDIASUBTYPE_QTRpza, 0x617A7072,0x0000,0x0010,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71) @@ -116,6 +135,20 @@ OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG1Payload, 0xE436EB81,0x524F,0x11CE,0x9F,0x53,0x00,0x20,0xAF,0x0B,0xA7,0x70) OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG1AudioPayload, 0x00000050,0x0000,0x0010,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_PROGRAM, + 0xE06D8022,0xDB46,0x11CF,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_TRANSPORT, + 0xE06D8023,0xDB46,0x11CF,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_VIDEO, + 0xE06D8026,0xDB46,0x11CF,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_SUBPICTURE, + 0xE06D802D,0xDB46,0x11CF,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_AUDIO, + 0xE06D802B,0xDB46,0x11CF,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_DOLBY_AC3, + 0xE06D802C,0xDB46,0x11CF,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_LPCM_AUDIO, + 0xE06D8032,0xDB46,0x11CF,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA) /* --- Format Type --- */ @@ -127,7 +160,20 @@ OUR_GUID_ENTRY(FORMAT_VideoInfo2, 0xf72a76A0,0xeb0a,0x11d0,0xac,0xe4,0x00,0x00,0xc0,0xcc,0x16,0xba) OUR_GUID_ENTRY(FORMAT_WaveFormatEx, 0x05589f81,0xc356,0x11ce,0xbf,0x01,0x00,0xaa,0x00,0x55,0x59,0x5a) - +OUR_GUID_ENTRY(FORMAT_MPEGVideo, + 0x05589F82,0xC356,0x11CE,0xBF,0x01,0x00,0xAA,0x00,0x55,0x59,0x5A) +OUR_GUID_ENTRY(FORMAT_MPEGStreams, + 0x05589F83,0xC356,0x11CE,0xBF,0x01,0x00,0xAA,0x00,0x55,0x59,0x5A) +OUR_GUID_ENTRY(FORMAT_MPEG2Video, + 0xE06D80E3,0xDB46,0x11CF,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA) +OUR_GUID_ENTRY(FORMAT_MPEG2Audio, + 0xE06D80E5,0xDB46,0x11CF,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA) +OUR_GUID_ENTRY(FORMAT_DolbyAC3, + 0xE06D80E4,0xDB46,0x11CF,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA) +OUR_GUID_ENTRY(FORMAT_DVD_LPCMAudio, + 0xE06D80E6,0xDB46,0x11CF,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA) +#define FORMAT_VIDEOINFO2 FORMAT_VideoInfo2 +#define FORMAT_MPEG2_VIDEO FORMAT_MPEG2Video /* --- CLSIDs --- */ @@ -266,6 +312,17 @@ OUR_GUID_ENTRY(TIME_FORMAT_SAMPLE, 0x7B785572,0x8C82,0x11CF,0xBC,0x0C,0x00,0xAA,0x00,0xAC,0x74,0xF6) +/* Pin categories */ +OUR_GUID_ENTRY(PIN_CATEGORY_ANALOGVIDEOIN, + 0xFB6C4283,0x0353,0x11D1,0x90,0x5F,0x00,0x00,0xC0,0xCC,0x16,0xBA) +OUR_GUID_ENTRY(PIN_CATEGORY_CAPTURE, + 0xFB6C4281,0x0353,0x11D1,0x90,0x5F,0x00,0x00,0xC0,0xCC,0x16,0xBA) +OUR_GUID_ENTRY(PIN_CATEGORY_PREVIEW, + 0xFB6C4282,0x0353,0x11D1,0x90,0x5F,0x00,0x00,0xC0,0xCC,0x16,0xBA) +OUR_GUID_ENTRY(PIN_CATEGORY_STILL, + 0xFB6C428A,0x0353,0x11D1,0x90,0x5F,0x00,0x00,0xC0,0xCC,0x16,0xBA) + + #undef OUR_GUID_ENTRY #endif /* __WINE_DSHOW_UUIDS_H */