From patchwork Sun Nov 26 19:58:33 2023 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: 44821 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp2880736pzb; Sun, 26 Nov 2023 12:01:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IFP329gCBfzYutYgW4yjJL6LnD62rNx0+Z5P8Yo60AuGqXcnEhZJGCOgt+E3PBHSQtq+3HL X-Received: by 2002:a17:906:7082:b0:9be:e90:5016 with SMTP id b2-20020a170906708200b009be0e905016mr6320081ejk.24.1701028863311; Sun, 26 Nov 2023 12:01:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701028863; cv=none; d=google.com; s=arc-20160816; b=NJ3otYC5Jobi1bRfmwBKyLEMZLzQKwdThmdEYcjuQCVoQ4wr7NX9qTNhY9oqMYPVOY V7bhdDMdjiZ19j2wbQK202UryrvNZ91/UBGBJ/mltiogmtWB66t/5bl3X126T2d/KCbM VDCtOg/5o30v1zRHeSoPKexdfCwXkS84LS5Mu/bWEGpDEeUhyOqB9QaBzcmBPQGKav/c VAQyUNekeyggtUM9T30i90SdLJYH8nxup2arjgoSDLDL/GnAUq3ImWb0EHW8eFCrLWzo eIBaZ+EwRg7PVbZlG52nb5e32md/TfIC2dfFCxiWvaYyFDsbJN3SfeKPvUGrQXefPNxw QPlg== 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=zJdQwB6djVtYl42Wr9y9NYPNdkomrNBG+8ySxnj3V5o=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=WwZIubFtikjWYrRcMbKverGNkU2yluJFNlUt3UMLG9ELpkfVtIh8ErKIKO7iAhAkG3 iFUsAMMJtE5sab3WTXErD+aVncxB+933xqvUu3ffsgAB5GoCu5Lr98wUZOaO4IOY2HTn +TIth8/iKYBWuaEhDiE4zfONIfej/9YM7jK0RkzfgChIMxX5uC7yFWdwkZ114c0ji8NA Imq5RXPTPkJWcAWfk63KsQXxepTXHwJRfQ921QS94RFBgQNOVh17n7lrXlrXO+VUCxFj gQJ5/8Ee5ZvZ2sMGzebC0zt0uFp4ctaN6xOKh+yj/EG0eXjrV1YuDv5gzsmZAjixP5Ku nmEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=P5WMmLjW; 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 b22-20020a1709062b5600b00a0c3ac58a3bsi1738109ejg.353.2023.11.26.12.01.02; Sun, 26 Nov 2023 12:01:03 -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=P5WMmLjW; 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 95DF468CFBA; Sun, 26 Nov 2023 21:59:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 118F468CF89 for ; Sun, 26 Nov 2023 21:58:54 +0200 (EET) Received: by mail-lj1-f169.google.com with SMTP id 38308e7fff4ca-2c50305c5c4so45701721fa.1 for ; Sun, 26 Nov 2023 11:58:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701028733; x=1701633533; 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=nwu3U7xuypC7/hnhLI4gkIecNHWah519xlQnz18MLf0=; b=P5WMmLjWSNaI9/8n8ywiiHzMyORJ+l15cYTv3hLTD7thUGNikpGNOzquN3a5ou+N38 NoBD6jVYn/d6U0G++pEPDENAEizHh3Gh1OlpUE0uRSenykcLn5TU7B3GhxFzrFyhtdz9 3ZCJTwbX5YyiV5VRNYCl2BGRxopduuJcDvH5h2QEQsBui75ONjb+RwjCyupHOAcv27hG XStVbRlG4bLB6NVJqYOM1XiAbjqbGQm0AFVR0OBG/A2URJOOMYOkHiPc5bH/GXg1zYbu FuZUdL5mMf4kZ3QBA9u0f0DMUDdpziM4WYEQfMCrdKACqzmufj69iXN+1lfX2G3D2utr n12g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701028733; x=1701633533; 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=nwu3U7xuypC7/hnhLI4gkIecNHWah519xlQnz18MLf0=; b=NIzfroRjytf7Z4Or1V3dUWRafTClL/QAjV6xgL52Iy5kouEwO3LCuuyzAUedOUAS3U e0RN/7hbcP0dcgnccD2pbEPG73nvxH021u+nWuQo2RnghdVOfA1dUmcgaAGJPJH1EKGp xvv7kxPuZP3Ad2n4OfPcmVko0n6tp/QRZdFNrqObuFQAfiHJTYSvdpAPJVmCPogZYJ35 DfAMxqQgELRlnVlCn/Xx9Yt3Mcznh+spRfBFsGGL7INQF5iWxoFHn46M1+wpIvtV5JTF fMRw57rZkYoLxzEVom4H42NecPL/Ko5lgD0ZS2k/0Jb4QYZeSAyp0nrLUXWU/ZaFqUon CTxQ== X-Gm-Message-State: AOJu0Yy65v0uGTIJvaeK/oTi2K+2Byhac2Gk3iLSeMvNtZdsdborLPqH O2i3ceYepZLjgHyMeIIWEL24tdWcpFw= X-Received: by 2002:ac2:5234:0:b0:50b:a6ff:129f with SMTP id i20-20020ac25234000000b0050ba6ff129fmr4258897lfl.59.1701028733238; Sun, 26 Nov 2023 11:58:53 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id k16-20020ac24f10000000b00500d1a72734sm1281833lfr.130.2023.11.26.11.58.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Nov 2023 11:58:52 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Nov 2023 21:58:33 +0200 Message-ID: <20231126195838.392467-15-jeebjp@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231126195838.392467-1-jeebjp@gmail.com> References: <20231126195838.392467-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 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: JAXeZQEb1g3k 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 | 87 ++++++++++++++++++++++++++++++++++++ tests/fate/enc_external.mak | 5 +++ tests/ref/fate/libx265-hdr10 | 16 +++++++ 3 files changed, 108 insertions(+) create mode 100644 tests/ref/fate/libx265-hdr10 diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 447e6da25f..96e50a6223 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,84 @@ 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 AVFrameSideDataSet set = avctx->frame_sd_set; + const AVFrameSideData *cll_sd = + av_frame_side_data_set_get_entry( + set, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + const AVFrameSideData *mdcv_sd = + av_frame_side_data_set_get_entry( + set, 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 +419,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