diff options
| -rw-r--r-- | common/includes/moreuuids.h | 32 | ||||
| -rw-r--r-- | decoder/LAVVideo/Media.cpp | 16 |
2 files changed, 48 insertions, 0 deletions
diff --git a/common/includes/moreuuids.h b/common/includes/moreuuids.h index aa8a6273..3c2c3afc 100644 --- a/common/includes/moreuuids.h +++ b/common/includes/moreuuids.h @@ -1126,22 +1126,54 @@ DEFINE_GUID(MEDIASUBTYPE_DVPP, DEFINE_GUID(MEDIASUBTYPE_DV5P, 0x70357664, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); +// 6E357664-0000-0010-8000-00AA00389B71 +DEFINE_GUID(MEDIASUBTYPE_DV5N, + 0x6E357664, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + // 70637664-0000-0010-8000-00AA00389B71 DEFINE_GUID(MEDIASUBTYPE_DVC, 0x20637664, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); +// 31687664-0000-0010-8000-00AA00389B71 +DEFINE_GUID(MEDIASUBTYPE_DVH1, + 0x31687664, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + +// 32687664-0000-0010-8000-00AA00389B71 +DEFINE_GUID(MEDIASUBTYPE_DVH2, + 0x32687664, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + // 33687664-0000-0010-8000-00AA00389B71 DEFINE_GUID(MEDIASUBTYPE_DVH3, 0x33687664, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); +// 34687664-0000-0010-8000-00AA00389B71 +DEFINE_GUID(MEDIASUBTYPE_DVH4, + 0x34687664, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + // 35687664-0000-0010-8000-00AA00389B71 DEFINE_GUID(MEDIASUBTYPE_DVH5, 0x35687664, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); +// 36687664-0000-0010-8000-00AA00389B71 +DEFINE_GUID(MEDIASUBTYPE_DVH6, + 0x36687664, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + +// 71687664-0000-0010-8000-00AA00389B71 +DEFINE_GUID(MEDIASUBTYPE_DVHQ, + 0x71687664, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + +// 70687664-0000-0010-8000-00AA00389B71 +DEFINE_GUID(MEDIASUBTYPE_DVHP, + 0x70687664, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + // 76645641-0000-0010-8000-00AA00389B71 DEFINE_GUID(MEDIASUBTYPE_AVdv, 0x76645641, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); +// 31645641-0000-0010-8000-00AA00389B71 +DEFINE_GUID(MEDIASUBTYPE_AVd1, + 0x31645641, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + // 31535046-0000-0010-8000-00AA00389B71 DEFINE_GUID(MEDIASUBTYPE_FPS1, 0x31535046, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); diff --git a/decoder/LAVVideo/Media.cpp b/decoder/LAVVideo/Media.cpp index c613495e..e32a233b 100644 --- a/decoder/LAVVideo/Media.cpp +++ b/decoder/LAVVideo/Media.cpp @@ -152,11 +152,19 @@ static const FFMPEG_SUBTYPE_MAP lavc_video_codecs[] = { { &MEDIASUBTYPE_DV50, AV_CODEC_ID_DVVIDEO }, { &MEDIASUBTYPE_DVCP, AV_CODEC_ID_DVVIDEO }, { &MEDIASUBTYPE_DV5P, AV_CODEC_ID_DVVIDEO }, + { &MEDIASUBTYPE_DV5N, AV_CODEC_ID_DVVIDEO }, { &MEDIASUBTYPE_DVPP, AV_CODEC_ID_DVVIDEO }, { &MEDIASUBTYPE_DVC, AV_CODEC_ID_DVVIDEO }, + { &MEDIASUBTYPE_DVH1, AV_CODEC_ID_DVVIDEO }, + { &MEDIASUBTYPE_DVH2, AV_CODEC_ID_DVVIDEO }, { &MEDIASUBTYPE_DVH3, AV_CODEC_ID_DVVIDEO }, + { &MEDIASUBTYPE_DVH4, AV_CODEC_ID_DVVIDEO }, { &MEDIASUBTYPE_DVH5, AV_CODEC_ID_DVVIDEO }, + { &MEDIASUBTYPE_DVH6, AV_CODEC_ID_DVVIDEO }, + { &MEDIASUBTYPE_DVHQ, AV_CODEC_ID_DVVIDEO }, + { &MEDIASUBTYPE_DVHP, AV_CODEC_ID_DVVIDEO }, { &MEDIASUBTYPE_AVdv, AV_CODEC_ID_DVVIDEO }, + { &MEDIASUBTYPE_AVd1, AV_CODEC_ID_DVVIDEO }, // Misc Formats { &MEDIASUBTYPE_SVQ1, AV_CODEC_ID_SVQ1 }, @@ -363,11 +371,19 @@ const AMOVIESETUP_MEDIATYPE CLAVVideo::sudPinTypesIn[] = { { &MEDIATYPE_Video, &MEDIASUBTYPE_DV50 }, { &MEDIATYPE_Video, &MEDIASUBTYPE_DVCP }, { &MEDIATYPE_Video, &MEDIASUBTYPE_DV5P }, + { &MEDIATYPE_Video, &MEDIASUBTYPE_DV5N }, { &MEDIATYPE_Video, &MEDIASUBTYPE_DVPP }, { &MEDIATYPE_Video, &MEDIASUBTYPE_DVC }, + { &MEDIATYPE_Video, &MEDIASUBTYPE_DVH1 }, + { &MEDIATYPE_Video, &MEDIASUBTYPE_DVH2 }, { &MEDIATYPE_Video, &MEDIASUBTYPE_DVH3 }, + { &MEDIATYPE_Video, &MEDIASUBTYPE_DVH4 }, { &MEDIATYPE_Video, &MEDIASUBTYPE_DVH5 }, + { &MEDIATYPE_Video, &MEDIASUBTYPE_DVH6 }, + { &MEDIATYPE_Video, &MEDIASUBTYPE_DVHQ }, + { &MEDIATYPE_Video, &MEDIASUBTYPE_DVHP }, { &MEDIATYPE_Video, &MEDIASUBTYPE_AVdv }, + { &MEDIATYPE_Video, &MEDIASUBTYPE_AVd1 }, // Misc Formats { &MEDIATYPE_Video, &MEDIASUBTYPE_SVQ1 }, |