diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-09 18:34:09 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2017-08-04 20:18:33 +0300 |
| commit | a3240934b49732042f6f077ec1c5ece28c28df4f (patch) | |
| tree | bda5c902b61ff244a2dbc479b35dabbc97f16b5d | |
| parent | 1e94b5793eb45399927bac7bb60d8d6376243e51 (diff) | |
avcodec: add h264_mvc codec id and profiles
| -rw-r--r-- | libavcodec/avcodec.h | 4 | ||||
| -rw-r--r-- | libavcodec/codec_desc.c | 7 | ||||
| -rw-r--r-- | libavcodec/profiles.c | 1 | ||||
| -rw-r--r-- | libavformat/mpegts.c | 2 |
4 files changed, 13 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 125017c5ed..c98239ea0f 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -448,6 +448,8 @@ enum AVCodecID { AV_CODEC_ID_SVG, AV_CODEC_ID_GDV, + AV_CODEC_ID_H264_MVC, + /* various PCM "codecs" */ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs AV_CODEC_ID_PCM_S16LE = 0x10000, @@ -3300,11 +3302,13 @@ typedef struct AVCodecContext { #define FF_PROFILE_H264_HIGH_422 122 #define FF_PROFILE_H264_HIGH_422_INTRA (122|FF_PROFILE_H264_INTRA) #define FF_PROFILE_H264_STEREO_HIGH 128 +#define FF_PROFILE_H264_MULTIVIEW_HIGH_DEPTH 138 #define FF_PROFILE_H264_HIGH_444 144 #define FF_PROFILE_H264_HIGH_444_PREDICTIVE 244 #define FF_PROFILE_H264_HIGH_444_INTRA (244|FF_PROFILE_H264_INTRA) #define FF_PROFILE_H264_CAVLC_444 44 + #define FF_PROFILE_VC1_SIMPLE 0 #define FF_PROFILE_VC1_MAIN 1 #define FF_PROFILE_VC1_COMPLEX 2 diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 6f43b68b83..25b9f6d3a5 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1658,6 +1658,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_LOSSLESS, .mime_types= MT("image/png"), }, + { + .id = AV_CODEC_ID_H264_MVC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "h264_mvc", + .long_name = NULL_IF_CONFIG_SMALL("H264 MVC"), + .props = AV_CODEC_PROP_LOSSY, + }, /* various PCM "codecs" */ { diff --git a/libavcodec/profiles.c b/libavcodec/profiles.c index 30498efedf..9d3cf4b535 100644 --- a/libavcodec/profiles.c +++ b/libavcodec/profiles.c @@ -72,6 +72,7 @@ const AVProfile ff_h264_profiles[] = { { FF_PROFILE_H264_CAVLC_444, "CAVLC 4:4:4" }, { FF_PROFILE_H264_MULTIVIEW_HIGH, "Multiview High" }, { FF_PROFILE_H264_STEREO_HIGH, "Stereo High" }, + { FF_PROFILE_H264_MULTIVIEW_HIGH_DEPTH, "Multiview High Depth" }, { FF_PROFILE_UNKNOWN }, }; diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index eb8d4cd7fb..f64b036c15 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -689,7 +689,7 @@ static const StreamType ISO_types[] = { #endif { 0x1b, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264 }, { 0x1c, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AAC }, - { 0x20, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264 }, + { 0x20, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264_MVC }, { 0x21, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_JPEG2000 }, { 0x24, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_HEVC }, { 0x42, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_CAVS }, |