highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/mpeg4videodec: Add support for parsing and exporting video_range

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2017-12-10 15:01:43 +01:00
parent 42274db1c6
commit 4b2a186ef0
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/mpeg4video.h
View File

@ -43,6 +43,9 @@
#define ACE_VO_TYPE 12 #define ACE_VO_TYPE 12
#define ADV_SIMPLE_VO_TYPE 17 #define ADV_SIMPLE_VO_TYPE 17
#define VOT_VIDEO_ID 1
#define VOT_STILL_TEXTURE_ID 2
// aspect_ratio_info // aspect_ratio_info
#define EXTENDED_PAR 15 #define EXTENDED_PAR 15

33
libavcodec/mpeg4videodec.c
View File

@ -1754,6 +1754,37 @@ static int mpeg4_decode_profile_level(MpegEncContext *s, GetBitContext *gb)
return 0; 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) static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb)
{ {
MpegEncContext *s = &ctx->m; MpegEncContext *s = &ctx->m;
@ -2684,6 +2715,8 @@ int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb)
mpeg4_decode_gop_header(s, gb); mpeg4_decode_gop_header(s, gb);
} else if (startcode == VOS_STARTCODE) { } else if (startcode == VOS_STARTCODE) {
mpeg4_decode_profile_level(s, gb); mpeg4_decode_profile_level(s, gb);
} else if (startcode == VISUAL_OBJ_STARTCODE) {
mpeg4_decode_visual_object(s, gb);
} else if (startcode == VOP_STARTCODE) { } else if (startcode == VOP_STARTCODE) {
break; break;
} }