March 2024 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/nvenc: support SDK 12.2 bit depth API
by Timo Rothenpieler 01 Apr '24

01 Apr '24

ffmpeg | branch: release/6.1 | Timo Rothenpieler <timo(a)rothenpieler.org> | Sun Mar 31 18:39:49 2024 +0200| [38346298973e3869d895e0ad3ca3b19dc598c5c8] | committer: Timo Rothenpieler avcodec/nvenc: support SDK 12.2 bit depth API > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=38346298973e3869d… --- libavcodec/nvenc.c | 15 +++++++++++++++ libavcodec/nvenc.h | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 66a95f54d1..c1ab4e7265 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1255,6 +1255,11 @@ static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx) h264->level = ctx->level; +#ifdef NVENC_HAVE_NEW_BIT_DEPTH_API + h264->inputBitDepth = h264->outputBitDepth = + IS_10BIT(ctx->data_pix_fmt) ? NV_ENC_BIT_DEPTH_10 : NV_ENC_BIT_DEPTH_8; +#endif + if (ctx->coder >= 0) h264->entropyCodingMode = ctx->coder; @@ -1370,7 +1375,12 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx) hevc->chromaFormatIDC = IS_YUV444(ctx->data_pix_fmt) ? 3 : 1; +#ifdef NVENC_HAVE_NEW_BIT_DEPTH_API + hevc->inputBitDepth = hevc->outputBitDepth = + IS_10BIT(ctx->data_pix_fmt) ? NV_ENC_BIT_DEPTH_10 : NV_ENC_BIT_DEPTH_8; +#else hevc->pixelBitDepthMinus8 = IS_10BIT(ctx->data_pix_fmt) ? 2 : 0; +#endif hevc->level = ctx->level; @@ -1455,8 +1465,13 @@ static av_cold int nvenc_setup_av1_config(AVCodecContext *avctx) av1->chromaFormatIDC = IS_YUV444(ctx->data_pix_fmt) ? 3 : 1; +#ifdef NVENC_HAVE_NEW_BIT_DEPTH_API + av1->inputBitDepth = IS_10BIT(ctx->data_pix_fmt) ? NV_ENC_BIT_DEPTH_10 : NV_ENC_BIT_DEPTH_8; + av1->outputBitDepth = (IS_10BIT(ctx->data_pix_fmt) || ctx->highbitdepth) ? NV_ENC_BIT_DEPTH_10 : NV_ENC_BIT_DEPTH_8; +#else av1->inputPixelBitDepthMinus8 = IS_10BIT(ctx->data_pix_fmt) ? 2 : 0; av1->pixelBitDepthMinus8 = (IS_10BIT(ctx->data_pix_fmt) || ctx->highbitdepth) ? 2 : 0; +#endif if (ctx->b_ref_mode >= 0) av1->useBFramesAsRef = ctx->b_ref_mode; diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index e5b0eb8305..ecc827de97 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -83,6 +83,11 @@ typedef void ID3D11Device; #define NVENC_NO_DEPRECATED_RC #endif +// SDK 12.2 compile time feature checks +#if NVENCAPI_CHECK_VERSION(12, 2) +#define NVENC_HAVE_NEW_BIT_DEPTH_API +#endif + typedef struct NvencSurface { NV_ENC_INPUT_PTR input_surface;

1 0

avcodec/nvenc: stop using long deprecated format specifiers
by Timo Rothenpieler 01 Apr '24

01 Apr '24

ffmpeg | branch: release/6.1 | Timo Rothenpieler <timo(a)rothenpieler.org> | Sun Mar 31 18:25:15 2024 +0200| [3481f8d99fc44f5516957e774b7f2da74c33beb8] | committer: Timo Rothenpieler avcodec/nvenc: stop using long deprecated format specifiers > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3481f8d99fc44f551… --- libavcodec/nvenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 626f10d20a..66a95f54d1 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1689,15 +1689,15 @@ static NV_ENC_BUFFER_FORMAT nvenc_map_buffer_format(enum AVPixelFormat pix_fmt) { switch (pix_fmt) { case AV_PIX_FMT_YUV420P: - return NV_ENC_BUFFER_FORMAT_YV12_PL; + return NV_ENC_BUFFER_FORMAT_YV12; case AV_PIX_FMT_NV12: - return NV_ENC_BUFFER_FORMAT_NV12_PL; + return NV_ENC_BUFFER_FORMAT_NV12; case AV_PIX_FMT_P010: case AV_PIX_FMT_P016: return NV_ENC_BUFFER_FORMAT_YUV420_10BIT; case AV_PIX_FMT_GBRP: case AV_PIX_FMT_YUV444P: - return NV_ENC_BUFFER_FORMAT_YUV444_PL; + return NV_ENC_BUFFER_FORMAT_YUV444; case AV_PIX_FMT_GBRP16: case AV_PIX_FMT_YUV444P16: return NV_ENC_BUFFER_FORMAT_YUV444_10BIT;

1 0

avcodec/nvenc: support SDK 12.2 bit depth API
by Timo Rothenpieler 01 Apr '24

01 Apr '24

ffmpeg | branch: release/7.0 | Timo Rothenpieler <timo(a)rothenpieler.org> | Sun Mar 31 18:39:49 2024 +0200| [4c5a809388f41ed6d67f6869958be47e3003fec6] | committer: Timo Rothenpieler avcodec/nvenc: support SDK 12.2 bit depth API > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4c5a809388f41ed6d… --- libavcodec/nvenc.c | 15 +++++++++++++++ libavcodec/nvenc.h | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 0cb3b87c67..8327496937 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1255,6 +1255,11 @@ static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx) h264->level = ctx->level; +#ifdef NVENC_HAVE_NEW_BIT_DEPTH_API + h264->inputBitDepth = h264->outputBitDepth = + IS_10BIT(ctx->data_pix_fmt) ? NV_ENC_BIT_DEPTH_10 : NV_ENC_BIT_DEPTH_8; +#endif + if (ctx->coder >= 0) h264->entropyCodingMode = ctx->coder; @@ -1370,7 +1375,12 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx) hevc->chromaFormatIDC = IS_YUV444(ctx->data_pix_fmt) ? 3 : 1; +#ifdef NVENC_HAVE_NEW_BIT_DEPTH_API + hevc->inputBitDepth = hevc->outputBitDepth = + IS_10BIT(ctx->data_pix_fmt) ? NV_ENC_BIT_DEPTH_10 : NV_ENC_BIT_DEPTH_8; +#else hevc->pixelBitDepthMinus8 = IS_10BIT(ctx->data_pix_fmt) ? 2 : 0; +#endif hevc->level = ctx->level; @@ -1455,8 +1465,13 @@ static av_cold int nvenc_setup_av1_config(AVCodecContext *avctx) av1->chromaFormatIDC = IS_YUV444(ctx->data_pix_fmt) ? 3 : 1; +#ifdef NVENC_HAVE_NEW_BIT_DEPTH_API + av1->inputBitDepth = IS_10BIT(ctx->data_pix_fmt) ? NV_ENC_BIT_DEPTH_10 : NV_ENC_BIT_DEPTH_8; + av1->outputBitDepth = (IS_10BIT(ctx->data_pix_fmt) || ctx->highbitdepth) ? NV_ENC_BIT_DEPTH_10 : NV_ENC_BIT_DEPTH_8; +#else av1->inputPixelBitDepthMinus8 = IS_10BIT(ctx->data_pix_fmt) ? 2 : 0; av1->pixelBitDepthMinus8 = (IS_10BIT(ctx->data_pix_fmt) || ctx->highbitdepth) ? 2 : 0; +#endif if (ctx->b_ref_mode >= 0) av1->useBFramesAsRef = ctx->b_ref_mode; diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index 48cdfc58aa..d99d8a0d76 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -83,6 +83,11 @@ typedef void ID3D11Device; #define NVENC_NO_DEPRECATED_RC #endif +// SDK 12.2 compile time feature checks +#if NVENCAPI_CHECK_VERSION(12, 2) +#define NVENC_HAVE_NEW_BIT_DEPTH_API +#endif + typedef struct NvencSurface { NV_ENC_INPUT_PTR input_surface;

1 0

avcodec/nvenc: stop using long deprecated format specifiers
by Timo Rothenpieler 01 Apr '24

01 Apr '24

ffmpeg | branch: release/7.0 | Timo Rothenpieler <timo(a)rothenpieler.org> | Sun Mar 31 18:25:15 2024 +0200| [5ff5a431c758e8b25e3bee2a0242d9b30422edf1] | committer: Timo Rothenpieler avcodec/nvenc: stop using long deprecated format specifiers > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ff5a431c758e8b25… --- libavcodec/nvenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index fd73af2a32..0cb3b87c67 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1689,15 +1689,15 @@ static NV_ENC_BUFFER_FORMAT nvenc_map_buffer_format(enum AVPixelFormat pix_fmt) { switch (pix_fmt) { case AV_PIX_FMT_YUV420P: - return NV_ENC_BUFFER_FORMAT_YV12_PL; + return NV_ENC_BUFFER_FORMAT_YV12; case AV_PIX_FMT_NV12: - return NV_ENC_BUFFER_FORMAT_NV12_PL; + return NV_ENC_BUFFER_FORMAT_NV12; case AV_PIX_FMT_P010: case AV_PIX_FMT_P016: return NV_ENC_BUFFER_FORMAT_YUV420_10BIT; case AV_PIX_FMT_GBRP: case AV_PIX_FMT_YUV444P: - return NV_ENC_BUFFER_FORMAT_YUV444_PL; + return NV_ENC_BUFFER_FORMAT_YUV444; case AV_PIX_FMT_GBRP16: case AV_PIX_FMT_YUV444P16: return NV_ENC_BUFFER_FORMAT_YUV444_10BIT;

1 0

avcodec/nvenc: provide nvenc with monotonic frame index
by Timo Rothenpieler 01 Apr '24

01 Apr '24

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Mon Apr 1 00:43:23 2024 +0200| [271a0a55bcc5b5dac471aedbb5cd446cb645547c] | committer: Timo Rothenpieler avcodec/nvenc: provide nvenc with monotonic frame index > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=271a0a55bcc5b5dac… --- libavcodec/nvenc.c | 1 + libavcodec/nvenc.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 05cb148504..b6c5ed3e6b 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -2784,6 +2784,7 @@ static int nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) pic_params.encodePicFlags = 0; } + pic_params.frameIdx = ctx->frame_idx_counter++; pic_params.inputTimeStamp = frame->pts; if (ctx->extra_sei) { diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index 45860de722..85ecaf1b5f 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -226,6 +226,8 @@ typedef struct NvencContext void *nvencoder; + uint32_t frame_idx_counter; + int preset; int profile; int level;

1 0

avcodec/nvenc: update minimum driver version list
by Timo Rothenpieler 31 Mar '24

31 Mar '24

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Sun Mar 31 21:43:01 2024 +0200| [c06e9e289f1e26b779ea46e435ed0ad243a2cd0d] | committer: Timo Rothenpieler avcodec/nvenc: update minimum driver version list > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c06e9e289f1e26b77… --- libavcodec/nvenc.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index d121442957..05cb148504 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -242,8 +242,20 @@ static void nvenc_map_preset(NvencContext *ctx) static void nvenc_print_driver_requirement(AVCodecContext *avctx, int level) { -#if NVENCAPI_CHECK_VERSION(12, 1) +#if NVENCAPI_CHECK_VERSION(12, 3) const char *minver = "(unknown)"; +#elif NVENCAPI_CHECK_VERSION(12, 2) +# if defined(_WIN32) || defined(__CYGWIN__) + const char *minver = "551.76"; +# else + const char *minver = "550.54.14"; +# endif +#elif NVENCAPI_CHECK_VERSION(12, 1) +# if defined(_WIN32) || defined(__CYGWIN__) + const char *minver = "531.61"; +# else + const char *minver = "530.41.03"; +# endif #elif NVENCAPI_CHECK_VERSION(12, 0) # if defined(_WIN32) || defined(__CYGWIN__) const char *minver = "522.25";

1 0

avcodec/nvenc: add support for unidirectional b-frames
by Timo Rothenpieler 31 Mar '24

31 Mar '24

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Sun Mar 31 21:26:15 2024 +0200| [21b4708969415b9ec6d212fb35c12e4d1c28d066] | committer: Timo Rothenpieler avcodec/nvenc: add support for unidirectional b-frames > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21b4708969415b9ec… --- libavcodec/nvenc.c | 12 ++++++++++++ libavcodec/nvenc.h | 2 ++ libavcodec/nvenc_hevc.c | 3 +++ libavcodec/version.h | 2 +- 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 7f938a519f..d121442957 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -613,6 +613,14 @@ static int nvenc_check_capabilities(AVCodecContext *avctx) } #endif +#ifdef NVENC_HAVE_UNIDIR_B + ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_UNIDIRECTIONAL_B); + if(ctx->unidir_b && ret <= 0) { + av_log(avctx, AV_LOG_WARNING, "Unidirectional B-Frames not supported by the device\n"); + return AVERROR(ENOSYS); + } +#endif + ctx->support_dyn_bitrate = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_DYN_BITRATE_CHANGE); return 0; @@ -1658,6 +1666,10 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS } +#ifdef NVENC_HAVE_UNIDIR_B + ctx->init_encode_params.enableUniDirectionalB = ctx->unidir_b; +#endif + ctx->init_encode_params.enableEncodeAsync = 0; ctx->init_encode_params.enablePTD = 1; diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index 3e207b1877..45860de722 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -89,6 +89,7 @@ typedef void ID3D11Device; #define NVENC_HAVE_TEMPORAL_FILTER #define NVENC_HAVE_LOOKAHEAD_LEVEL #define NVENC_HAVE_UHQ_TUNING +#define NVENC_HAVE_UNIDIR_B #endif typedef struct NvencSurface @@ -276,6 +277,7 @@ typedef struct NvencContext int rgb_mode; int tf_level; int lookahead_level; + int unidir_b; } NvencContext; int ff_nvenc_encode_init(AVCodecContext *avctx); diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index e0d16e82c7..bd8b6153f3 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -213,6 +213,9 @@ static const AVOption options[] = { { "1", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LOOKAHEAD_LEVEL_1 }, 0, 0, VE, .unit = "lookahead_level" }, { "2", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LOOKAHEAD_LEVEL_2 }, 0, 0, VE, .unit = "lookahead_level" }, { "3", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LOOKAHEAD_LEVEL_3 }, 0, 0, VE, .unit = "lookahead_level" }, +#endif +#ifdef NVENC_HAVE_UNIDIR_B + { "unidir_b", "Enable use of unidirectional B-Frames.", OFFSET(unidir_b), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, #endif { NULL } }; diff --git a/libavcodec/version.h b/libavcodec/version.h index 06631ffa8c..7aa95fc3f1 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 4 +#define LIBAVCODEC_VERSION_MINOR 5 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

1 0

avcodec/nvenc: add support for uhq tune
by Timo Rothenpieler 31 Mar '24

31 Mar '24

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Sun Mar 31 21:17:11 2024 +0200| [a27096611835f1e46b0c842ad4fffe42b36bad41] | committer: Timo Rothenpieler avcodec/nvenc: add support for uhq tune > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a27096611835f1e46… --- libavcodec/nvenc.h | 1 + libavcodec/nvenc_hevc.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index 30f9800d21..3e207b1877 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -88,6 +88,7 @@ typedef void ID3D11Device; #define NVENC_HAVE_NEW_BIT_DEPTH_API #define NVENC_HAVE_TEMPORAL_FILTER #define NVENC_HAVE_LOOKAHEAD_LEVEL +#define NVENC_HAVE_UHQ_TUNING #endif typedef struct NvencSurface diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index 7509a93516..e0d16e82c7 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -51,8 +51,11 @@ static const AVOption options[] = { { "p5", "slow (good quality)", 0, AV_OPT_TYPE_CONST, { .i64 = PRESET_P5 }, 0, 0, VE, .unit = "preset" }, { "p6", "slower (better quality)", 0, AV_OPT_TYPE_CONST, { .i64 = PRESET_P6 }, 0, 0, VE, .unit = "preset" }, { "p7", "slowest (best quality)", 0, AV_OPT_TYPE_CONST, { .i64 = PRESET_P7 }, 0, 0, VE, .unit = "preset" }, - { "tune", "Set the encoding tuning info", OFFSET(tuning_info), AV_OPT_TYPE_INT, { .i64 = NV_ENC_TUNING_INFO_HIGH_QUALITY }, NV_ENC_TUNING_INFO_HIGH_QUALITY, NV_ENC_TUNING_INFO_LOSSLESS, VE, .unit = "tune" }, + { "tune", "Set the encoding tuning info", OFFSET(tuning_info), AV_OPT_TYPE_INT, { .i64 = NV_ENC_TUNING_INFO_HIGH_QUALITY }, NV_ENC_TUNING_INFO_HIGH_QUALITY, NV_ENC_TUNING_INFO_COUNT - 1, VE, .unit = "tune" }, { "hq", "High quality", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_TUNING_INFO_HIGH_QUALITY }, 0, 0, VE, .unit = "tune" }, +#ifdef NVENC_HAVE_UHQ_TUNING + { "uhq", "Ultra high quality", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_TUNING_INFO_ULTRA_HIGH_QUALITY }, 0, 0, VE, .unit = "tune" }, +#endif { "ll", "Low latency", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_TUNING_INFO_LOW_LATENCY }, 0, 0, VE, .unit = "tune" }, { "ull", "Ultra low latency", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_TUNING_INFO_ULTRA_LOW_LATENCY }, 0, 0, VE, .unit = "tune" }, { "lossless", "Lossless", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_TUNING_INFO_LOSSLESS }, 0, 0, VE, .unit = "tune" },

1 0

avcodec/nvenc: add support for lookahead_level
by Timo Rothenpieler 31 Mar '24

31 Mar '24

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Sun Mar 31 20:52:27 2024 +0200| [77d23bcb1b91b7b38808c3532945def5aaed5cd9] | committer: Timo Rothenpieler avcodec/nvenc: add support for lookahead_level > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77d23bcb1b91b7b38… --- libavcodec/nvenc.c | 37 +++++++++++++++++++++++++++++++++++-- libavcodec/nvenc.h | 2 ++ libavcodec/nvenc_av1.c | 9 +++++++++ libavcodec/nvenc_h264.c | 9 +++++++++ libavcodec/nvenc_hevc.c | 9 +++++++++ 5 files changed, 64 insertions(+), 2 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 5afd7bf218..7f938a519f 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -602,6 +602,17 @@ static int nvenc_check_capabilities(AVCodecContext *avctx) } #endif +#ifdef NVENC_HAVE_LOOKAHEAD_LEVEL + ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_LOOKAHEAD_LEVEL); + if(ctx->rc_lookahead > 0 && ctx->lookahead_level > 0 && + ctx->lookahead_level != NV_ENC_LOOKAHEAD_LEVEL_AUTOSELECT && + ctx->lookahead_level > ret) + { + av_log(avctx, AV_LOG_WARNING, "Lookahead level not supported. Maximum level: %d\n", ret); + return AVERROR(ENOSYS); + } +#endif + ctx->support_dyn_bitrate = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_DYN_BITRATE_CHANGE); return 0; @@ -995,7 +1006,7 @@ static av_cold int nvenc_recalc_surfaces(AVCodecContext *avctx) return 0; } -static av_cold void nvenc_setup_rate_control(AVCodecContext *avctx) +static av_cold int nvenc_setup_rate_control(AVCodecContext *avctx) { NvencContext *ctx = avctx->priv_data; @@ -1124,6 +1135,24 @@ static av_cold void nvenc_setup_rate_control(AVCodecContext *avctx) if (ctx->encode_config.rcParams.lookaheadDepth < ctx->rc_lookahead) av_log(avctx, AV_LOG_WARNING, "Clipping lookahead depth to %d (from %d) due to lack of surfaces/delay", ctx->encode_config.rcParams.lookaheadDepth, ctx->rc_lookahead); + +#ifdef NVENC_HAVE_LOOKAHEAD_LEVEL + if (ctx->lookahead_level >= 0) { + switch (ctx->lookahead_level) { + case NV_ENC_LOOKAHEAD_LEVEL_0: + case NV_ENC_LOOKAHEAD_LEVEL_1: + case NV_ENC_LOOKAHEAD_LEVEL_2: + case NV_ENC_LOOKAHEAD_LEVEL_3: + case NV_ENC_LOOKAHEAD_LEVEL_AUTOSELECT: + break; + default: + av_log(avctx, AV_LOG_ERROR, "Invalid lookahead level.\n"); + return AVERROR(EINVAL); + } + + ctx->encode_config.rcParams.lookaheadLevel = ctx->lookahead_level; + } +#endif } } @@ -1151,6 +1180,8 @@ static av_cold void nvenc_setup_rate_control(AVCodecContext *avctx) ctx->encode_config.rcParams.vbvBufferSize = avctx->rc_buffer_size = 0; ctx->encode_config.rcParams.maxBitRate = avctx->rc_max_rate; } + + return 0; } static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx) @@ -1675,7 +1706,9 @@ FF_ENABLE_DEPRECATION_WARNINGS nvenc_recalc_surfaces(avctx); - nvenc_setup_rate_control(avctx); + res = nvenc_setup_rate_control(avctx); + if (res < 0) + return res; if (avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT) { ctx->encode_config.frameFieldMode = NV_ENC_PARAMS_FRAME_FIELD_MODE_FIELD; diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index c320c2514f..30f9800d21 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -87,6 +87,7 @@ typedef void ID3D11Device; #if NVENCAPI_CHECK_VERSION(12, 2) #define NVENC_HAVE_NEW_BIT_DEPTH_API #define NVENC_HAVE_TEMPORAL_FILTER +#define NVENC_HAVE_LOOKAHEAD_LEVEL #endif typedef struct NvencSurface @@ -273,6 +274,7 @@ typedef struct NvencContext int max_slice_size; int rgb_mode; int tf_level; + int lookahead_level; } NvencContext; int ff_nvenc_encode_init(AVCodecContext *avctx); diff --git a/libavcodec/nvenc_av1.c b/libavcodec/nvenc_av1.c index c46cee9fac..d37ee07bff 100644 --- a/libavcodec/nvenc_av1.c +++ b/libavcodec/nvenc_av1.c @@ -149,6 +149,15 @@ static const AVOption options[] = { OFFSET(extra_sei), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE }, { "a53cc", "Use A53 Closed Captions (if available)", OFFSET(a53_cc), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE }, { "s12m_tc", "Use timecode (if available)", OFFSET(s12m_tc), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE }, +#ifdef NVENC_HAVE_LOOKAHEAD_LEVEL + { "lookahead_level", "Specifies the lookahead level. Higher level may improve quality at the expense of performance.", + OFFSET(lookahead_level), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, NV_ENC_LOOKAHEAD_LEVEL_AUTOSELECT, VE, .unit = "lookahead_level" }, + { "auto", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LOOKAHEAD_LEVEL_AUTOSELECT }, 0, 0, VE, .unit = "lookahead_level" }, + { "0", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LOOKAHEAD_LEVEL_0 }, 0, 0, VE, .unit = "lookahead_level" }, + { "1", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LOOKAHEAD_LEVEL_1 }, 0, 0, VE, .unit = "lookahead_level" }, + { "2", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LOOKAHEAD_LEVEL_2 }, 0, 0, VE, .unit = "lookahead_level" }, + { "3", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LOOKAHEAD_LEVEL_3 }, 0, 0, VE, .unit = "lookahead_level" }, +#endif { NULL } }; diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c index a555252a53..4d6f968e0b 100644 --- a/libavcodec/nvenc_h264.c +++ b/libavcodec/nvenc_h264.c @@ -215,6 +215,15 @@ static const AVOption options[] = { OFFSET(max_slice_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, { "constrained-encoding", "Enable constrainedFrame encoding where each slice in the constrained picture is independent of other slices", OFFSET(constrained_encoding), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, +#ifdef NVENC_HAVE_LOOKAHEAD_LEVEL + { "lookahead_level", "Specifies the lookahead level. Higher level may improve quality at the expense of performance.", + OFFSET(lookahead_level), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, NV_ENC_LOOKAHEAD_LEVEL_AUTOSELECT, VE, .unit = "lookahead_level" }, + { "auto", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LOOKAHEAD_LEVEL_AUTOSELECT }, 0, 0, VE, .unit = "lookahead_level" }, + { "0", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LOOKAHEAD_LEVEL_0 }, 0, 0, VE, .unit = "lookahead_level" }, + { "1", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LOOKAHEAD_LEVEL_1 }, 0, 0, VE, .unit = "lookahead_level" }, + { "2", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LOOKAHEAD_LEVEL_2 }, 0, 0, VE, .unit = "lookahead_level" }, + { "3", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LOOKAHEAD_LEVEL_3 }, 0, 0, VE, .unit = "lookahead_level" }, +#endif { NULL } }; diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index 8559aa6cfb..7509a93516 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -201,6 +201,15 @@ static const AVOption options[] = { OFFSET(tf_level), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, VE, .unit = "tf_level" }, { "0", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_TEMPORAL_FILTER_LEVEL_0 }, 0, 0, VE, .unit = "tf_level" }, { "4", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_TEMPORAL_FILTER_LEVEL_4 }, 0, 0, VE, .unit = "tf_level" }, +#endif +#ifdef NVENC_HAVE_LOOKAHEAD_LEVEL + { "lookahead_level", "Specifies the lookahead level. Higher level may improve quality at the expense of performance.", + OFFSET(lookahead_level), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, NV_ENC_LOOKAHEAD_LEVEL_AUTOSELECT, VE, .unit = "lookahead_level" }, + { "auto", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LOOKAHEAD_LEVEL_AUTOSELECT }, 0, 0, VE, .unit = "lookahead_level" }, + { "0", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LOOKAHEAD_LEVEL_0 }, 0, 0, VE, .unit = "lookahead_level" }, + { "1", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LOOKAHEAD_LEVEL_1 }, 0, 0, VE, .unit = "lookahead_level" }, + { "2", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LOOKAHEAD_LEVEL_2 }, 0, 0, VE, .unit = "lookahead_level" }, + { "3", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LOOKAHEAD_LEVEL_3 }, 0, 0, VE, .unit = "lookahead_level" }, #endif { NULL } };

1 0

avcodec/nvenc: add support for HEVC temporal filtering
by Timo Rothenpieler 31 Mar '24

31 Mar '24

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Sun Mar 31 20:10:45 2024 +0200| [64e3fc906971e18ec9e2810826ac9bb285ea08bb] | committer: Timo Rothenpieler avcodec/nvenc: add support for HEVC temporal filtering > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64e3fc906971e18ec… --- libavcodec/nvenc.c | 27 +++++++++++++++++++++++++++ libavcodec/nvenc.h | 2 ++ libavcodec/nvenc_hevc.c | 6 ++++++ 3 files changed, 35 insertions(+) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 8327496937..5afd7bf218 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -594,6 +594,14 @@ static int nvenc_check_capabilities(AVCodecContext *avctx) return AVERROR(ENOSYS); } +#ifdef NVENC_HAVE_TEMPORAL_FILTER + ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_TEMPORAL_FILTER); + if(ctx->tf_level > 0 && ret <= 0) { + av_log(avctx, AV_LOG_WARNING, "Temporal filtering not supported by the device\n"); + return AVERROR(ENOSYS); + } +#endif + ctx->support_dyn_bitrate = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_DYN_BITRATE_CHANGE); return 0; @@ -1396,6 +1404,25 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx) hevc->numRefL1 = avctx->refs; #endif +#ifdef NVENC_HAVE_TEMPORAL_FILTER + if (ctx->tf_level >= 0) { + hevc->tfLevel = ctx->tf_level; + + switch (ctx->tf_level) + { + case NV_ENC_TEMPORAL_FILTER_LEVEL_0: + case NV_ENC_TEMPORAL_FILTER_LEVEL_4: + break; + default: + av_log(avctx, AV_LOG_ERROR, "Invalid temporal filtering level.\n"); + return AVERROR(EINVAL); + } + + if (ctx->encode_config.frameIntervalP < 5) + av_log(avctx, AV_LOG_WARNING, "Temporal filtering needs at least 4 B-Frames (-bf 4).\n"); + } +#endif + return 0; } diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index d99d8a0d76..c320c2514f 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -86,6 +86,7 @@ typedef void ID3D11Device; // SDK 12.2 compile time feature checks #if NVENCAPI_CHECK_VERSION(12, 2) #define NVENC_HAVE_NEW_BIT_DEPTH_API +#define NVENC_HAVE_TEMPORAL_FILTER #endif typedef struct NvencSurface @@ -271,6 +272,7 @@ typedef struct NvencContext int highbitdepth; int max_slice_size; int rgb_mode; + int tf_level; } NvencContext; int ff_nvenc_encode_init(AVCodecContext *avctx); diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index 65fcb4efb8..8559aa6cfb 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -196,6 +196,12 @@ static const AVOption options[] = { OFFSET(max_slice_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, { "constrained-encoding", "Enable constrainedFrame encoding where each slice in the constrained picture is independent of other slices", OFFSET(constrained_encoding), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, +#ifdef NVENC_HAVE_TEMPORAL_FILTER + { "tf_level", "Specifies the strength of the temporal filtering", + OFFSET(tf_level), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, VE, .unit = "tf_level" }, + { "0", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_TEMPORAL_FILTER_LEVEL_0 }, 0, 0, VE, .unit = "tf_level" }, + { "4", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_TEMPORAL_FILTER_LEVEL_4 }, 0, 0, VE, .unit = "tf_level" }, +#endif { NULL } };

1 0