From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 8ED8D4C37B for ; Mon, 10 Nov 2025 08:58:06 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'Ft8VTCmme7frlsPfuKwJ24M8wCuTB2vVrnVXrBoJVCw=', expected b'97q7lC+fnje3xwNzHhCBSeZ/2TNgQJIgpCVBItDf/GE=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1762765075; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=Ft8VTCmme7frlsPfuKwJ24M8wCuTB2vVrnVXrBoJVCw=; b=vJ1OTW5r+TS4j069OWBzGF+K5o00l1w2J3mL8jMeJ4Kune2+wcRwkg+NERWJzKkNdcCJe nOI2o1yijyA9Vz5iT62XWF9ostnXABD+Aj0+LaJE5Khfa/i2ewFoqTqykowgPIZObGiQ4s9 0LU9BmZneWM0od9Fw8FmUpAaYqm9USi7RKrbnv6sRhwvVPZEKnJbnVmIVd0rWzkpHLE6SEa 2U7VyX55yNOt/U/cTKEyDz87YXJZx67TTnSW0NcXYXkC4OWQxEwjDa2w/cFT9gQocRN5eL/ FfXfGSezTrxrmwMHHHlfGhiIeWYTbz46R8xBaY4K7wXk4GNduKcqcPwwx+LA== Received: from [172.19.0.2] (unknown [172.19.0.2]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id BCE5768FC05; Mon, 10 Nov 2025 10:57:55 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1762765055; b=UYAq55WZsCVsa3SACpnDvCwvyt9K57EehRsPHS0gNSHt/HqU6CxfAbTAjgsX/7WDDSpvB Lt/noJwLOD8ivbrMvMtzqUkcLBIfO8fObZtOxRB+E3dyeeSXVHg4XbO9bU6e/LaVur6bzcs PYbseMmb2c0UVDQLIjG0cJooAQqLNR7FGi8yzupDZv11KTfh0TLJd1RPFzN7oViypUGwwFn rFXzmSLNqUaguA4Fjps1MxNkaXWnbiwFUJ8d4iFWgW2a/re1gHllkwc5L3wvXPWYDs6qgYw EQRcs6vmey7Zg35vz4p1OGlwfo0z05tzs6kUUboN3iNAwPEFc1yAzZ5UtPoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1762765055; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=TyQzH0r7H9s76VhWXhU/QInghP86g6xoBCSX3QCTL18=; b=MThf9t/46y0YPL6Mwv5eFCw3sAFyBzezYKqZnAYKU0FlCnClOcIeG18IyPYMrkjO7SV2G anq+hISe/NAKpg0BG6cd/KLsrjzyt8DIs3lG47a/jOAegKgjjPhdcu8blqzSQr2I0jMraWJ xffhjYhXXMIvIn1w2qiHJdo+gE3Yko7q4OO6Ue4wXLbs6Hc4wjNGm4zCQWuJG3clJBc5e0T dkAUKTvYmvh5KNLDLlTvsGDDQZalSv5xPBx1KrekFY8jr+UosRCX6B++hFicf3xtIoyatQd dbGsJqfJ1s+vfy8sEDuRdPBVR7yiq5RT50CawY0Qd2DMUwl0SWy0DrHbvEmw== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1762765045; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=97q7lC+fnje3xwNzHhCBSeZ/2TNgQJIgpCVBItDf/GE=; b=atBDsNQlQC3L+dEUR/t4Oni/AIHbSCxSFbL/SrAlTC0A73RRxvWjJUrHffIlTfH/K0J5m WZ0uQ0p5SbBATjzXsHtpgOzeDngxwOyrg/lHeyjZupT4aQB1rJkpZnJUe8xPbxR+7YGLzzD 14ZU/A4TvXf9zz8Cjj9wsELfWgduJX2o0BZrKiimSW/EZm8WaimcBUsLBcmebg7WxaUJlmT xU8g5BwJdqk9xr4XoA2xMFBF12c0q4ONDeZw3a+2Q70i8wVKcygPR5QLqgQFdGbr4DU8GXK LuVf6nveRK4znTD7vivhMV4O6VY2yvWh4QMm1MGe9lYLQXETJUZgntlo1ztw== Received: from 188d6d40ca7a (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id B4F3E68FB34 for ; Mon, 10 Nov 2025 10:57:25 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Nov 2025 08:57:25 -0000 Message-ID: <176276504591.25.11542127544023970130@2cb04c0e5124> Message-ID-Hash: H7YA6HUE4SDIJPSWZLSSHCBAPRAJ2MRU X-Message-ID-Hash: H7YA6HUE4SDIJPSWZLSSHCBAPRAJ2MRU X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avcodec/nvenc: fix -Wenum-conversion on colorspace/pri/trc (PR #20882) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Zhao Zhili via ffmpeg-devel Cc: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: 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 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