From patchwork Thu Aug 17 21:48:49 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: 43252 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4c9d:b0:130:ccc6:6c4b with SMTP id fq29csp2265834pzb; Thu, 17 Aug 2023 14:50:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGTbNb/lKLobov5CfjNguo/VTytZNo35JTs3bis+kDXfy0j2G5RjE5QURxOWx0WMdeAm3lP X-Received: by 2002:ac2:5f6d:0:b0:4fe:1681:9377 with SMTP id c13-20020ac25f6d000000b004fe16819377mr325568lfc.44.1692309047119; Thu, 17 Aug 2023 14:50:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692309047; cv=none; d=google.com; s=arc-20160816; b=jz0fEU/BMM60gsu0xEW7oK5cZO1AlVAs18cbKZuWSHTVqqgHrYJc7fqHMui+cvcDcL pnD+ZZHx3KQcr3hi3MhZZCKwaz7pOCmWowinsn6ktGJDLOQLj4Mw2QmVrwARkVtEH1yn T4EipHzJxpuLBsVdH+7Q+8/M+6lxC4l8wfQta/SibXplkwVozS8Z2o3ZdQnmy0zHVxRR I/wMzq/qtZ9LXscG2VB0Wh0ch1Sv1HyHRpLjmakAqNGomQYA810r3dMtSqwgiYFxwN/j 4XTJN2VhmEheec9l4Pxq0ootJBhWVBEj7FgVlOQOLptjbdh7Ofz8ocJ/Bhl0Jqjl14Kz Js9A== 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=GgHko9GRi5q7jfQ3U3dbK7FMPhWrvx1T0CNqUwGZhmc=; fh=DpbP4OnC98Ct+zBdrpJgv1NgOvKTVLIsArQu/ER33Zc=; b=EfgplAWmsfzGNjo/o2xUUf+7FYFVsRrg64OwNAbTaA1YWDvp6p06cIPinJI/s+K1Oq hgehZmD6a0lESoaS12qpa3Qg43gFuoAJEgO9nUA3g31B7Ww7vQJqlIOsmV4P1e3qpcxE Qt2K6dTaUIYbBWcUha3ZH5GeVByiqPKaeYyzhswucvI05+tn53o8UvRO3X1vcbR2Jik4 SvgRryYSouU8y0nv+c8BIJJ5E5j7sxSzq1zIh9Z65Iy9OEgHTEbq2bYS/5K706GgwMj1 L16kwtW7yOZNy4ubzO1QwN2wcqcIOEI5ZCK/AewQoIzn5GTabX5x1qBFrnakccyLORdw MMgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="qdqnx/oQ"; 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 dy15-20020a05640231ef00b005233717f506si313555edb.558.2023.08.17.14.50.46; Thu, 17 Aug 2023 14:50:47 -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=20221208 header.b="qdqnx/oQ"; 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 E082068C7B7; Fri, 18 Aug 2023 00:49:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 98F0768C775 for ; Fri, 18 Aug 2023 00:49:04 +0300 (EEST) Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-4ff91f2d7e2so305882e87.0 for ; Thu, 17 Aug 2023 14:49:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692308944; x=1692913744; 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=osc8fUjib71hIACmz8iInvYxkxMWCS8AWuVQa/E6u7s=; b=qdqnx/oQ61qzwPMY32HL/h1p8dmMFHYdW+pKcY1V6T4BM8nYX/XA3n5fEDQeFa+AUe QU1gjp/riEC21Sko+9Eql9RQX/NOCvGzg9a6eaI/MgG1kAfh07EJFdNEjv9SXCJfd09d wO5znTOG7KuT00psdW5qA8yctlIVffdyXIby1ZyzhAsxPEI6w68VbcbOhmwTRogf6bSC TvymfBPyC7RfXDjJjvFNXSr/jcr8n3s1Un1Es0bjn9qmjvzzSLAhnltmqW83vT/ewFE/ Tx2oFWEiiT7hlP/Ckubz095Uh45oh/SLztLF1n6KDzWKWzRh48j9pGAQltot+/4UEX+R 094w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692308944; x=1692913744; 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=osc8fUjib71hIACmz8iInvYxkxMWCS8AWuVQa/E6u7s=; b=akuf2UdONI9Uk0PVrP7W5+i9LTarjhrqzEybAwtd2SUIjjSHtRi865voNSHi+FzBfY BrlY6oF0bZJpSOcYcD0Q/HQiecSJH3agdXe5RF5nWQnRdNZoCIQrtFuCzClmYCrYkb+A 6x6+OqHFpr85NYmDl21fc1y6f4B/Yh4ZoeMDQcV7rLUmoVHNmw3ccmD6MJajtaNv9okx GSOZ3Y5rgp9Dt4GMgfU/wOpfzVC42YUxTzDcvUF7Tx6uMMGmLTNfz67RU/7qP1ndTV1v lx9M5UyYXHrkB9e9MNspimFK2cTYdDV1VgjCg1e49RNSdeqduPfziXv91lg9ukMLf25n x/lg== X-Gm-Message-State: AOJu0Ywr/OnOWIWUXB9cNmByTUrcfq4yzSqj2Pv84d2dRet/pBb5ga8/ 8UVvDLM8SnAwHej9hrNt7yiF17nHo6s= X-Received: by 2002:a05:6512:b20:b0:4fe:cc2:247a with SMTP id w32-20020a0565120b2000b004fe0cc2247amr342864lfu.49.1692308943825; Thu, 17 Aug 2023 14:49:03 -0700 (PDT) Received: from hifumi.mshome.net (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id w2-20020ac25982000000b004fe20d1b288sm62813lfn.159.2023.08.17.14.49.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 14:49:03 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Aug 2023 00:48:49 +0300 Message-ID: <20230817214858.184010-12-jeebjp@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230817214858.184010-1-jeebjp@gmail.com> References: <20230817214858.184010-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 11/12] 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: Ro5Tyk8r3sba 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. --- libavcodec/libx264.c | 79 ++++++++++++++++++++++++++++++++++++ tests/fate/enc_external.mak | 5 +++ tests/ref/fate/libx264-hdr10 | 15 +++++++ 3 files changed, 99 insertions(+) create mode 100644 tests/ref/fate/libx264-hdr10 diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 1a7dc7bdd5..30ea3dae4c 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" @@ -842,6 +843,82 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt) return AVERROR(EINVAL);\ } +#if X264_BUILD >= 163 +static void handle_mdcv(x264_param_t *params, + const AVMasteringDisplayMetadata *mdcv) +{ + int *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 + }, + }; + + if (!mdcv->has_primaries && !mdcv->has_luminance) + return; + + params->mastering_display.b_mastering_display = 1; + + if (!mdcv->has_primaries) + goto skip_primaries; + + 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 }); + +skip_primaries: + if (!mdcv->has_luminance) + return; + + 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 // X264_BUILD >= 163 + +static void handle_side_data(AVCodecContext *avctx, x264_param_t *params) +{ +#if X264_BUILD >= 163 + const AVFrameSideDataSet set = avctx->side_data_set; + const AVFrameSideData *cll_sd = + av_side_data_set_get_item(set, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + const AVFrameSideData *mdcv_sd = + av_side_data_set_get_item(set, 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 // X264_BUILD >= 163 +} + static av_cold int X264_init(AVCodecContext *avctx) { X264Context *x4 = avctx->priv_data; @@ -1142,6 +1219,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..90d8894d04 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, 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