videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

vaapi_h264: Scale log2_max_pic_order_cnt_lsb with max_b_frames 

Before this change, it was possible to overflow pic_order_cnt_lsb and
generate a stream with invalid POC numbering.  This makes sure that
the field is large enough that a single IDR B* P sequence uses fewer
than half the available POC lsb values.
This commit is contained in:
Mark Thompson 2017-01-04 23:05:10 +00:00
parent a3c3a5eac2
commit 89725a8512
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/vaapi_encode_h264.c
View File

@ -800,6 +800,8 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx)
vseq->seq_fields.bits.direct_8x8_inference_flag = 1;
vseq->seq_fields.bits.log2_max_frame_num_minus4 = 4;
vseq->seq_fields.bits.pic_order_cnt_type = 0;
vseq->seq_fields.bits.log2_max_pic_order_cnt_lsb_minus4 =
av_clip(av_log2(avctx->max_b_frames + 1) - 2, 0, 12);
if (avctx->width != ctx->surface_width ||
avctx->height != ctx->surface_height) {