diff mbox series

[FFmpeg-devel,v2] libavcodec/qsvenc.c: Enable MFX_GOP_STRICT when adpative gop is disabled

Message ID 20221124024729.881574-1-wenbin.chen@intel.com
State Accepted
Commit 47fff1eda155c30fc77cae74f40e71d4203c5043
Headers show
Series [FFmpeg-devel,v2] libavcodec/qsvenc.c: Enable MFX_GOP_STRICT when adpative gop is disabled | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Chen, Wenbin Nov. 24, 2022, 2:47 a.m. UTC 
From: Wenbin Chen <wenbin.chen@intel.com>

adaptive_i and adaptive_b cannot work with MFX_GOP_STRICT,
so only enable MFX_GOP_STRICT when these features are disabled.

Signed-off-by: Wenbin Chen <wenbin.chen@intel.com>
---
 libavcodec/qsvenc.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Comments

Xiang, Haihao Nov. 30, 2022, 1:56 a.m. UTC | #1 
On Thu, 2022-11-24 at 10:47 +0800, wenbin.chen-at-intel.com@ffmpeg.org wrote:
> From: Wenbin Chen <wenbin.chen@intel.com>
> 
> adaptive_i and adaptive_b cannot work with MFX_GOP_STRICT,
> so only enable MFX_GOP_STRICT when these features are disabled.
> 
> Signed-off-by: Wenbin Chen <wenbin.chen@intel.com>
> ---
>  libavcodec/qsvenc.c | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
> index d5e9f2d420..514a1e8148 100644
> --- a/libavcodec/qsvenc.c
> +++ b/libavcodec/qsvenc.c
> @@ -644,6 +644,12 @@ static int check_enc_param(AVCodecContext *avctx,
> QSVEncContext *q)
>      return 1;
>  }
>  
> +static int is_strict_gop(QSVEncContext *q) {
> +    if (q->adaptive_b == 0 && q->adaptive_i == 0)
> +        return 1;
> +    return 0;
> +}
> +
>  static int init_video_param_jpeg(AVCodecContext *avctx, QSVEncContext *q)
>  {
>      enum AVPixelFormat sw_format = avctx->pix_fmt == AV_PIX_FMT_QSV ?
> @@ -755,7 +761,8 @@ static int init_video_param(AVCodecContext *avctx,
> QSVEncContext *q)
>      q->old_gop_size                 = avctx->gop_size;
>      q->param.mfx.GopRefDist         = FFMAX(-1, avctx->max_b_frames) + 1;
>      q->param.mfx.GopOptFlag         = avctx->flags & AV_CODEC_FLAG_CLOSED_GOP
> ?
> -                                      MFX_GOP_CLOSED : MFX_GOP_STRICT;
> +                                      MFX_GOP_CLOSED : is_strict_gop(q) ?
> +                                      MFX_GOP_STRICT : 0;
>      q->param.mfx.IdrInterval        = q->idr_interval;
>      q->param.mfx.NumSlice           = avctx->slices;
>      q->param.mfx.NumRefFrame        = FFMAX(0, avctx->refs);

Will apply, thx

-Haihao
diff mbox series

Patch

diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index d5e9f2d420..514a1e8148 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -644,6 +644,12 @@  static int check_enc_param(AVCodecContext *avctx, QSVEncContext *q)
     return 1;
 }
 
+static int is_strict_gop(QSVEncContext *q) {
+    if (q->adaptive_b == 0 && q->adaptive_i == 0)
+        return 1;
+    return 0;
+}
+
 static int init_video_param_jpeg(AVCodecContext *avctx, QSVEncContext *q)
 {
     enum AVPixelFormat sw_format = avctx->pix_fmt == AV_PIX_FMT_QSV ?
@@ -755,7 +761,8 @@  static int init_video_param(AVCodecContext *avctx, QSVEncContext *q)
     q->old_gop_size                 = avctx->gop_size;
     q->param.mfx.GopRefDist         = FFMAX(-1, avctx->max_b_frames) + 1;
     q->param.mfx.GopOptFlag         = avctx->flags & AV_CODEC_FLAG_CLOSED_GOP ?
-                                      MFX_GOP_CLOSED : MFX_GOP_STRICT;
+                                      MFX_GOP_CLOSED : is_strict_gop(q) ?
+                                      MFX_GOP_STRICT : 0;
     q->param.mfx.IdrInterval        = q->idr_interval;
     q->param.mfx.NumSlice           = avctx->slices;
     q->param.mfx.NumRefFrame        = FFMAX(0, avctx->refs);