diff options
| author | Boris Brezillon | 2019-05-22 14:44:22 +0200 |
|---|---|---|
| committer | Paul Kocialkowski | 2020-06-05 15:28:49 +0200 |
| commit | 815d0a9a634ed865caba6aa0de2115bca123ba51 (patch) | |
| tree | f3714c731a5c021408499d50e696afe7c863526a | |
| parent | 2b8626604e4a11818ce7ca22339674531758d25f (diff) | |
avcodec/h264: parse ref_pic_marking_size_in_bits and pic_order_cnt_bit_size
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
| -rw-r--r-- | libavcodec/h264_slice.c | 6 | ||||
| -rw-r--r-- | libavcodec/h264dec.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 162501243e..1da472ea45 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1731,7 +1731,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, unsigned int slice_type, tmp, i; int field_pic_flag, bottom_field_flag; int first_slice = sl == h->slice_ctx && !h->current_slice; - int picture_structure; + int picture_structure, pos; if (first_slice) av_assert0(!h->setup_finished); @@ -1821,6 +1821,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, if (nal->type == H264_NAL_IDR_SLICE) sl->idr_pic_id = get_ue_golomb_long(&sl->gb); + pos = sl->gb.index; if (sps->poc_type == 0) { sl->poc_lsb = get_bits(&sl->gb, sps->log2_max_poc_lsb); @@ -1834,6 +1835,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, if (pps->pic_order_present == 1 && picture_structure == PICT_FRAME) sl->delta_poc[1] = get_se_golomb(&sl->gb); } + sl->pic_order_cnt_bit_size = sl->gb.index - pos; sl->redundant_pic_count = 0; if (pps->redundant_pic_cnt_present) @@ -1873,9 +1875,11 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, sl->explicit_ref_marking = 0; if (nal->ref_idc) { + int bit_pos = sl->gb.index; ret = ff_h264_decode_ref_pic_marking(sl, &sl->gb, nal, h->avctx); if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE)) return AVERROR_INVALIDDATA; + sl->ref_pic_marking_size_in_bits = sl->gb.index - bit_pos; } if (sl->slice_type_nos != AV_PICTURE_TYPE_I && pps->cabac) { diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 332e4bfb83..ec71e22cec 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -324,11 +324,13 @@ typedef struct H264SliceContext { MMCO mmco[MAX_MMCO_COUNT]; int nb_mmco; int explicit_ref_marking; + int ref_pic_marking_size_in_bits; int frame_num; int poc_lsb; int delta_poc_bottom; int delta_poc[2]; + int pic_order_cnt_bit_size; int curr_pic_num; int max_pic_num; } H264SliceContext; |