aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-12-10 15:01:43 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2017-12-21 19:48:41 +0100
commit4b2a186ef02c1fbe7f7cae30a2bdfff72bcc75f7 (patch)
treeae93acf3e28ad121c3cfbd0c167661a92a5cb960
parent42274db1c623d2c0acd616cc0d3a0e5489e3bdb2 (diff)
downloadffmpeg-4b2a186ef02c1fbe7f7cae30a2bdfff72bcc75f7.tar.gz
avcodec/mpeg4videodec: Add support for parsing and exporting video_range
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/mpeg4video.h3
-rw-r--r--libavcodec/mpeg4videodec.c33
2 files changed, 36 insertions, 0 deletions
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h
index 515b008ae4..0ba502d50b 100644
--- a/libavcodec/mpeg4video.h
+++ b/libavcodec/mpeg4video.h
@@ -43,6 +43,9 @@
#define ACE_VO_TYPE 12
#define ADV_SIMPLE_VO_TYPE 17
+#define VOT_VIDEO_ID 1
+#define VOT_STILL_TEXTURE_ID 2
+
// aspect_ratio_info
#define EXTENDED_PAR 15
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index cdd7077f01..e9cba25dd0 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -1754,6 +1754,37 @@ static int mpeg4_decode_profile_level(MpegEncContext *s, GetBitContext *gb)
return 0;
}
+static int mpeg4_decode_visual_object(MpegEncContext *s, GetBitContext *gb)
+{
+ int visual_object_type;
+ int is_visual_object_identifier = get_bits1(gb);
+
+ if (is_visual_object_identifier) {
+ skip_bits(gb, 4+3);
+ }
+ visual_object_type = get_bits(gb, 4);
+
+ if (visual_object_type == VOT_VIDEO_ID ||
+ visual_object_type == VOT_STILL_TEXTURE_ID) {
+ int video_signal_type = get_bits1(gb);
+ if (video_signal_type) {
+ int video_format = get_bits(gb, 3);
+ int video_range = get_bits1(gb);
+ int color_description = get_bits1(gb);
+
+ s->avctx->color_range = video_range ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG;
+
+ if (color_description) {
+ s->avctx->color_primaries = get_bits(gb, 8);
+ s->avctx->color_trc = get_bits(gb, 8);
+ s->avctx->colorspace = get_bits(gb, 8);
+ }
+ }
+ }
+
+ return 0;
+}
+
static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb)
{
MpegEncContext *s = &ctx->m;
@@ -2684,6 +2715,8 @@ int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb)
mpeg4_decode_gop_header(s, gb);
} else if (startcode == VOS_STARTCODE) {
mpeg4_decode_profile_level(s, gb);
+ } else if (startcode == VISUAL_OBJ_STARTCODE) {
+ mpeg4_decode_visual_object(s, gb);
} else if (startcode == VOP_STARTCODE) {
break;
}