From patchwork Fri Mar 31 16:22:04 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: 40960 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp852363pzb; Fri, 31 Mar 2023 09:24:03 -0700 (PDT) X-Google-Smtp-Source: AKy350b4eqnhqW48gT/NsA8Y7VYREm5LmcyVeLIHpMpovlOyPo+VXAh8CA6Ub6i0gNleTp3U+w3K X-Received: by 2002:a50:ec89:0:b0:4fa:4b1c:5ea3 with SMTP id e9-20020a50ec89000000b004fa4b1c5ea3mr27239245edr.23.1680279843439; Fri, 31 Mar 2023 09:24:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680279843; cv=none; d=google.com; s=arc-20160816; b=aM5jPG4TwAWJSTEHaeILeFEdctycvmJ7YP3KJnRvQMlGkzH8q9ziN6ZfS0L9zFx9Qm vUEsto8Uy0jDVT/kcP+3z8H0LvkyH6h450K/zEgp9E8g7npDV8R5kCAh5bAsJc/rDoK3 W3/6n5oonSHVbXZaL508mZ7wrJqwA4yN9B+kOHcfEBF6yLUQlyHIqyKwm/ukTKMa53su ttVt4aTbpfwySaW+bzDsqDytni/H47i5NWB4etWBgt2mbq+wewPbuNXHRrM+IriERxS/ KJecYryolZdx5k9EntQZKCt0PDq08Ho4k2CXAb+o3QG5J1V5m5wqBANMDtDb4yFKXKGc 0zcA== 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=CTq+Au6ZEIkv5JsFiVhv65nGt1FrLkLm4aAZ/5qI8v4=; b=vgtrX8WF5O+iOrTbki9gyI75XAVHzIRtcAPsMYUZ7OxfJrYJ04Tn5+Wt4zUf0bNHP9 nXdlTeosAfpOWmCvUMOX++wXFQAb593Yb248++X+gNBE1OjE6hvvzDHsU+wLfTp44vU5 t8/T9K5Nkpc31PUPO9+Yl6uMSnKq/jUlxpen8SWnQ5MGwNwz+GgQt67k+AgtgXaonla1 1hE11wlnAFmvi60NJVyTO5itjz39IZWQ+WIRSiqTBZuW5fYIoP++INM6ncbSOKEmL2ip xGkmSsdpmljyusWk+o3lO2Yg3JLGF2AUqZSZaKIp1cN6rovjRLsOqNXG1kojbr9uEhxV NdBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=qS0zfC2b; 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 q7-20020aa7d447000000b004fcd1adbb05si1538089edr.210.2023.03.31.09.24.03; Fri, 31 Mar 2023 09:24:03 -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=20210112 header.b=qS0zfC2b; 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 8CB5768C354; Fri, 31 Mar 2023 19:22:35 +0300 (EEST) 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 36AB368C29A for ; Fri, 31 Mar 2023 19:22:19 +0300 (EEST) Received: by mail-lj1-f180.google.com with SMTP id 20so23664178lju.0 for ; Fri, 31 Mar 2023 09:22:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680279738; 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=tL4emu2ZrZJaRofE5kS5tGm3dysqe64JI+gN8gTMsvg=; b=qS0zfC2b1v9ML6iQ/oseY+OseFzh+o64lGWe1ItEuhjGFYnboAqu7kUtc1v8PKfAvO LleJ129i6wO+w9fpp9sIej+HCh1cyAWaqzpE74XxkOH0dlTCqcXobiYooO7TJAIrGG4d 0VFC7W5kg91h+27NrqSFXbO9mAIV+mUsMQwPMAoTxmzDqvAltX4D43Ud+SjnQx7o+oGD uAruX+c0zIs34+8HEkcnHONyZTLTlXmtwU53OHwXuVhNiEp8UhOpOr8X3vHiKO8HJuxX 3zL87UlKqcBwqsRgK2IYUPRsDs8ZOaooYnu3LUj4Ppx0m+uo+xFqxZfG+5wzs8ShObcy 1ttQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680279738; 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=tL4emu2ZrZJaRofE5kS5tGm3dysqe64JI+gN8gTMsvg=; b=I38BIV9o7jKoR73HIAK4xkaxysR/bN6pmidapgsxZUXFRoI4p4WCx60dZ8BROi+B+N MohINSchA7QrHr+ia2LDHqvmq49G8w0LnbdEsRHh1yt+yWXtFauuUDDe019y+jr0rmZn aGRcbi+TccLz+sdPzqqwmDCrVAk9VUf0ujqh49tX/8XKKZ7B1VFTmd54FPa88d42bryB GtRA9UIJrgfW1Q9fwKnIQmKwQWWmwk1MxLgy5HQN5YD6STFHX//jJrTj5A2ObIXW03zj kqx0MlYUIWUnYhDDMt98jkaBtbnUaShYuygPQtq6O5CoI4FCgO39jf5rroDuOoVuAHvr 8o9w== X-Gm-Message-State: AAQBX9fvIAo0bxsZuRc80AmsVL0BWEVjzDPYUFQyRyNjxcBbIT6GbEmm rz/Erxxbrt6Bf+fZQcBUt0x7W1hBfRQ= X-Received: by 2002:a05:651c:95:b0:299:cf0a:bf8 with SMTP id 21-20020a05651c009500b00299cf0a0bf8mr8404127ljq.17.1680279738610; Fri, 31 Mar 2023 09:22:18 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id n20-20020a2e8794000000b0029573844d03sm411483lji.109.2023.03.31.09.22.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 09:22:18 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 31 Mar 2023 19:22:04 +0300 Message-Id: <20230331162205.428735-12-jeebjp@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230331162205.428735-1-jeebjp@gmail.com> References: <20230331162205.428735-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 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: 6i3MeB1HqDRw 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. --- libavcodec/libx264.c | 79 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 92828fabc3..f841c66227 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" @@ -737,6 +738,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_get_side_data_from_set(set, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + const AVFrameSideData *mdcv_sd = + av_get_side_data_from_set(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; @@ -1031,6 +1108,8 @@ static av_cold int X264_init(AVCodecContext *avctx) 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;