diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-12-17 19:11:15 +0400 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-12-17 19:11:15 +0400 |
| commit | 9a4471ac8fc1a44c6e4af4d363ce01088c957032 (patch) | |
| tree | 0a853f31ec5ec388109bdca2b0d3ab7156fb460b | |
| parent | 1add067e81854052da137bbc595dc241f7a54153 (diff) | |
Add support for Intel H263
| -rw-r--r-- | common/includes/moreuuids.h | 8 | ||||
| -rw-r--r-- | decoder/LAVVideo/Media.cpp | 6 | ||||
| -rw-r--r-- | demuxer/Demuxers/LAVFVideoHelper.cpp | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/common/includes/moreuuids.h b/common/includes/moreuuids.h index 7d11f207..2e93ba38 100644 --- a/common/includes/moreuuids.h +++ b/common/includes/moreuuids.h @@ -903,6 +903,14 @@ DEFINE_GUID(MEDIASUBTYPE_H263, DEFINE_GUID(MEDIASUBTYPE_h263, 0x33363268, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +// 33363249-0000-0010-8000-00AA00389B71 +DEFINE_GUID(MEDIASUBTYPE_I263, + 0x33363249, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); + +// 33363269-0000-0010-8000-00AA00389B71 +DEFINE_GUID(MEDIASUBTYPE_i263, + 0x33363269, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); + // 31363248-0000-0010-8000-00AA00389B71 DEFINE_GUID(MEDIASUBTYPE_H261, 0x31363248, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); diff --git a/decoder/LAVVideo/Media.cpp b/decoder/LAVVideo/Media.cpp index 7456d5c1..0c815a80 100644 --- a/decoder/LAVVideo/Media.cpp +++ b/decoder/LAVVideo/Media.cpp @@ -157,6 +157,8 @@ static const FFMPEG_SUBTYPE_MAP lavc_video_codecs[] = { { &MEDIASUBTYPE_h263, AV_CODEC_ID_H263 }, { &MEDIASUBTYPE_S263, AV_CODEC_ID_H263 }, { &MEDIASUBTYPE_s263, AV_CODEC_ID_H263 }, + { &MEDIASUBTYPE_I263, AV_CODEC_ID_H263I }, + { &MEDIASUBTYPE_i263, AV_CODEC_ID_H263I }, { &MEDIASUBTYPE_THEORA, AV_CODEC_ID_THEORA }, { &MEDIASUBTYPE_theora, AV_CODEC_ID_THEORA }, { &MEDIASUBTYPE_TSCC, AV_CODEC_ID_TSCC }, @@ -355,6 +357,8 @@ const AMOVIESETUP_MEDIATYPE CLAVVideo::sudPinTypesIn[] = { { &MEDIATYPE_Video, &MEDIASUBTYPE_h263 }, { &MEDIATYPE_Video, &MEDIASUBTYPE_S263 }, { &MEDIATYPE_Video, &MEDIASUBTYPE_s263 }, + { &MEDIATYPE_Video, &MEDIASUBTYPE_I263 }, + { &MEDIATYPE_Video, &MEDIASUBTYPE_i263 }, { &MEDIATYPE_Video, &MEDIASUBTYPE_THEORA }, { &MEDIATYPE_Video, &MEDIASUBTYPE_theora }, { &MEDIATYPE_Video, &MEDIASUBTYPE_TSCC }, @@ -465,7 +469,7 @@ static codec_config_t m_codec_config[] = { { 3, { AV_CODEC_ID_VP6, AV_CODEC_ID_VP6A, AV_CODEC_ID_VP6F }}, // Codec_VP6 { 2, { AV_CODEC_ID_SVQ1, AV_CODEC_ID_SVQ3 }, "svq", "SVQ 1 / SVQ 3"}, // Codec_SVQ { 1, { AV_CODEC_ID_H261 }}, // Codec_H261 - { 1, { AV_CODEC_ID_H263 }}, // Codec_H263 + { 2, { AV_CODEC_ID_H263, AV_CODEC_ID_H263I }}, // Codec_H263 { 3, { AV_CODEC_ID_INDEO3, AV_CODEC_ID_INDEO4, AV_CODEC_ID_INDEO5 }, "indeo", "Intel Indeo 3/4/5"}, // Codec_Indeo { 1, { AV_CODEC_ID_TSCC }}, // Codec_TSCC { 1, { AV_CODEC_ID_FRAPS }}, // Codec_Fraps diff --git a/demuxer/Demuxers/LAVFVideoHelper.cpp b/demuxer/Demuxers/LAVFVideoHelper.cpp index 23f68f0a..db3f0703 100644 --- a/demuxer/Demuxers/LAVFVideoHelper.cpp +++ b/demuxer/Demuxers/LAVFVideoHelper.cpp @@ -38,7 +38,7 @@ CLAVFVideoHelper g_VideoHelper; // Map codec ids to media subtypes static FormatMapping video_map[] = { { AV_CODEC_ID_H263, &MEDIASUBTYPE_H263, NULL, NULL }, - { AV_CODEC_ID_H263I, &MEDIASUBTYPE_H263, NULL, NULL }, + { AV_CODEC_ID_H263I, &MEDIASUBTYPE_I263, NULL, NULL }, { AV_CODEC_ID_H264, &MEDIASUBTYPE_AVC1, MKTAG('A','V','C','1'), &FORMAT_MPEG2Video }, { AV_CODEC_ID_MPEG1VIDEO, &MEDIASUBTYPE_MPEG1Payload, NULL, &FORMAT_MPEGVideo }, { AV_CODEC_ID_MPEG2VIDEO, &MEDIASUBTYPE_MPEG2_VIDEO, NULL, &FORMAT_MPEG2Video }, |