diff mbox

[FFmpeg-devel,V2] lavc/vaapi_encode_h264: correct VUI max_dec_frame_buffering setting.

Message ID 204e3653-8e02-a603-690a-5b69dec37d6c@gmail.com
State New
Headers show

Commit Message

Jun Zhao Oct. 24, 2017, 6:02 a.m. UTC 
From 24b8e1c70fd4bf4eb76404fd9e2020fe3bbd90cb Mon Sep 17 00:00:00 2001
From: Jun Zhao <jun.zhao@intel.com>
Date: Tue, 24 Oct 2017 13:25:21 +0800
Subject: [PATCH V2] lavc/vaapi_encode_h264: correct VUI
 max_dec_frame_buffering setting.

vseq.max_num_ref_frames not init before the VUI
max_dec_frame_buffering setting, so use sps.max_num_ref_frames
in this case.

Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Signed-off-by: Wang, Yi A <yi.a.wang@intel.com>
---
 libavcodec/vaapi_encode_h264.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mark Thompson Oct. 24, 2017, 10:15 p.m. UTC | #1 
On 24/10/17 07:02, Jun Zhao wrote:
> From 24b8e1c70fd4bf4eb76404fd9e2020fe3bbd90cb Mon Sep 17 00:00:00 2001
> From: Jun Zhao <jun.zhao@intel.com>
> Date: Tue, 24 Oct 2017 13:25:21 +0800
> Subject: [PATCH V2] lavc/vaapi_encode_h264: correct VUI
>  max_dec_frame_buffering setting.
> 
> vseq.max_num_ref_frames not init before the VUI
> max_dec_frame_buffering setting, so use sps.max_num_ref_frames
> in this case.
> 
> Signed-off-by: Jun Zhao <jun.zhao@intel.com>
> Signed-off-by: Wang, Yi A <yi.a.wang@intel.com>
> ---
>  libavcodec/vaapi_encode_h264.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c
> index 9a4bd53da1..1d43e934ef 100644
> --- a/libavcodec/vaapi_encode_h264.c
> +++ b/libavcodec/vaapi_encode_h264.c
> @@ -441,7 +441,7 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx)
>      sps->vui.log2_max_mv_length_horizontal = 16;
>      sps->vui.log2_max_mv_length_vertical   = 16;
>      sps->vui.max_num_reorder_frames        = (ctx->b_per_p > 0);
> -    sps->vui.max_dec_frame_buffering       = vseq->max_num_ref_frames;
> +    sps->vui.max_dec_frame_buffering       = sps->max_num_ref_frames;
>  
>      pps->nal_unit_header.nal_ref_idc = 3;
>      pps->nal_unit_header.nal_unit_type = H264_NAL_PPS;
> -- 
> 2.14.1
> 

LGTM, applied.

Thanks,

- Mark
diff mbox

Patch

diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c
index 9a4bd53da1..1d43e934ef 100644
--- a/libavcodec/vaapi_encode_h264.c
+++ b/libavcodec/vaapi_encode_h264.c
@@ -441,7 +441,7 @@  static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx)
     sps->vui.log2_max_mv_length_horizontal = 16;
     sps->vui.log2_max_mv_length_vertical   = 16;
     sps->vui.max_num_reorder_frames        = (ctx->b_per_p > 0);
-    sps->vui.max_dec_frame_buffering       = vseq->max_num_ref_frames;
+    sps->vui.max_dec_frame_buffering       = sps->max_num_ref_frames;
 
     pps->nal_unit_header.nal_ref_idc = 3;
     pps->nal_unit_header.nal_unit_type = H264_NAL_PPS;