[FFmpeg-cvslog] avcodec/nvenc: add UHQ to AV1 for NVENC

[Diego de Souza]

ffmpeg | branch: master | Diego de Souza <ddesouza at nvidia.com> | Wed Jan  8 13:18:54 2025 +0100| [ed80e555860126ececb77181f0bf00fa8e699259] | committer: Timo Rothenpieler

avcodec/nvenc: add UHQ to AV1 for NVENC

This commit adds support for Ultra High Quality mode for AV1 on
NVIDIA GPUs.

Signed-off-by: Diego de Souza <ddesouza at nvidia.com>
Signed-off-by: Timo Rothenpieler <timo at rothenpieler.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed80e555860126ececb77181f0bf00fa8e699259
---

 libavcodec/nvenc.h     | 1 +
 libavcodec/nvenc_av1.c | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h
index 34774b6a72..2d8e8bef44 100644
--- a/libavcodec/nvenc.h
+++ b/libavcodec/nvenc.h
@@ -97,6 +97,7 @@ typedef void ID3D11Device;
 #if NVENCAPI_CHECK_VERSION(13, 0)
 #define NVENC_HAVE_H264_10BIT_SUPPORT
 #define NVENC_HAVE_422_SUPPORT
+#define NVENC_HAVE_AV1_UHQ_TUNING
 #endif
 
 typedef struct NvencSurface
diff --git a/libavcodec/nvenc_av1.c b/libavcodec/nvenc_av1.c
index 79253cff66..bccc63dd5b 100644
--- a/libavcodec/nvenc_av1.c
+++ b/libavcodec/nvenc_av1.c
@@ -38,8 +38,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_AV1_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" },