From: Zhao Zhili via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>
To: ffmpeg-devel@ffmpeg.org
Cc: Zhao Zhili <code@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH] avcodec/nvenc: fix -Wenum-conversion on colorspace/pri/trc (PR #20882)
Date: Mon, 10 Nov 2025 08:57:25 -0000
Message-ID: <176276504591.25.11542127544023970130@2cb04c0e5124> (raw)
PR #20882 opened by Zhao Zhili (quink)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20882
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20882.patch
>From 9fddad48ada500acaf0c1320cee74cebb4432dae Mon Sep 17 00:00:00 2001
From: Zhao Zhili <zhilizhao@tencent.com>
Date: Mon, 10 Nov 2025 16:44:49 +0800
Subject: [PATCH] avcodec/nvenc: fix -Wenum-conversion on colorspace/pri/trc
---
libavcodec/nvenc.c | 54 ++++++++++++++++++++++++++++++----------------
1 file changed, 36 insertions(+), 18 deletions(-)
diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
index 1811ef9525..3f86d6b095 100644
--- a/libavcodec/nvenc.c
+++ b/libavcodec/nvenc.c
@@ -337,6 +337,24 @@ static void nvenc_print_driver_requirement(AVCodecContext *avctx, int level)
av_log(avctx, level, "The minimum required Nvidia driver for nvenc is %s or newer\n", minver);
}
+av_always_inline
+static NV_ENC_VUI_MATRIX_COEFFS to_nv_color_matrix(enum AVColorSpace n)
+{
+ return (NV_ENC_VUI_MATRIX_COEFFS)n;
+}
+
+av_always_inline
+static NV_ENC_VUI_COLOR_PRIMARIES to_nv_color_pri(enum AVColorPrimaries n)
+{
+ return (NV_ENC_VUI_COLOR_PRIMARIES)n;
+}
+
+av_always_inline
+static NV_ENC_VUI_TRANSFER_CHARACTERISTIC to_nv_color_trc(enum AVColorTransferCharacteristic n)
+{
+ return (NV_ENC_VUI_TRANSFER_CHARACTERISTIC)n;
+}
+
static av_cold int nvenc_load_libraries(AVCodecContext *avctx)
{
NvencContext *ctx = avctx->priv_data;
@@ -1266,14 +1284,14 @@ static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx)
const AVPixFmtDescriptor *pixdesc = av_pix_fmt_desc_get(ctx->data_pix_fmt);
if ((pixdesc->flags & AV_PIX_FMT_FLAG_RGB) && !IS_GBRP(ctx->data_pix_fmt)) {
- vui->colourMatrix = AVCOL_SPC_BT470BG;
- vui->colourPrimaries = avctx->color_primaries;
- vui->transferCharacteristics = avctx->color_trc;
+ vui->colourMatrix = to_nv_color_matrix(AVCOL_SPC_BT470BG);
+ vui->colourPrimaries = to_nv_color_pri(avctx->color_primaries);
+ vui->transferCharacteristics = to_nv_color_trc(avctx->color_trc);
vui->videoFullRangeFlag = 0;
} else {
- vui->colourMatrix = IS_GBRP(ctx->data_pix_fmt) ? AVCOL_SPC_RGB : avctx->colorspace;
- vui->colourPrimaries = avctx->color_primaries;
- vui->transferCharacteristics = avctx->color_trc;
+ vui->colourMatrix = to_nv_color_matrix(IS_GBRP(ctx->data_pix_fmt) ? AVCOL_SPC_RGB : avctx->colorspace);
+ vui->colourPrimaries = to_nv_color_pri(avctx->color_primaries);
+ vui->transferCharacteristics = to_nv_color_trc(avctx->color_trc);
vui->videoFullRangeFlag = (avctx->color_range == AVCOL_RANGE_JPEG
|| ctx->data_pix_fmt == AV_PIX_FMT_YUVJ420P || ctx->data_pix_fmt == AV_PIX_FMT_YUVJ422P || ctx->data_pix_fmt == AV_PIX_FMT_YUVJ444P);
}
@@ -1457,14 +1475,14 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx)
const AVPixFmtDescriptor *pixdesc = av_pix_fmt_desc_get(ctx->data_pix_fmt);
if ((pixdesc->flags & AV_PIX_FMT_FLAG_RGB) && !IS_GBRP(ctx->data_pix_fmt)) {
- vui->colourMatrix = AVCOL_SPC_BT470BG;
- vui->colourPrimaries = avctx->color_primaries;
- vui->transferCharacteristics = avctx->color_trc;
+ vui->colourMatrix = to_nv_color_matrix(AVCOL_SPC_BT470BG);
+ vui->colourPrimaries = to_nv_color_pri(avctx->color_primaries);
+ vui->transferCharacteristics = to_nv_color_trc(avctx->color_trc);
vui->videoFullRangeFlag = 0;
} else {
- vui->colourMatrix = IS_GBRP(ctx->data_pix_fmt) ? AVCOL_SPC_RGB : avctx->colorspace;
- vui->colourPrimaries = avctx->color_primaries;
- vui->transferCharacteristics = avctx->color_trc;
+ vui->colourMatrix = to_nv_color_matrix(IS_GBRP(ctx->data_pix_fmt) ? AVCOL_SPC_RGB : avctx->colorspace);
+ vui->colourPrimaries = to_nv_color_pri(avctx->color_primaries);
+ vui->transferCharacteristics = to_nv_color_trc(avctx->color_trc);
vui->videoFullRangeFlag = (avctx->color_range == AVCOL_RANGE_JPEG
|| ctx->data_pix_fmt == AV_PIX_FMT_YUVJ420P || ctx->data_pix_fmt == AV_PIX_FMT_YUVJ422P || ctx->data_pix_fmt == AV_PIX_FMT_YUVJ444P);
}
@@ -1655,14 +1673,14 @@ static av_cold int nvenc_setup_av1_config(AVCodecContext *avctx)
const AVPixFmtDescriptor *pixdesc = av_pix_fmt_desc_get(ctx->data_pix_fmt);
if ((pixdesc->flags & AV_PIX_FMT_FLAG_RGB) && !IS_GBRP(ctx->data_pix_fmt)) {
- av1->matrixCoefficients = AVCOL_SPC_BT470BG;
- av1->colorPrimaries = avctx->color_primaries;
- av1->transferCharacteristics = avctx->color_trc;
+ av1->matrixCoefficients = to_nv_color_matrix(AVCOL_SPC_BT470BG);
+ av1->colorPrimaries = to_nv_color_pri(avctx->color_primaries);
+ av1->transferCharacteristics = to_nv_color_trc(avctx->color_trc);
av1->colorRange = 0;
} else {
- av1->matrixCoefficients = IS_GBRP(ctx->data_pix_fmt) ? AVCOL_SPC_RGB : avctx->colorspace;
- av1->colorPrimaries = avctx->color_primaries;
- av1->transferCharacteristics = avctx->color_trc;
+ av1->matrixCoefficients = to_nv_color_matrix(IS_GBRP(ctx->data_pix_fmt) ? AVCOL_SPC_RGB : avctx->colorspace);
+ av1->colorPrimaries = to_nv_color_pri(avctx->color_primaries);
+ av1->transferCharacteristics = to_nv_color_trc(avctx->color_trc);
av1->colorRange = (avctx->color_range == AVCOL_RANGE_JPEG
|| ctx->data_pix_fmt == AV_PIX_FMT_YUVJ420P || ctx->data_pix_fmt == AV_PIX_FMT_YUVJ422P || ctx->data_pix_fmt == AV_PIX_FMT_YUVJ444P);
}
--
2.49.1
_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org
reply other threads:[~2025-11-10 8:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=176276504591.25.11542127544023970130@2cb04c0e5124 \
--to=ffmpeg-devel@ffmpeg.org \
--cc=code@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git