diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-12-13 15:39:45 +0000 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2013-12-17 09:34:08 +0100 |
| commit | 3a149e23d37f06d49ab0bb013a3b9cb0224bba5c (patch) | |
| tree | a48a15a4ba46a1ad4d5a639646e0786389a472aa /libavcodec | |
| parent | cfb4ee30977732674d30c20e93a761c33c743972 (diff) | |
| download | ffmpeg-3a149e23d37f06d49ab0bb013a3b9cb0224bba5c.tar.gz | |
hevc: Refactor decode_nal_sei_frame_packing_arrangement
Directly set the fields when necessary.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/hevc_sei.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index eed7b335f8..b011596599 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -49,31 +49,26 @@ static void decode_nal_sei_decoded_picture_hash(HEVCContext *s) static void decode_nal_sei_frame_packing_arrangement(HEVCContext *s) { GetBitContext *gb = &s->HEVClc.gb; - int cancel, type, quincunx, content; get_ue_golomb(gb); // frame_packing_arrangement_id - cancel = get_bits1(gb); // frame_packing_cancel_flag - if (cancel == 0) { - type = get_bits(gb, 7); // frame_packing_arrangement_type - quincunx = get_bits1(gb); // quincunx_sampling_flag - content = get_bits(gb, 6); // content_interpretation_type + s->sei_frame_packing_present = !get_bits1(gb); + + if (s->sei_frame_packing_present) { + s->frame_packing_arrangement_type = get_bits(gb, 7); + s->quincunx_subsampling = get_bits1(gb); + s->content_interpretation_type = get_bits(gb, 6); // the following skips spatial_flipping_flag frame0_flipped_flag // field_views_flag current_frame_is_frame0_flag // frame0_self_contained_flag frame1_self_contained_flag skip_bits(gb, 6); - if (quincunx == 0 && type != 5) + if (!s->quincunx_subsampling && s->frame_packing_arrangement_type != 5) skip_bits(gb, 16); // frame[01]_grid_position_[xy] skip_bits(gb, 8); // frame_packing_arrangement_reserved_byte skip_bits1(gb); // frame_packing_arrangement_persistance_flag } skip_bits1(gb); // upsampled_aspect_ratio_flag - - s->sei_frame_packing_present = (cancel == 0); - s->frame_packing_arrangement_type = type; - s->content_interpretation_type = content; - s->quincunx_subsampling = quincunx; } static int decode_nal_sei_message(HEVCContext *s) |