diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-12 14:47:01 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-12 14:47:01 +0300 |
| commit | 3e97cb59ecb0f486fbab572fbf7e1f4066efdba3 (patch) | |
| tree | 41f84949241df28c6e0a4494a853f82cd22d5e49 /decoder | |
| parent | 536db2510037bf3cd660ce1d9ad9981e9bf4f757 (diff) | |
Add experimental support for CineformHD decoding
Diffstat (limited to 'decoder')
| -rw-r--r-- | decoder/LAVVideo/LAVVideo.cpp | 1 | ||||
| -rw-r--r-- | decoder/LAVVideo/LAVVideoSettings.h | 1 | ||||
| -rw-r--r-- | decoder/LAVVideo/Media.cpp | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/decoder/LAVVideo/LAVVideo.cpp b/decoder/LAVVideo/LAVVideo.cpp index 5311221d..43a28c46 100644 --- a/decoder/LAVVideo/LAVVideo.cpp +++ b/decoder/LAVVideo/LAVVideo.cpp @@ -144,6 +144,7 @@ HRESULT CLAVVideo::LoadDefaults() m_settings.bFormats[Codec_RV12] = FALSE; m_settings.bFormats[Codec_QPEG] = FALSE; m_settings.bFormats[Codec_MSRLE] = FALSE; + m_settings.bFormats[Codec_CineformHD] = FALSE; m_settings.bDVDVideo = TRUE; m_settings.bMSWMV9DMO = TRUE; diff --git a/decoder/LAVVideo/LAVVideoSettings.h b/decoder/LAVVideo/LAVVideoSettings.h index 2134a39b..7730e777 100644 --- a/decoder/LAVVideo/LAVVideoSettings.h +++ b/decoder/LAVVideo/LAVVideoSettings.h @@ -88,6 +88,7 @@ typedef enum LAVVideoCodec { Codec_TrueMotion, Codec_VP7, Codec_H264MVC, + Codec_CineformHD, Codec_VideoNB // Number of entries (do not use when dynamically linking) } LAVVideoCodec; diff --git a/decoder/LAVVideo/Media.cpp b/decoder/LAVVideo/Media.cpp index 20148f90..4b7c4428 100644 --- a/decoder/LAVVideo/Media.cpp +++ b/decoder/LAVVideo/Media.cpp @@ -265,6 +265,7 @@ static const FFMPEG_SUBTYPE_MAP lavc_video_codecs[] = { { &MEDIASUBTYPE_icod, AV_CODEC_ID_AIC }, { &MEDIASUBTYPE_DUCK, AV_CODEC_ID_TRUEMOTION1 }, { &MEDIASUBTYPE_TM20, AV_CODEC_ID_TRUEMOTION2 }, + { &MEDIASUBTYPE_CFHD, AV_CODEC_ID_CFHD }, // Game Formats { &MEDIASUBTYPE_BIKI, AV_CODEC_ID_BINKVIDEO }, @@ -524,6 +525,7 @@ const AMOVIESETUP_MEDIATYPE CLAVVideo::sudPinTypesIn[] = { { &MEDIATYPE_Video, &MEDIASUBTYPE_icod }, { &MEDIATYPE_Video, &MEDIASUBTYPE_DUCK }, { &MEDIATYPE_Video, &MEDIASUBTYPE_TM20 }, + { &MEDIATYPE_Video, &MEDIASUBTYPE_CFHD }, // Game Formats { &MEDIATYPE_Video, &MEDIASUBTYPE_BIKI }, @@ -630,6 +632,7 @@ static codec_config_t m_codec_config[] = { { 2, { AV_CODEC_ID_TRUEMOTION1, AV_CODEC_ID_TRUEMOTION2 }, "truemotion", "Duck TrueMotion 1/2"}, // Codec_TrueMotion { 1, { AV_CODEC_ID_VP7 }}, // Codec_VP7 { 1, { AV_CODEC_ID_H264_MVC }, "h264mvc", "H.264 MVC 3D" }, // Codec_H264MVC + { 1, { AV_CODEC_ID_CFHD }, "cfhd", "Cineform HD (experimental)" }, // Codec_CineformHD }; const codec_config_t *get_codec_config(LAVVideoCodec codec) |