From patchwork Tue Feb 27 22:12:16 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: 46603 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:aea4:b0:19e:cdac:8cce with SMTP id do36csp12036pzb; Tue, 27 Feb 2024 14:14:38 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXY6DGn7RGpZN32UTRa1KvWXgRjPldAvjRu13BXCb4+sGMzWAjx3wmDgd22JRe+9AMHHlzZz2kPoxzjZqqkZz6vB5Am9u9E/hu6HA== X-Google-Smtp-Source: AGHT+IG6rbR5UMmAEpnKHamP6On+SPSRSRqysbbTR5/yY/DiDv3M9S0D9zB9QPAs7vgf3W0lijWb X-Received: by 2002:a17:906:d0d7:b0:a3f:c3f0:69bf with SMTP id bq23-20020a170906d0d700b00a3fc3f069bfmr605684ejb.13.1709072078066; Tue, 27 Feb 2024 14:14:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709072078; cv=none; d=google.com; s=arc-20160816; b=C81yktrWuoCxQS2B8jNK5z5lrWLV+I2m7wYJmXrH0/3i80okgOzCh/+HltL00Eb0qc txEop9Xlz2b5+LzQV3E/S3SwbWMSQH5Jny6OP3krk4OuVHyQzGr0bKTu4kM7vsDYWrDP 9EvBnf8xiWwYxBrOHgPvSHpgYzydhOvBqJbeSxjZtD1gP6uG8vtGsCJIFJadNxEErNjx PTppGI+SUpYz+BrOWSVG+69ESyAX2uqHK/mf5+s/PlGNI0AfdrTP2yJt8qNRrKDhXAPl rDep5XbfIztRjd2g1a2jqXQhReWAKtq9o3KgSY2cirPqeKCGQUg3TmysCW1HFJzxhcNe ++7w== 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=km3JY6Q/tUtv5K3607MSWUZhtQ+bt5uS5amf0hpemOo=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=S7AtEaAZL35NmN5DamkC1x+KCK5U9snW1drXFXiuTh3jBvqjByrcO/xVfd28HDWKXe Odl5z//MT8Xv30G+3mKdsvrbmlbzaYK/FCBKidyjJtwCKOZO6AwOiFIPFOlw8MgzuNZC RDe5PH4rPa0K/ScPl6JlnO03IoNdjvX0JviG7Yn4Wb0vALPxRjbsWroH6ne5Hn2yc/uR Oget8vlq0WGqglGrpHmM8DKKd3f6+8rlZdxrf18vjn533qV4Ai6zIbl2DzPecPilNY3D 3a8Yu7/7x5iBac1elgDPDiAgLH4esHvaF7GdrevHGlvEpz+ZL2CGm32gHp3XUrv6vfgM zgTQ==; 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=ikdsKKMW; 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 k5-20020a1709065fc500b00a3ebdea18e1si1075142ejv.240.2024.02.27.14.14.37; Tue, 27 Feb 2024 14:14:38 -0800 (PST) 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=ikdsKKMW; 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 C612868CE27; Wed, 28 Feb 2024 00:13:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1542968CBD4 for ; Wed, 28 Feb 2024 00:12:42 +0200 (EET) Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2d2991e8c12so2547381fa.0 for ; Tue, 27 Feb 2024 14:12:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709071961; x=1709676761; 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=GAaCujyyN0wQ8JnNYVZhuaBUYpI9td6t5xHtgfPzbGg=; b=ikdsKKMW0Twd/q2c3zWVcUY4JIqobSjGorJG0+jDIiI2wAfog1jIVfhEQqxEfrJzvV /X3kX3KVWT14zNdNLG6LQddT673CrDAzgxe6puj9oqFwTqY/WW4YKTWerT3xtpMI8jNo o8MrK+mdzcJFec+d/CEskestZAm7YE3MwRUPSvDRFL9HJu+8uefMbq1yBPESvCzFQsNj qAOigEhKvzkdIadPfk3mxrnOVDq/5C9DVtk7G1X+scgRLNoUJuEZXPxWvPdQb1GpyuOB tzM3yJWtmTArZzzzDF5X0xcOuSfkc7vsjEeOGsYfD/lXpePCLpUaK7C1CE1jpkHby7HJ oBgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709071961; x=1709676761; 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=GAaCujyyN0wQ8JnNYVZhuaBUYpI9td6t5xHtgfPzbGg=; b=X0s8NzyUOp3O4WsWjJ/2dhX45xkbh8waIQivEuWOdMhLta27UbSHcQHK9ETAdZh9a6 +4ITfVubJazrhLvu2plsKUkYOBatzYL+fbmYYwlGV4+56LtELZ39PFnyBI6AHSJvooEB 4hvFB0YVuQQX+CwRSig4VCNyQMllfIzCQdkSm57EGnfY7oMfG6CXjN5Xzes1gFVAddvx P5Tf6nn7S+10QcWJi/4r5VeSqYa8fxs0jRVHGSw6xSRD3Y0Cb85eU+7vvnscLgXTtMvR F0WYTrASCYr07QzxKxiOBjO4KU3ekZpNZNeyRS/SSoDWxXuVBROowtu8NRNG/7G4xo+9 dZwA== X-Gm-Message-State: AOJu0Yx5vhDmPyCjJO+NFTRm3cA6CqG+Iw+/3Z+fB8Qh4vzw/YkvzzJA zd9lyxHoK+mFA2P7qozE7yZya/Dk2aNWUVIi3/HW+viZFsMl2NRXrRWxNK2r X-Received: by 2002:a05:651c:2121:b0:2d2:28a3:eb38 with SMTP id a33-20020a05651c212100b002d228a3eb38mr280749ljq.8.1709071961246; Tue, 27 Feb 2024 14:12:41 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id j9-20020a2e8009000000b002d09bc941e8sm1373564ljg.139.2024.02.27.14.12.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 14:12:40 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Feb 2024 00:12:16 +0200 Message-ID: <20240227221226.1377758-14-jeebjp@gmail.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240227221226.1377758-1-jeebjp@gmail.com> References: <20240227221226.1377758-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 13/13] 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: D5tzwvWdxrGa 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 | 88 ++++++++++++++++++++++++++++++++++++ tests/fate/enc_external.mak | 5 ++ tests/ref/fate/libx265-hdr10 | 16 +++++++ 3 files changed, 109 insertions(+) create mode 100644 tests/ref/fate/libx265-hdr10 diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 447e6da25f..8d366f51ab 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" @@ -179,6 +181,85 @@ 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->frame_side_data, + avctx->nb_frame_side_data, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + const AVFrameSideData *mdcv_sd = + av_frame_side_data_get( + (const AVFrameSideData **)avctx->frame_side_data, + avctx->nb_frame_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; @@ -339,6 +420,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