[FFmpeg-cvslog] vaapi_encode_h264: Only set pic_order_cnt_type to 0 with B-frames

[David Rosca]

ffmpeg | branch: master | David Rosca <nowrep at gmail.com> | Tue Jan 17 12:17:58 2023 +0100| [4e3b6270c6e12537a26cc3c1f1032175fe823eb4] | committer: Haihao Xiang

vaapi_encode_h264: Only set pic_order_cnt_type to 0 with B-frames

v3: pic_order_cnt steps by 2

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4e3b6270c6e12537a26cc3c1f1032175fe823eb4
---

 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 0fe3905666..645f6a978d 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;