diff options
| author | Wenbin Chen <wenbin.chen-at-intel.com@ffmpeg.org> | 2022-09-06 17:22:54 +0800 |
|---|---|---|
| committer | Haihao Xiang <haihao.xiang@intel.com> | 2022-09-09 09:39:44 +0800 |
| commit | d60f657a50773ae8371585539bf484aa072bfc71 (patch) | |
| tree | 725e666af51638dc0194abf8b437a19337f6bf66 | |
| parent | c679de9be0d76e4eadc42f68421a569ff304c3e6 (diff) | |
| download | ffmpeg-d60f657a50773ae8371585539bf484aa072bfc71.tar.gz | |
libavcodec/qsvenc: Add gop_size reset support to qsvenc
Signed-off-by: Wenbin Chen <wenbin.chen@intel.com>
| -rw-r--r-- | doc/encoders.texi | 3 | ||||
| -rw-r--r-- | libavcodec/qsvenc.c | 16 | ||||
| -rw-r--r-- | libavcodec/qsvenc.h | 2 |
3 files changed, 21 insertions, 0 deletions
diff --git a/doc/encoders.texi b/doc/encoders.texi index e619827c90..51178c9f5c 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3335,6 +3335,9 @@ Change these value to reset qsv codec's qp configuration. @item @var{max_frame_size} Supported in h264_qsv and hevc_qsv. Change this value to reset qsv codec's MaxFrameSize configuration. + +@item @var{gop_size} +Change this value to reset qsv codec's gop configuration. @end table @subsection H264 options diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index b1f49e95fa..58b6284b30 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -639,6 +639,7 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->param.mfx.CodecProfile = q->profile; q->param.mfx.TargetUsage = avctx->compression_level; q->param.mfx.GopPicSize = FFMAX(0, avctx->gop_size); + 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; @@ -1697,6 +1698,20 @@ static int update_max_frame_size(AVCodecContext *avctx, QSVEncContext *q) return updated; } +static int update_gop_size(AVCodecContext *avctx, QSVEncContext *q) +{ + int updated = 0; + UPDATE_PARAM(q->old_gop_size, avctx->gop_size); + if (!updated) + return 0; + + q->param.mfx.GopPicSize = FFMAX(0, avctx->gop_size); + av_log(avctx, AV_LOG_DEBUG, "reset GopPicSize to %d\n", + q->param.mfx.GopPicSize); + + return updated; +} + static int update_parameters(AVCodecContext *avctx, QSVEncContext *q, const AVFrame *frame) { @@ -1707,6 +1722,7 @@ static int update_parameters(AVCodecContext *avctx, QSVEncContext *q, needReset = update_qp(avctx, q); needReset |= update_max_frame_size(avctx, q); + needReset |= update_gop_size(avctx, q); if (!needReset) return 0; diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 9914351de4..ead790fd2c 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -253,6 +253,8 @@ typedef struct QSVEncContext { float old_b_quant_offset; // This is used for max_frame_size reset int old_max_frame_size; + // This is used for gop reset + int old_gop_size; } QSVEncContext; int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q); |