From patchwork Mon Mar 11 20:58:36 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: 46976 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dc95:b0:1a1:738b:6bc0 with SMTP id ky21csp1470254pzb; Mon, 11 Mar 2024 14:00:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVFW7aYVfYqfEgFIe1QQQefJV6uGAt+2M1r66wMUKF5iWooPo8eXzV/cGc4FLNiVlfCzl4jMJOjTtRzj2wpYAkisTnwO/dbSafziw== X-Google-Smtp-Source: AGHT+IF7ypN+Ks9kvf4vYzNMvmYEAmOQbChxHDU+iqEXcpZ4anZVMYBKAHQJPGcc/Bysa2FjAp1l X-Received: by 2002:a17:907:9720:b0:a46:268b:228a with SMTP id jg32-20020a170907972000b00a46268b228amr4149563ejc.29.1710190851435; Mon, 11 Mar 2024 14:00:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710190851; cv=none; d=google.com; s=arc-20160816; b=wZdvzIDkFxD8X4rzr5Y3T+8rExNM/dl+bDlhlrKSrbXf2r1h6w4KqMvqZf4/lHopZ3 A5qVrWlKNBfvLow8zrIa7vkCfEH2EUrMp2HWLbujsoD1RHP30aubo0ZSOgQRHucsvhjp f/42IbU28bjNLxpTpPvpuy5kn89NKcf4h6fIHgTuWd7R8dQwa9BuLsOC9yljAgNvBzYr Rv+1cIg4od+00NPlKnwggjaG5xVzYPYfTxxarJ7uNngnnNFknvPOE/b7okk/XyG6lHKA mtB9HtjywUALD+1z+wdHQ8xGi8AJiLbauXKUD9yYkGMVysA2PPoKOv52Bin2uri9aH9n f7Kg== 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=F6iAz2lmG1fubyYDo1fVh+l5K96SwPDP1NvBTOzvi5k=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=j71x1PlaWGY8X0G3fmhvg4RVv7rTgwUS4PNVyvSmrSwAcA9oiVzSS+DNv1IADyZKlS uH7l9odmQ8mH48x//6+Ggkmr3VHomo5Yg8SHYtojwEWauBxJwLmDgD0y3MJTgkXgKxjP hcuhyy2oaFdEZ/TXr6hpDigO7vZ5oOwi5FvFJuvWH0Z8f7EpIkjioiPyX+nJhyRLsOLI eR3PFUU9D1rjgSj6g260bE+lOM5mIihhPyQRqajCuA2RXueoTG93QNmI1diUeBucDCUs gPPpvfscG/E+RgIX4XL7+rGkhgY4SRMFivHuiMI5nmmitzhoyjD6QaYeol4g8Xn+PafO ofKA==; 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=RRadywZY; 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 l16-20020a170906079000b00a44bee78700si2767613ejc.878.2024.03.11.14.00.51; Mon, 11 Mar 2024 14:00:51 -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=RRadywZY; 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 76C2068D181; Mon, 11 Mar 2024 22:59:06 +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 546C368D11D for ; Mon, 11 Mar 2024 22:58:51 +0200 (EET) Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2d309a23d76so50434611fa.1 for ; Mon, 11 Mar 2024 13:58:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710190730; x=1710795530; 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=E57tkA11MWpZYpXEg3yAXOgxN34frqI5JUyG/cDLpY4=; b=RRadywZYHXwukw8p1hj8xBDkOT62LKbQuPJDCUvaYGerTrUXT/Np37FcoJh5QpcLL8 AwrI6Ledtj2se9cO913oEHa6StZI+wpGfa8yGcAfO8Rn43DVSSRHZM62bW8joWroNBKd JekbTkV+CxnwoY+0dj15cWn36rzivikhaE5aNlTAXeGUjGIe8rpRIkl1+nTqn+I4dsmf +QU0EtPTgV8t0yqaf1at+VnMSKEXGWA3vgPEFPSaqop+VnoqFhmGZoH8wirLPxDk+qWC gQO6RtzKGjALzgWWe981yssqanj5EX7ROKuNBpMLk3rFQinhJpsSfvnQAdplDOz4XL6U 57jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710190730; x=1710795530; 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=E57tkA11MWpZYpXEg3yAXOgxN34frqI5JUyG/cDLpY4=; b=gjWsYQizMraAJYJo5g+gedcksa/p/V086x0h1zbSlVYaPfs5nnGrMLiS9CrhcYD0m4 F9BgJHTXFaGq1FzCLCR/jO/9BLTwSoKrnIbmw374+zTSh76fl00iJ3OP4Xq/2Ls1cv1V Xwq95gXaeajTiLokEM1WlY+LV3C3rlX07RsSeSvPPfsDFNw+SwahaDkSYdb0WdbRyJpH 1Pru3G/Ao3VeTRIHJDVX7kmyY9Aj5PZXCoUV6d0nGiKr2U/0SgDUTft+EVwGHUND+JuL jto7XoJp/46m1aWhDU0tr5mGPCVRfCZoREIxM9ttny05ZyoCn3+CT5+9yEXLBVFbnvaz mF4Q== X-Gm-Message-State: AOJu0Yz28RV/FW61ifzy9QSwn9JgQIFZ4mcguNx/KrJkgqebBRK3P+Oc iqhUbPl2AAu0/OI7DDqfwgg9Ehb2oRknosSV9/EGaw6McZtbflDGpXJ1qWoM X-Received: by 2002:a05:6512:23a4:b0:513:19ce:cbde with SMTP id c36-20020a05651223a400b0051319cecbdemr7507lfv.22.1710190730482; Mon, 11 Mar 2024 13:58:50 -0700 (PDT) Received: from maomao.mshome.net (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id c17-20020ac25f71000000b0051333104075sm1249247lfc.259.2024.03.11.13.58.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 13:58:50 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Mar 2024 22:58:36 +0200 Message-ID: <20240311205844.3569895-14-jeebjp@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240311205844.3569895-1-jeebjp@gmail.com> References: <20240311205844.3569895-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 13/14] avcodec/libx264: 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: +tSSJt7B1c4L Both of these two structures were first available with X264_BUILD 163, so make relevant functionality conditional on the version being at least such. Keep handle_side_data available in all cases as this way X264_init does not require additional version based conditions within it. Finally, add a FATE test which verifies that pass-through of the MDCV/CLL side data is working during encoding. --- configure | 2 + libavcodec/libx264.c | 79 ++++++++++++++++++++++++++++++++++++ tests/fate/enc_external.mak | 5 +++ tests/ref/fate/libx264-hdr10 | 15 +++++++ 4 files changed, 101 insertions(+) create mode 100644 tests/ref/fate/libx264-hdr10 diff --git a/configure b/configure index 05f8283af9..fe883cff5f 100755 --- a/configure +++ b/configure @@ -2531,6 +2531,7 @@ CONFIG_EXTRA=" jpegtables lgplv3 libx262 + libx264_hdr10 llauddsp llviddsp llvidencdsp @@ -6927,6 +6928,7 @@ enabled libx264 && require_pkg_config libx264 x264 "stdint.h x264.h" x require_cpp_condition libx264 x264.h "X264_BUILD >= 122" && { [ "$toolchain" != "msvc" ] || require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } && + check_cpp_condition libx264_hdr10 x264.h "X264_BUILD >= 163" && check_cpp_condition libx262 x264.h "X264_MPEG2" enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get && require_cpp_condition libx265 x265.h "X265_BUILD >= 89" diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 0997c4e134..afeb285487 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -25,6 +25,7 @@ #include "libavutil/eval.h" #include "libavutil/internal.h" #include "libavutil/opt.h" +#include "libavutil/mastering_display_metadata.h" #include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "libavutil/stereo3d.h" @@ -853,6 +854,82 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt) return AVERROR(EINVAL);\ } +#if CONFIG_LIBX264_HDR10 +static void handle_mdcv(x264_param_t *params, + const AVMasteringDisplayMetadata *mdcv) +{ + if (!mdcv->has_primaries && !mdcv->has_luminance) + return; + + params->mastering_display.b_mastering_display = 1; + + if (mdcv->has_primaries) { + int *const points[][2] = { + { + ¶ms->mastering_display.i_red_x, + ¶ms->mastering_display.i_red_y + }, + { + ¶ms->mastering_display.i_green_x, + ¶ms->mastering_display.i_green_y + }, + { + ¶ms->mastering_display.i_blue_x, + ¶ms->mastering_display.i_blue_y + }, + }; + + for (int i = 0; i < 3; i++) { + const AVRational *src = mdcv->display_primaries[i]; + int *dst[2] = { points[i][0], points[i][1] }; + + *dst[0] = av_rescale_q(1, src[0], (AVRational){ 1, 50000 }); + *dst[1] = av_rescale_q(1, src[1], (AVRational){ 1, 50000 }); + } + + params->mastering_display.i_white_x = + av_rescale_q(1, mdcv->white_point[0], (AVRational){ 1, 50000 }); + params->mastering_display.i_white_y = + av_rescale_q(1, mdcv->white_point[1], (AVRational){ 1, 50000 }); + } + + if (mdcv->has_luminance) { + params->mastering_display.i_display_max = + av_rescale_q(1, mdcv->max_luminance, (AVRational){ 1, 10000 }); + params->mastering_display.i_display_min = + av_rescale_q(1, mdcv->min_luminance, (AVRational){ 1, 10000 }); + } +} +#endif // CONFIG_LIBX264_HDR10 + +static void handle_side_data(AVCodecContext *avctx, x264_param_t *params) +{ +#if CONFIG_LIBX264_HDR10 + 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->content_light_level.i_max_cll = cll->MaxCLL; + params->content_light_level.i_max_fall = cll->MaxFALL; + + params->content_light_level.b_cll = 1; + } + + if (mdcv_sd) { + handle_mdcv(params, (AVMasteringDisplayMetadata *)mdcv_sd->data); + } +#endif // CONFIG_LIBX264_HDR10 +} + static av_cold int X264_init(AVCodecContext *avctx) { X264Context *x4 = avctx->priv_data; @@ -1153,6 +1230,8 @@ FF_ENABLE_DEPRECATION_WARNINGS if (avctx->chroma_sample_location != AVCHROMA_LOC_UNSPECIFIED) x4->params.vui.i_chroma_loc = avctx->chroma_sample_location - 1; + handle_side_data(avctx, &x4->params); + if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) x4->params.b_repeat_headers = 0; diff --git a/tests/fate/enc_external.mak b/tests/fate/enc_external.mak index d787941c16..4095a4b51a 100644 --- a/tests/fate/enc_external.mak +++ b/tests/fate/enc_external.mak @@ -7,5 +7,10 @@ FATE_ENC_EXTERNAL-$(call ENCDEC, LIBSVTAV1 HEVC, MOV, HEVC_DEMUXER LIBDAV1D_DECO fate-libsvtav1-hdr10: CMD = enc_external $(TARGET_SAMPLES)/hevc/hdr10_plus_h265_sample.hevc \ mp4 "-c:v libsvtav1" "-show_frames -show_entries frame=side_data_list -of flat" +# test for x264 MDCV and CLL passthrough during encoding +FATE_ENC_EXTERNAL-$(call ENCDEC, LIBX264 HEVC, MOV, LIBX264_HDR10 HEVC_DEMUXER H264_DECODER) += fate-libx264-hdr10 +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" + FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_ENC_EXTERNAL-yes) fate-enc-external: $(FATE_ENC_EXTERNAL-yes) diff --git a/tests/ref/fate/libx264-hdr10 b/tests/ref/fate/libx264-hdr10 new file mode 100644 index 0000000000..99c11677f0 --- /dev/null +++ b/tests/ref/fate/libx264-hdr10 @@ -0,0 +1,15 @@ +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="Mastering display metadata" +frames.frame.0.side_data_list.side_data.1.red_x="13250/50000" +frames.frame.0.side_data_list.side_data.1.red_y="34500/50000" +frames.frame.0.side_data_list.side_data.1.green_x="7500/50000" +frames.frame.0.side_data_list.side_data.1.green_y="3000/50000" +frames.frame.0.side_data_list.side_data.1.blue_x="34000/50000" +frames.frame.0.side_data_list.side_data.1.blue_y="16000/50000" +frames.frame.0.side_data_list.side_data.1.white_point_x="15635/50000" +frames.frame.0.side_data_list.side_data.1.white_point_y="16450/50000" +frames.frame.0.side_data_list.side_data.1.min_luminance="50/10000" +frames.frame.0.side_data_list.side_data.1.max_luminance="10000000/10000" +frames.frame.0.side_data_list.side_data.2.side_data_type="Content light level metadata" +frames.frame.0.side_data_list.side_data.2.max_content=1000 +frames.frame.0.side_data_list.side_data.2.max_average=200