From patchwork Sun Mar 17 20:00:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 47143 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:958e:b0:1a3:31a3:7958 with SMTP id iu14csp657030pzb; Sun, 17 Mar 2024 13:03:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUFirdeO5Mz9qIyx/t1fIFb7BVFY8GigxDlO75sp4px6lV97Ispi1NKMHtV+ye3lOxXE36lw+EV5yRiGEPcsXi5o4vSYOVl4R75rg== X-Google-Smtp-Source: AGHT+IGjjAEEgJH4bFIzQsI+GahqiY+Gbi8KcHKZXXZVPfb7xx6OzPZwgsuffMLzu7tBY1YS3Oye X-Received: by 2002:a17:907:1007:b0:a46:8da3:fd17 with SMTP id ox7-20020a170907100700b00a468da3fd17mr4385452ejb.69.1710705802373; Sun, 17 Mar 2024 13:03:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710705802; cv=none; d=google.com; s=arc-20160816; b=CUUwBpkoIxUhm7mMiRROKSk+KyQvJ6P01D+B28Q3s7NmBhQ24vXmRPz3MfOaaoiUVm lB4W7mr2sxTblILOYuEg1rHgNVYOKzRu1jEN/XYu0z3I7KlVS/6O8a8bXeK91mmhjRcc QQDuxZK+N4N4gxCa5KphrI3Ep9oJW5tzpRN0Bg8ybOvq3hxexvYK7Lw1gEhktrWViY0C kpL9WEuYKTigAF2J4KSX5aUIwZTB16paxHrDitkV0+n8jOSJoBCpKGwhz06u87L1m76m yv+U4RAttltv7IvFylTezOqbw7lmNbggncQL6dvp5OZ6g2R7rhXQ1Y0rSV6Xm2tXjpfO kzeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=j8h7l+XX/+KHKkN1FGA0EdvKpWeGkJHagZlZCw1il4o=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=lxW9U6/rS9G4imxS4fs4cFNBJ0I6qd9nW3sx9OwNr6utsOVZLp18BFxXBiBoWsXpuy 8H3RPKjJan29EBvbcFDlptcX/vztNR4staVdP9TzJ2tP33Rn84+SL05EQM4HAglNHH5a 4Fv4zhEQo3q1+CNMcOvFoEJNfQeu7VWLNZMHMxbMXKhEqRNPy8biEHmzyagdxJbc7Kfv Zd58UoJQQW9S6CD2wuvMt4f6jgDb+Zy9itHmk9BoVq6lBOVxWvEveIw7VToOcuEK++oK +BcAC2e5iYYtCwNp9R+LfNNqR1+6yjW0I4FAA5zyqaEp8LAOik25eD7ag6UW+cNTuoU3 jZ1Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=nEEYbLKO; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g11-20020a170906348b00b00a440cbc0b95si3744979ejb.307.2024.03.17.13.03.21; Sun, 17 Mar 2024 13:03:22 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=nEEYbLKO; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BAB5B68D242; Sun, 17 Mar 2024 22:01:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 93F2968D1FC for ; Sun, 17 Mar 2024 22:01:15 +0200 (EET) Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-513dc9d6938so2427554e87.2 for ; Sun, 17 Mar 2024 13:01:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710705675; x=1711310475; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ifT8srkGCY/6JTqzH5gNjLat77CwfCY6fvkfVkvhDDI=; b=nEEYbLKOFUxJfBZ9+IXlUYgrqhM5bss6E7zIjlj1MvJ+4nsEdmbkIXAojCVY7O1ZbK AZftZ8JHZQjUnuNmGNztfuNjrdkNYlek87TAsD/uuLGkQe+gXzXNSuznoxRSUdSi2Cgn LVW9h422ZGPzpSR1iEG1L/R9IX8yxOtLyV0BdadAc/+UorwZnQAwUyE4sxU8Pp5yLCaA gITI72JZpShaVYVarcIjX5/z5bwf4Hx2GK3tlgCmfVOBbdAPWy/qKvEpbU1gF81mk5ni b8w+apc5LLajj7cJfuWVIiryNhLz2f75CCpOq6VHqNTxanc0wKQ5gh/Ihk4P1jUDwk60 oiQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710705675; x=1711310475; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ifT8srkGCY/6JTqzH5gNjLat77CwfCY6fvkfVkvhDDI=; b=edvxLDBbtdu2Qvrv7GMtcUQLXijGDBe9+YSRU5BSCJEeNGVqDkWgejtBurQW+8u9Yt VIVT1R9cHFSDKbgTAEQ/9pqUi2Esc5RqAzVF7jCOWMobpqy3iaxIMfNriOYpfOZceAbn 5Y0rRNvB+NjrrIQxB616LUKvE5aQAumwxGT2DwNwO4kUS52co1EOSpnHUiLNnaF4w/bG H/sla8KjeJx0NXxdeI13XWyHif98bThDi0VLxbxgqDfVWN+mN9C5JcEK4u5cWWwbu1D/ hAINyc83Yk5KH0UJ1ktoNHsX2Kk50zGKqOI015y3iMmKr0J1SYYeyiL9iK4LmMxL7a9j 7XMw== X-Gm-Message-State: AOJu0YzpWC885NMk9PSZIxmwgLwuFjpAgFsWhLX0XtltSVTrvePtDksf AB9X/Nb3RfAexxnB+evT3kYgcEK2rQ2ZKrDS9UsBLyZt/kvkmaL/XE7xStlY X-Received: by 2002:a05:6512:12d6:b0:513:d524:3790 with SMTP id p22-20020a05651212d600b00513d5243790mr7233111lfg.43.1710705674807; Sun, 17 Mar 2024 13:01:14 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id y3-20020a056512044300b00513c844603fsm1340462lfk.41.2024.03.17.13.01.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Mar 2024 13:01:14 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 17 Mar 2024 22:00:51 +0200 Message-ID: <20240317200100.152097-15-jeebjp@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240317200100.152097-1-jeebjp@gmail.com> References: <20240317200100.152097-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v9 14/14] avcodec/libx265: add support for writing out CLL and MDCV 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Nom6nk/HdBiv The newer of these two are the separate integers for content light level, introduced in 3952bf3e98c76c31594529a3fe34e056d3e3e2ea , with X265_BUILD 75. As we already require X265_BUILD of at least 89, no further conditions are required. --- libavcodec/libx265.c | 89 ++++++++++++++++++++++++++++++++++++ tests/fate/enc_external.mak | 5 ++ tests/ref/fate/libx265-hdr10 | 16 +++++++ 3 files changed, 110 insertions(+) create mode 100644 tests/ref/fate/libx265-hdr10 diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 92183b9ca2..0c884fe04d 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -28,9 +28,11 @@ #include #include "libavutil/avassert.h" +#include "libavutil/bprint.h" #include "libavutil/buffer.h" #include "libavutil/internal.h" #include "libavutil/common.h" +#include "libavutil/mastering_display_metadata.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avcodec.h" @@ -176,6 +178,86 @@ static av_cold int libx265_param_parse_int(AVCodecContext *avctx, return 0; } +static int handle_mdcv(const AVClass **avcl, const x265_api *api, + x265_param *params, + const AVMasteringDisplayMetadata *mdcv) +{ + int ret = AVERROR_BUG; + AVBPrint buf; + av_bprint_init(&buf, 0, AV_BPRINT_SIZE_AUTOMATIC); + + // G(%hu,%hu)B(%hu,%hu)R(%hu,%hu)WP(%hu,%hu)L(%u,%u) + av_bprintf( + &buf, + "G(%"PRId64",%"PRId64")B(%"PRId64",%"PRId64")R(%"PRId64",%"PRId64")" + "WP(%"PRId64",%"PRId64")L(%"PRId64",%"PRId64")", + av_rescale_q(1, mdcv->display_primaries[1][0], (AVRational){ 1, 50000 }), + av_rescale_q(1, mdcv->display_primaries[1][1], (AVRational){ 1, 50000 }), + av_rescale_q(1, mdcv->display_primaries[2][0], (AVRational){ 1, 50000 }), + av_rescale_q(1, mdcv->display_primaries[2][1], (AVRational){ 1, 50000 }), + av_rescale_q(1, mdcv->display_primaries[0][0], (AVRational){ 1, 50000 }), + av_rescale_q(1, mdcv->display_primaries[0][1], (AVRational){ 1, 50000 }), + av_rescale_q(1, mdcv->white_point[0], (AVRational){ 1, 50000 }), + av_rescale_q(1, mdcv->white_point[1], (AVRational){ 1, 50000 }), + av_rescale_q(1, mdcv->max_luminance, (AVRational){ 1, 10000 }), + av_rescale_q(1, mdcv->min_luminance, (AVRational){ 1, 10000 })); + + if (!av_bprint_is_complete(&buf)) { + av_log(avcl, AV_LOG_ERROR, + "MDCV string too long for its available space!\n"); + ret = AVERROR(ENOMEM); + goto end; + } + + if (api->param_parse(params, "master-display", buf.str) == + X265_PARAM_BAD_VALUE) { + av_log(avcl, AV_LOG_ERROR, + "Invalid value \"%s\" for param \"master-display\".\n", + buf.str); + ret = AVERROR(EINVAL); + goto end; + } + + ret = 0; + +end: + av_bprint_finalize(&buf, NULL); + + return ret; +} + +static int handle_side_data(AVCodecContext *avctx, const x265_api *api, + x265_param *params) +{ + const AVFrameSideData *cll_sd = + av_frame_side_data_get( + (const AVFrameSideData **)avctx->encoder_side_data, + avctx->nb_encoder_side_data, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + const AVFrameSideData *mdcv_sd = + av_frame_side_data_get( + (const AVFrameSideData **)avctx->encoder_side_data, + avctx->nb_encoder_side_data, + AV_FRAME_DATA_MASTERING_DISPLAY_METADATA); + + if (cll_sd) { + const AVContentLightMetadata *cll = + (AVContentLightMetadata *)cll_sd->data; + + params->maxCLL = cll->MaxCLL; + params->maxFALL = cll->MaxFALL; + } + + if (mdcv_sd) { + int ret = handle_mdcv( + &avctx->av_class, api, params, + (AVMasteringDisplayMetadata *)mdcv_sd->data); + if (ret < 0) + return ret; + } + + return 0; +} + static av_cold int libx265_encode_init(AVCodecContext *avctx) { libx265Context *ctx = avctx->priv_data; @@ -336,6 +418,13 @@ FF_ENABLE_DEPRECATION_WARNINGS return AVERROR_BUG; } + ret = handle_side_data(avctx, ctx->api, ctx->params); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Failed handling side data! (%s)\n", + av_err2str(ret)); + return ret; + } + if (ctx->crf >= 0) { char crf[6]; diff --git a/tests/fate/enc_external.mak b/tests/fate/enc_external.mak index 4095a4b51a..30021efbcd 100644 --- a/tests/fate/enc_external.mak +++ b/tests/fate/enc_external.mak @@ -12,5 +12,10 @@ FATE_ENC_EXTERNAL-$(call ENCDEC, LIBX264 HEVC, MOV, LIBX264_HDR10 HEVC_DEMUXER H fate-libx264-hdr10: CMD = enc_external $(TARGET_SAMPLES)/hevc/hdr10_plus_h265_sample.hevc \ mp4 "-c:v libx264" "-show_frames -show_entries frame=side_data_list -of flat" +# test for x265 MDCV and CLL passthrough during encoding +FATE_ENC_EXTERNAL-$(call ENCDEC, LIBX265 HEVC, MOV, HEVC_DEMUXER) += fate-libx265-hdr10 +fate-libx265-hdr10: CMD = enc_external $(TARGET_SAMPLES)/hevc/hdr10_plus_h265_sample.hevc \ + mp4 "-c:v libx265" "-show_frames -show_entries frame=side_data_list -of flat" + FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_ENC_EXTERNAL-yes) fate-enc-external: $(FATE_ENC_EXTERNAL-yes) diff --git a/tests/ref/fate/libx265-hdr10 b/tests/ref/fate/libx265-hdr10 new file mode 100644 index 0000000000..571c837cac --- /dev/null +++ b/tests/ref/fate/libx265-hdr10 @@ -0,0 +1,16 @@ +frames.frame.0.side_data_list.side_data.0.side_data_type="H.26[45] User Data Unregistered SEI message" +frames.frame.0.side_data_list.side_data.1.side_data_type="H.26[45] User Data Unregistered SEI message" +frames.frame.0.side_data_list.side_data.2.side_data_type="Mastering display metadata" +frames.frame.0.side_data_list.side_data.2.red_x="13250/50000" +frames.frame.0.side_data_list.side_data.2.red_y="34500/50000" +frames.frame.0.side_data_list.side_data.2.green_x="7500/50000" +frames.frame.0.side_data_list.side_data.2.green_y="3000/50000" +frames.frame.0.side_data_list.side_data.2.blue_x="34000/50000" +frames.frame.0.side_data_list.side_data.2.blue_y="16000/50000" +frames.frame.0.side_data_list.side_data.2.white_point_x="15635/50000" +frames.frame.0.side_data_list.side_data.2.white_point_y="16450/50000" +frames.frame.0.side_data_list.side_data.2.min_luminance="50/10000" +frames.frame.0.side_data_list.side_data.2.max_luminance="10000000/10000" +frames.frame.0.side_data_list.side_data.3.side_data_type="Content light level metadata" +frames.frame.0.side_data_list.side_data.3.max_content=1000 +frames.frame.0.side_data_list.side_data.3.max_average=200