From patchwork Tue Feb 27 22:12:15 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: 46609 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:aea4:b0:19e:cdac:8cce with SMTP id do36csp11958pzb; Tue, 27 Feb 2024 14:14:30 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXdT07EblJ4bv9SDUdqe3b0Mzi8quR8E818E8jo+rxyD1SuJ6/n8zXTDSKq86LSwN0JiNM2DMCBk1PW8RrOIKLjJXJHp8yCDCWKyA== X-Google-Smtp-Source: AGHT+IEvYkgZyUxpqodUCVJBd82xShstlCNB+YDq4JcL6hxc3Q9wJm/3uI9ioVBdU4tey0YFXeLn X-Received: by 2002:a2e:a70d:0:b0:2d2:4637:63f with SMTP id s13-20020a2ea70d000000b002d24637063fmr5246983lje.45.1709072069762; Tue, 27 Feb 2024 14:14:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709072069; cv=none; d=google.com; s=arc-20160816; b=SlD/NDFwTN0LjmEN4fUBk6XDA9VMjo/GCHBSi7MCmbExI4dskzzOS1PQl73Q6u09HY 2wUMDO8gbZmwEFRMMF3dPPtw3pioV0VMtUDYm5CfGj2xPmJAFOnhEQxLXPa9FWxd2eXe 85gXYIMW4/uljdQ7gJWh/BrAl0VZO3OU5aXeb7IqnT+8kL0i/i6boMBa4lQ9BaWbvrAH c1hx5qH6EtJwOWCvI1Dl/wkoAQfRvNuDI35IQdczb283njXUlELXA64llFlu6c8FFJFU ZaUJZjX1YU/RNsh8Lp28yHKzuLvJTvWHEDkrte6y7oG33ctnn7vL9qNxxsFfrbzaC6Ao N2IQ== 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=9tELwVkobSr2LUc+xnswUpogU5OArI4unIiIIBzhVoc=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=F/ODmMuXfMBM7Z3MFk9naQhvfentwYFJYXmm3kDLXse0YnQPnKSFA1nTeLehZ7vwEn pMyZvovgc51NeMx321bsb8KypBsFLL1cS3Yx/LfI4g+hYutlmkYPz8rRsJBWAWPZU/8v bxFXn1WuXLcNndbWuSLw4L6g+pVYSymiJHJ0b3mjnUmaN1f9e/vyip693z2a8J29YaCQ W2FBhCP4Cjo44Uffs2TZvIhgjrIc5RAdszI+d8r0YMlACnBZ0YvGMsbbhXujVWTSwG8M PAfEmwXdrWQXOB4AR3FPMEC28CAPdGIYLnwpKY9cmOd+3fQz5B2y2mFEbKAM+JdC/MEH rZBw==; 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=fGdHbuPD; 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 g20-20020aa7c594000000b005657233dee1si1080742edq.193.2024.02.27.14.14.29; Tue, 27 Feb 2024 14:14:29 -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=fGdHbuPD; 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 AC0F668C8A3; Wed, 28 Feb 2024 00:12:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B003768CACE for ; Wed, 28 Feb 2024 00:12:41 +0200 (EET) Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-2d204e102a9so58060411fa.0 for ; Tue, 27 Feb 2024 14:12:41 -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=HmT+CICr/ckyqKR5iBlwGDZbWhYwkOoCsmCBGHVpwJw=; b=fGdHbuPDtu0xI18ktdG7akLNuGPgz9Z3FTiTX7+8a8ve9Uu5DBNcgxvjz/K9sb4F1h Dma1mOpGWHO9LB6N3LWa4OSHDEzNMGE6hu6Yw29QunEffutBIziH40xs2eRvsyEIVDUb zqczVOu0ajV2QryihKA6UqT+Y7cFE9MKNSRF0B97tWVIeCAtXcFRstwM9EwiKZILBF+U Kthl85bzdwTy6lZ47yfEV8aNxvX0GABxf171lEgcDYKBzq3b9vL4H0NFGsFJlqnZvco1 L+RJq4TtVdDS6vZZAaeR3QeZtk+9T+GjqWl77yYvR5AwGwyKzwCB/EyV0Zbws+0UdzFZ E5qA== 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=HmT+CICr/ckyqKR5iBlwGDZbWhYwkOoCsmCBGHVpwJw=; b=AbjUzFzD2nwqmIOch6aYwDtPT0YnlIwIvLRySQpxfVcwIkwvCdraD7oSZ/kXDjvtKt lO5MFk5X1Yz7QrAEW0TDmURw9ylLzI3BMR/fVLYb8ZIyqJ+vnAjNF5ygdhDz1ZGue+wP ZHbltsarw1QO38tpr+v8rAR19OyixjESjWZOM2MOy/YE9CtXblU1s8zzmYJEu7S6bH9w VH4u0qRgeyH1iqF2TVbErv88c/xoMEvt+lIpi4BDeWyK/yGzFMLcvDVH5WJXHAK229Oi H/v51zwI26P2vycaqVvsVU1EargSH7EDTKEyBsitIH6KGET4h9q68vtpOuL4fYwEzlAl l5vw== X-Gm-Message-State: AOJu0Yw6I3G1xunDZkB9Ndp4XSX9NQWm5u4vz77ckVrk2t4gTIIREeEx fCAULGiPMH43C1AWkzq1Oh7Zb2Eb6b3CrEKvh0HHhTlzHljQeL8xo0fk/P/J X-Received: by 2002:a2e:4941:0:b0:2d2:a473:eb7f with SMTP id b1-20020a2e4941000000b002d2a473eb7fmr1578299ljd.27.1709071960831; Tue, 27 Feb 2024 14:12:40 -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:15 +0200 Message-ID: <20240227221226.1377758-13-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 12/13] 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: 14z+5DCw0vCI 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 bb5e630bad..f48cf46ffe 100755 --- a/configure +++ b/configure @@ -2527,6 +2527,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 10d646bd76..effdcfdb37 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" @@ -871,6 +872,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; @@ -1171,6 +1248,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