From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id C8A2B4BF4B for ; Tue, 4 Feb 2025 16:31:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 35EA568AFF3; Tue, 4 Feb 2025 18:30:57 +0200 (EET) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DF31689DEE for ; Tue, 4 Feb 2025 18:30:50 +0200 (EET) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-216728b1836so100683555ad.0 for ; Tue, 04 Feb 2025 08:30:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738686648; x=1739291448; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=sYXSRbg88B2Jp2iVeFdcFhmQVti0lhzKtkForjAQIwM=; b=c7753w2jEYJumy0fF/u4y6mG6S3Pu0qs27LCHobac8MnoODE7OjHo22EugulL+r/K3 6EMCEZ0iW40F8izxQ5vu6+F6YT6ClFAuYhVczN0bNrzlXxn4bGVhQsdXSCZ5UK2Ezwpn EAjGDEl1EEoPQBomJVmTrtEktlBugEHmldNu9RFVDwKuaBwZdxw5Ay8S2/eZQ5IbsjVo XCRTgCihOT2NKO+UFiyOpvuudm3Sc38CLXkbQhuCZYCvkXp4c+JpSCEGGPAlm7XnfYIG q0DCNnQLeuG4JeMc8YTZNJgeCz4mNR4gWEHSW5dkrZRom8YkuooRW7mDJmXlfIm795SU Q3JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738686648; x=1739291448; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=sYXSRbg88B2Jp2iVeFdcFhmQVti0lhzKtkForjAQIwM=; b=MngH6c2SkG6RS69a+ozHL3ymn/iv7tnx3GbhVHAvKaHcEKZnkrKOuMTLndUr9KUBfw NTWjlCK28eF28jKUuLrDz/w8FgXJg4Mfgw2qDjOFwRpw2xYi8ddxJ76lps8hz/gBEXdK w27rJnjJwe2ZCNFhgowMgihgvGY6D3zmxANGZDXy/qjmxFzCNRieO+rMR/XKOCk/Q84S WQK0rDM+5pNG4HJH8c8XkNZC/j5CXEiAAwBn4qeU/RdEyO2b7Z1mNJNbzDX9E7d4gfxl 0a25hWxIZHMnZHg/DIUKh131GFqTrqqHDbnYruCM7Jg5oJ0Xdm/uLdZK17Ijl61LpTrg NZEg== X-Gm-Message-State: AOJu0YwLxCA9cwFJTtBBF0Ip6112nCFbVHspuyxJ9wRQha5P63gqt8Ba U+dYDJe3YdxPeavd59YLEks0ik+vifPOnluuMAxVl2lHmNTLW2OY8HffFrE3 X-Gm-Gg: ASbGncsP6fkjKg5coDuCV3Gn5oAdyHGBVQAykaer0gKAixsFOpOFD6q53uHG3IFOW2f t0YKyThrzYQOdSzZK0d2GgOd51ac1xFxXRW9X6ZzqyP4N8apLSWhUicdUZcW7JMX4KXRN+5gWy9 htX3UjlurWL4kD8axKjvAfXrRYUvzMw/mKlI3Kr4b4hcZRhFuBrlbW/6SASPuswkY9vLNM9Q+53 V0rFi+uym08x2M4iU/w76xVX/NjRBgR2EjYnLN//X2goN0PmvpbTIm3T3Z2vkKHNH/Ae1ND3jpf IIUKpbu6u+XNVUVxR8+LqrX6dkN0lgk= X-Google-Smtp-Source: AGHT+IHn/VTjzt6k6XOpvAxv6L61ox9eWaG6RuX61tQyjPk7pSrYYqJ84bjwN0+ckWV+W7srnpHcnA== X-Received: by 2002:a05:6a00:ad8a:b0:726:41e:b314 with SMTP id d2e1a72fcca58-72fd0c623femr40240882b3a.19.1738686647664; Tue, 04 Feb 2025 08:30:47 -0800 (PST) Received: from localhost.localdomain ([2800:2121:b040:c:8cb0:4f4f:5762:f631]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72fe69ba3c1sm11081348b3a.108.2025.02.04.08.30.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 08:30:47 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Feb 2025 13:30:33 -0300 Message-ID: <20250204163033.3767-1-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/nvenc: add support for writing mastering metadata SEI messages X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Including Mastering Display and Content Light Level. Requires SDK 13.0, and only supports HEVC and AV1. Signed-off-by: James Almer --- libavcodec/nvenc.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/nvenc.h | 2 ++ 2 files changed, 84 insertions(+) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 1f6b670c1b..9780fc712c 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -35,6 +35,7 @@ #include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "libavutil/mathematics.h" +#include "libavutil/mastering_display_metadata.h" #include "atsc_a53.h" #include "codec_desc.h" #include "encode.h" @@ -1470,6 +1471,15 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx) #endif } +#ifdef NVENC_HAVE_HEVC_AND_AV1_MASTERING_METADATA + ctx->mdm = hevc->outputMasteringDisplay = !!av_frame_side_data_get(avctx->decoded_side_data, + avctx->nb_decoded_side_data, + AV_FRAME_DATA_MASTERING_DISPLAY_METADATA); + ctx->cll = hevc->outputMaxCll = !!av_frame_side_data_get(avctx->decoded_side_data, + avctx->nb_decoded_side_data, + AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); +#endif + #ifdef NVENC_HAVE_HEVC_CONSTRAINED_ENCODING if (ctx->constrained_encoding) hevc->enableConstrainedEncoding = 1; @@ -1638,6 +1648,15 @@ static av_cold int nvenc_setup_av1_config(AVCodecContext *avctx) av1->pixelBitDepthMinus8 = (IS_10BIT(ctx->data_pix_fmt) || ctx->highbitdepth) ? 2 : 0; #endif +#ifdef NVENC_HAVE_HEVC_AND_AV1_MASTERING_METADATA + ctx->mdm = av1->outputMasteringDisplay = !!av_frame_side_data_get(avctx->decoded_side_data, + avctx->nb_decoded_side_data, + AV_FRAME_DATA_MASTERING_DISPLAY_METADATA); + ctx->cll = av1->outputMaxCll = !!av_frame_side_data_get(avctx->decoded_side_data, + avctx->nb_decoded_side_data, + AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); +#endif + if (ctx->b_ref_mode >= 0) av1->useBFramesAsRef = ctx->b_ref_mode; @@ -2892,6 +2911,10 @@ static int nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) int res, res2; int sei_count = 0; int i; +#ifdef NVENC_HAVE_HEVC_AND_AV1_MASTERING_METADATA + MASTERING_DISPLAY_INFO mastering_disp_info = { 0 }; + CONTENT_LIGHT_LEVEL content_light_level = { 0 }; +#endif NvencContext *ctx = avctx->priv_data; NvencDynLoadFunctions *dl_fn = &ctx->nvenc_dload_funcs; @@ -2956,6 +2979,65 @@ static int nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) sei_count = res; } +#ifdef NVENC_HAVE_HEVC_AND_AV1_MASTERING_METADATA + if (ctx->mdm || ctx->cll) { + const AVFrameSideData *sd_mdm = av_frame_get_side_data(frame, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA); + const AVFrameSideData *sd_cll = av_frame_get_side_data(frame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + const int chroma_den = (avctx->codec->id == AV_CODEC_ID_AV1) ? 1 << 16 : 50000; + const int max_luma_den = (avctx->codec->id == AV_CODEC_ID_AV1) ? 1 << 8 : 10000; + const int min_luma_den = (avctx->codec->id == AV_CODEC_ID_AV1) ? 1 << 14 : 10000; + + if (!sd_mdm) + sd_mdm = av_frame_side_data_get(avctx->decoded_side_data, + avctx->nb_decoded_side_data, + AV_FRAME_DATA_MASTERING_DISPLAY_METADATA); + if (!sd_cll) + sd_cll = av_frame_side_data_get(avctx->decoded_side_data, + avctx->nb_decoded_side_data, + AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + + if (sd_mdm) { + const AVMasteringDisplayMetadata *mdm = (AVMasteringDisplayMetadata *)sd_mdm->data; + + mastering_disp_info.r.x = av_rescale(mdm->display_primaries[0][0].num, chroma_den, + mdm->display_primaries[0][0].den); + mastering_disp_info.r.y = av_rescale(mdm->display_primaries[0][1].num, chroma_den, + mdm->display_primaries[0][1].den); + mastering_disp_info.g.x = av_rescale(mdm->display_primaries[1][0].num, chroma_den, + mdm->display_primaries[1][0].den); + mastering_disp_info.g.y = av_rescale(mdm->display_primaries[1][1].num, chroma_den, + mdm->display_primaries[1][1].den); + mastering_disp_info.b.x = av_rescale(mdm->display_primaries[2][0].num, chroma_den, + mdm->display_primaries[2][0].den); + mastering_disp_info.b.y = av_rescale(mdm->display_primaries[2][1].num, chroma_den, + mdm->display_primaries[2][1].den); + mastering_disp_info.whitePoint.x = av_rescale(mdm->white_point[0].num, chroma_den, + mdm->white_point[0].den); + mastering_disp_info.whitePoint.y = av_rescale(mdm->white_point[1].num, chroma_den, + mdm->white_point[1].den); + mastering_disp_info.maxLuma = av_rescale(mdm->max_luminance.num, max_luma_den, + mdm->max_luminance.den); + mastering_disp_info.minLuma = av_rescale(mdm->min_luminance.num, min_luma_den, + mdm->min_luminance.den); + + if (avctx->codec->id == AV_CODEC_ID_HEVC) + pic_params.codecPicParams.hevcPicParams.pMasteringDisplay = &mastering_disp_info; + else + pic_params.codecPicParams.av1PicParams.pMasteringDisplay = &mastering_disp_info; + } + if (sd_cll) { + const AVContentLightMetadata *cll = (AVContentLightMetadata *)sd_cll->data; + + content_light_level.maxContentLightLevel = cll->MaxCLL; + content_light_level.maxPicAverageLightLevel = cll->MaxFALL; + + if (avctx->codec->id == AV_CODEC_ID_HEVC) + pic_params.codecPicParams.hevcPicParams.pMaxCll = &content_light_level; + else + pic_params.codecPicParams.av1PicParams.pMaxCll = &content_light_level; + } + } +#endif res = nvenc_store_frame_data(avctx, &pic_params, frame); if (res < 0) return res; diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index 55a95f8399..dbd18cac12 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -104,6 +104,7 @@ typedef void ID3D11Device; #define NVENC_HAVE_422_SUPPORT #define NVENC_HAVE_AV1_UHQ_TUNING #define NVENC_HAVE_H264_AND_AV1_TEMPORAL_FILTER +#define NVENC_HAVE_HEVC_AND_AV1_MASTERING_METADATA #endif typedef struct NvencSurface @@ -306,6 +307,7 @@ typedef struct NvencContext int lookahead_level; int unidir_b; int split_encode_mode; + int mdm, cll; } NvencContext; int ff_nvenc_encode_init(AVCodecContext *avctx); -- 2.48.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".