generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

h264: Refactor decode_frame_packing_arrangement

Browse Source 
Directly set the fields when necessary.
This commit is contained in:
Vittorio Giovara 2013-12-13 18:12:59 +01:00
parent 3a149e23d3
commit 3d9fc21e59
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/h264_sei.c
View File

@ -178,35 +178,26 @@ static int decode_buffering_period(H264Context *h)
static int decode_frame_packing_arrangement(H264Context *h) static int decode_frame_packing_arrangement(H264Context *h)
{ {
int cancel;
int quincunx = 0;
int content = -1;
int type = -1;
get_ue_golomb(&h->gb); // frame_packing_arrangement_id get_ue_golomb(&h->gb); // frame_packing_arrangement_id
cancel = get_bits1(&h->gb); // frame_packing_arrangement_cancel_flag h->sei_frame_packing_present = !get_bits1(&h->gb);
if (cancel == 0) {
type = get_bits(&h->gb, 7); // frame_packing_arrangement_type if (h->sei_frame_packing_present) {
quincunx = get_bits1(&h->gb); // quincunx_sampling_flag h->frame_packing_arrangement_type = get_bits(&h->gb, 7);
content = get_bits(&h->gb, 6); // content_interpretation_type h->quincunx_subsampling = get_bits1(&h->gb);
h->content_interpretation_type = get_bits(&h->gb, 6);
// the following skips: spatial_flipping_flag, frame0_flipped_flag, // the following skips: spatial_flipping_flag, frame0_flipped_flag,
// field_views_flag, current_frame_is_frame0_flag, // field_views_flag, current_frame_is_frame0_flag,
// frame0_self_contained_flag, frame1_self_contained_flag // frame0_self_contained_flag, frame1_self_contained_flag
skip_bits(&h->gb, 6); skip_bits(&h->gb, 6);
if (quincunx == 0 && type != 5) if (!h->quincunx_subsampling && h->frame_packing_arrangement_type != 5)
skip_bits(&h->gb, 16); // frame[01]_grid_position_[xy] skip_bits(&h->gb, 16); // frame[01]_grid_position_[xy]
skip_bits(&h->gb, 8); // frame_packing_arrangement_reserved_byte skip_bits(&h->gb, 8); // frame_packing_arrangement_reserved_byte
get_ue_golomb(&h->gb); // frame_packing_arrangement_repetition_period get_ue_golomb(&h->gb); // frame_packing_arrangement_repetition_period
} }
skip_bits1(&h->gb); // frame_packing_arrangement_extension_flag skip_bits1(&h->gb); // frame_packing_arrangement_extension_flag
h->sei_frame_packing_present = (cancel == 0);
h->frame_packing_arrangement_type = type;
h->content_interpretation_type = content;
h->quincunx_subsampling = quincunx;
return 0; return 0;
} }