[FFmpeg-devel] [PATCH 2/4] avcodec/nvenc: Add intra refresh support
Timo Rothenpieler
timo at rothenpieler.org
Fri Sep 3 20:22:32 EEST 2021
On 02.09.2021 12:38, lance.lmwang at gmail.com wrote:
> From: Limin Wang <lance.lmwang at gmail.com>
>
> Signed-off-by: Limin Wang <lance.lmwang at gmail.com>
> ---
> libavcodec/nvenc.c | 24 +++++++++++++++++++++---
> libavcodec/nvenc.h | 1 +
> libavcodec/nvenc_h264.c | 2 ++
> libavcodec/nvenc_hevc.c | 2 ++
> 4 files changed, 26 insertions(+), 3 deletions(-)
>
> diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
> index 163d442..e739f8b 100644
> --- a/libavcodec/nvenc.c
> +++ b/libavcodec/nvenc.c
> @@ -529,6 +529,12 @@ static int nvenc_check_capabilities(AVCodecContext *avctx)
> }
> #endif
>
> + ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_INTRA_REFRESH);
> + if(ctx->intra_refresh && ret <= 0) {
> + av_log(avctx, AV_LOG_WARNING, "Intra refresh not supported by the device\n");
> + return AVERROR(ENOSYS);
> + }
> +
> ctx->support_dyn_bitrate = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_DYN_BITRATE_CHANGE);
>
> return 0;
> @@ -1076,6 +1082,12 @@ static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx)
> h264->sliceMode = 3;
> h264->sliceModeData = avctx->slices > 0 ? avctx->slices : 1;
>
> + if (ctx->intra_refresh) {
> + h264->enableIntraRefresh = 1;
> + h264->intraRefreshPeriod = avctx->gop_size;
> + h264->intraRefreshCnt = avctx->gop_size - 1;
> + }
> +
> h264->disableSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 1 : 0;
> h264->repeatSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 0 : 1;
> h264->outputAUD = ctx->aud;
> @@ -1085,7 +1097,7 @@ static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx)
> h264->maxNumRefFrames = ctx->dpb_size;
> }
> if (avctx->gop_size >= 0) {
> - h264->idrPeriod = cc->gopLength;
> + h264->idrPeriod = ctx->intra_refresh ? NVENC_INFINITE_GOPLENGTH : avctx->gop_size;
> }
Is this intended to only set the idrPeriod to infinite when gop_size is >=0?
Wouldn't it make more sense to do something like
if(intra_refresh) NVENC_INFINITE_GOPLENGTH
else if (avctx->gop_size >= 0) avctx->gop_size
?
> if (IS_CBR(cc->rcParams.rateControlMode)) {
> @@ -1173,6 +1185,12 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx)
> hevc->sliceMode = 3;
> hevc->sliceModeData = avctx->slices > 0 ? avctx->slices : 1;
>
> + if (ctx->intra_refresh) {
> + hevc->enableIntraRefresh = 1;
> + hevc->intraRefreshPeriod = avctx->gop_size;
> + hevc->intraRefreshCnt = avctx->gop_size - 1;
> + }
> +
> hevc->disableSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 1 : 0;
> hevc->repeatSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 0 : 1;
> hevc->outputAUD = ctx->aud;
> @@ -1182,7 +1200,7 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx)
> hevc->maxNumRefFramesInDPB = ctx->dpb_size;
> }
> if (avctx->gop_size >= 0) {
> - hevc->idrPeriod = cc->gopLength;
> + hevc->idrPeriod = ctx->intra_refresh ? NVENC_INFINITE_GOPLENGTH : avctx->gop_size;
> }
>
> if (IS_CBR(cc->rcParams.rateControlMode)) {
> @@ -1361,7 +1379,7 @@ static av_cold int nvenc_setup_encoder(AVCodecContext *avctx)
> ctx->encode_config.frameIntervalP = avctx->max_b_frames + 1;
> }
>
> - ctx->encode_config.gopLength = avctx->gop_size;
> + ctx->encode_config.gopLength = ctx->intra_refresh ? NVENC_INFINITE_GOPLENGTH : avctx->gop_size;
> } else if (avctx->gop_size == 0) {
> ctx->encode_config.frameIntervalP = 0;
> ctx->encode_config.gopLength = 1;
> diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h
> index 7c284fb..e7cc0e6 100644
> --- a/libavcodec/nvenc.h
> +++ b/libavcodec/nvenc.h
> @@ -230,6 +230,7 @@ typedef struct NvencContext
> int multipass;
> int ldkfs;
> int extra_sei;
> + int intra_refresh;
> } NvencContext;
>
> int ff_nvenc_encode_init(AVCodecContext *avctx);
> diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c
> index fffdedc..532dff3 100644
> --- a/libavcodec/nvenc_h264.c
> +++ b/libavcodec/nvenc_h264.c
> @@ -188,6 +188,8 @@ static const AVOption options[] = {
> #endif
> { "extra_sei", "Pass on extra SEI data (e.g. a53 cc) to be included in the bitstream",
> OFFSET(extra_sei), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE },
> + { "intra_refresh", "Use Periodic Intra Refresh instead of IDR frames.",
> + OFFSET(intra_refresh),AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
> { NULL }
> };
>
> diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c
> index 4edc179..6814fe1 100644
> --- a/libavcodec/nvenc_hevc.c
> +++ b/libavcodec/nvenc_hevc.c
> @@ -169,6 +169,8 @@ static const AVOption options[] = {
> #endif
> { "extra_sei", "Pass on extra SEI data (e.g. a53 cc) to be included in the bitstream",
> OFFSET(extra_sei), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE },
> + { "intra_refresh", "Use Periodic Intra Refresh instead of IDR frames.",
> + OFFSET(intra_refresh),AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
> { NULL }
> };
>
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 4494 bytes
Desc: S/MIME Cryptographic Signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20210903/829810bd/attachment.bin>
More information about the ffmpeg-devel
mailing list