LGTM.
On Fri, Dec 13, 2013 at 5:39 PM, Luca Barbato <lu_z...@gentoo.org> wrote:
> Directly set the fields when necessary.
> ---
>
> And also fix the correct warning from clang.
>
> libavcodec/hevc_sei.c | 19 +++++++------------
> 1 file changed, 7 insertions(+), 12 deletions(-)
>
> diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c
> index eed7b33..b011596 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)
> --
> 1.8.5.1
>
> _______________________________________________
> libav-devel mailing list
> libav-devel@libav.org
> https://lists.libav.org/mailman/listinfo/libav-devel
>
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
