[FFmpeg-devel] [PATCH 1/3] libavcodec/qsvenc: Add framerate reset support to qsv

[Xiang, Haihao]

On Fri, 2022-09-23 at 10:44 +0800, Wenbin Chen wrote:
> Signed-off-by: Wenbin Chen <wenbin.chen at intel.com>
> ---
>  doc/encoders.texi   |  3 +++
>  libavcodec/qsvenc.c | 26 ++++++++++++++++++++++++++
>  libavcodec/qsvenc.h |  2 ++
>  3 files changed, 31 insertions(+)
> 
> diff --git a/doc/encoders.texi b/doc/encoders.texi
> index ac71f50ad2..4ed7ce1bb0 100644
> --- a/doc/encoders.texi
> +++ b/doc/encoders.texi
> @@ -3360,6 +3360,9 @@ Change these value to reset qsv codec's max/min qp
> configuration.
>  @item @var{low_delay_brc}
>  Supported in h264_qsv and hevc_qsv.
>  Change this value to reset qsv codec's low_delay_brc configuration.
> +
> + at item @var{framerate}
> +Change this value to reset qsv codec's framerate configuration.
>  @end table
>  
>  @subsection H264 options
> diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
> index 84c6e292aa..ce00cd302b 100644
> --- a/libavcodec/qsvenc.c
> +++ b/libavcodec/qsvenc.c
> @@ -705,6 +705,7 @@ static int init_video_param(AVCodecContext *avctx,
> QSVEncContext *q)
>          q->param.mfx.FrameInfo.FrameRateExtN  = avctx->time_base.den;
>          q->param.mfx.FrameInfo.FrameRateExtD  = avctx->time_base.num;
>      }
> +    q->old_framerate = avctx->framerate;
>  
>      ret = select_rc_mode(avctx, q);
>      if (ret < 0)
> @@ -1838,6 +1839,30 @@ static int update_low_delay_brc(AVCodecContext *avctx,
> QSVEncContext *q)
>      return updated;
>  }
>  
> +static int update_frame_rate(AVCodecContext *avctx, QSVEncContext *q)
> +{
> +    int updated = 0;
> +
> +    UPDATE_PARAM(q->old_framerate.num, avctx->framerate.num);
> +    UPDATE_PARAM(q->old_framerate.den, avctx->framerate.den);
> +    if (!updated)
> +        return 0;
> +
> +    if (avctx->framerate.den > 0 && avctx->framerate.num > 0) {
> +        q->param.mfx.FrameInfo.FrameRateExtN = avctx->framerate.num;
> +        q->param.mfx.FrameInfo.FrameRateExtD = avctx->framerate.den;
> +    } else {
> +        q->param.mfx.FrameInfo.FrameRateExtN = avctx->time_base.den;
> +        q->param.mfx.FrameInfo.FrameRateExtD = avctx->time_base.num;
> +    }
> +    av_log(avctx, AV_LOG_DEBUG, "Reset framerate: %d/%d (%.2f fps).\n",
> +           q->param.mfx.FrameInfo.FrameRateExtN,
> +           q->param.mfx.FrameInfo.FrameRateExtD,
> +           (double)q->param.mfx.FrameInfo.FrameRateExtN / q-
> >param.mfx.FrameInfo.FrameRateExtD);
> +
> +    return updated;
> +}
> +
>  static int update_parameters(AVCodecContext *avctx, QSVEncContext *q,
>                               const AVFrame *frame)
>  {
> @@ -1851,6 +1876,7 @@ static int update_parameters(AVCodecContext *avctx,
> QSVEncContext *q,
>      needReset |= update_gop_size(avctx, q);
>      needReset |= update_rir(avctx, q);
>      needReset |= update_low_delay_brc(avctx, q);
> +    needReset |= update_frame_rate(avctx, q);
>      ret = update_min_max_qp(avctx, q);
>      if (ret < 0)
>          return ret;
> diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h
> index f2b7ee361f..960197f159 100644
> --- a/libavcodec/qsvenc.h
> +++ b/libavcodec/qsvenc.h
> @@ -271,6 +271,8 @@ typedef struct QSVEncContext {
>      int old_min_qp_b;
>      // This is used for low_delay_brc reset
>      int old_low_delay_brc;
> +    // This is used for framerate reset
> +    AVRational old_framerate;
>  } QSVEncContext;
>  
>  int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q);

Patchset LGTM, will apply.

-Haihao