v3: pic_order_cnt steps by 2
---
libavcodec/vaapi_encode_h264.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c
index f15bcc6..de0951f 100644
--- a/libavcodec/vaapi_encode_h264.c
+++ b/libavcodec/vaapi_encode_h264.c
@@ -361,8 +361,10 @@ static int
vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx)
sps->chroma_format_idc = 1;
sps->log2_max_frame_num_minus4 = 4;
- sps->pic_order_cnt_type = 0;
- sps->log2_max_pic_order_cnt_lsb_minus4 = 4;
+ sps->pic_order_cnt_type = ctx->max_b_depth ? 0 : 2;
+ if (sps->pic_order_cnt_type == 0) {
+ sps->log2_max_pic_order_cnt_lsb_minus4 = 4;
+ }
sps->max_num_ref_frames = priv->dpb_frames;
@@ -643,6 +645,10 @@ static int
vaapi_encode_h264_init_picture_params(AVCodecContext *avctx,
}
}
hpic->pic_order_cnt = pic->display_order - hpic->last_idr_frame;
+ if (priv->raw_sps.pic_order_cnt_type == 2) {
+ hpic->pic_order_cnt *= 2;
+ }
+
hpic->dpb_delay = pic->display_order - pic->encode_order +
ctx->max_b_depth;
hpic->cpb_delay = pic->encode_order - hpic->last_idr_frame;
--
2.39.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
