From patchwork Mon Mar 20 23:34:07 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: 40747 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2166532pzb; Mon, 20 Mar 2023 16:36:17 -0700 (PDT) X-Google-Smtp-Source: AK7set9UgAKmR36rtjbUxpv+NA2U9bC2mWFs2Lzk49L9VmZBaAXUX+FkUOntrxoFAvvesXGPfWkt X-Received: by 2002:a17:906:c04c:b0:92b:5c67:c660 with SMTP id bm12-20020a170906c04c00b0092b5c67c660mr809558ejb.69.1679355377148; Mon, 20 Mar 2023 16:36:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679355377; cv=none; d=google.com; s=arc-20160816; b=MYSKViIyfSL2Bp1uSz0Y3UF2HxutS89dmGo17DfgFpW5gGHqhdzzk/jvbDH/UeowmE lCQUQiYJlvzHMlJqcOqs+sxzthruaAVoJ8aUEq6tBHWEnUZfaVV0Swax4KBMFrRPp/YJ I+jtQNivGkZaH6EgD1tTaiPZFCfu+bcyNSnKA76jNPT9cxRSNkm0HPbUD2qhBwzvwYss uFiqra7FBzEltJXj/QPGfv6HvpCKT3/ols4zacKKs5y6/HqjmDbVpmZSsE/xzsRJ4IS6 f7uhvmCdUWYobBRmoxbd3PTkO0XcHFTkoPxIpd+l8bDU/l2Cl3LaQV+ng9meyeoVUqUV 7kzA== 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=8rV2zRcVWcWGldjSRLYHMULQ1KsX/nVbYZfddbFYYuQ=; b=URoFc3wLgCqnspchg6FgQqO85/QmKPTtq4S9c9EaXagmRuK36I0bPinG4D5L3GzCAL gG1h74io3uFpkrdnhe1uwczCJ/9vnRze5AU1VlmzDqSS9VPmakSV1IDUTayNEruIbuPU csNegobtnD8/midmaHWjqk+ZiXQas7iohm2knbcYWRHY+gfQrga9srqBp6gm8UCY6ena vbYEfAIdRGI5x44yGN9ZMdcaA2tIba/vyv3Z4Da4lDLWRus1gbEZEJFPCoqvXpMkdQqF cjk2UqiIWpK5AwROF7R9Km/cDF1tjjWrOifRda38xHCrS3viAwrXHTQP9teH5QAWbLiS dJNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Y46ozT5m; 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 u11-20020a170906950b00b009332d9b2a96si3574135ejx.955.2023.03.20.16.36.16; Mon, 20 Mar 2023 16:36:17 -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=Y46ozT5m; 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 BA27C68C62E; Tue, 21 Mar 2023 01:34:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C82A68C5AC for ; Tue, 21 Mar 2023 01:34:21 +0200 (EET) Received: by mail-lf1-f51.google.com with SMTP id q16so6159726lfe.10 for ; Mon, 20 Mar 2023 16:34:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679355260; 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=SpAa/pjolt/eUYqhGtTYzdpdGq6gC/sLMVOV/jRTrsg=; b=Y46ozT5mdt/Y4ajZiJW6sOQSLXwGaDA+HU74HT+40Vt28sFnkHkpEVRLzVB84ah5k9 QuN18wHjNsckxA7WuaHjq6A+z6nd+MVVslc9wdsHvydo2f5akzuFhg2+33A95iTxYzBw Y2XFNbDr88MaSEY9GkaE/RUIpDbsj1W0J0hrEVHUZM+MOD8jkBH2Wmfwqm6MhgQvLr4G yxm2xZIhSd5H5ALpevEbtgcJXfsvEckesahhm72AL91VZJfwidNRouuxF2YrKMmeN766 nrCIwOse0S1yI+g9WkbPAQrMOmOnQ6SeuRFnlVIUxzJsf/Vhqw8KPbm//HTDMjr0vGUX oq3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679355260; 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=SpAa/pjolt/eUYqhGtTYzdpdGq6gC/sLMVOV/jRTrsg=; b=UIO7TqoNWKdIqi5v+CVvArtcdptw/ou/0vReLwXTEMAxediFGEccldC2cJrqMuZYY0 738jw/BBh3UnVCMcA8gi/rYFTrGYo6rVOoDxzXjbLL0mvJKOJ53heIhg9ro8TnqNsDvI c1Xm3maGKW0Ol9Z2YklMRjspTlpLXWgVFWZk6P2xqhxyhyAUtKvFlAB+d8bWe7tv3VHx tuE0ebNAkvoiYhEXBWn5wnCNVqBm/NJtPXu0/8X1lshui/hxIayy3lQOTuzZv2vEB8G/ WcL5Z7uDkld25SHujZiP5+bAb3Z5hDGNr6zTbVgWwsmTUQISo0Vnp63Pmraslob/VZr9 sWEg== X-Gm-Message-State: AO0yUKWR/zU28wudnISfTaRLT2LSrMGf5LWvTrpF/pkgcmDooZUCQd88 Hk5xD8+YYnUPEO4+pQzKJvVgAXj14rY= X-Received: by 2002:a19:740e:0:b0:4e8:49ff:8df8 with SMTP id v14-20020a19740e000000b004e849ff8df8mr202347lfe.61.1679355260657; Mon, 20 Mar 2023 16:34:20 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id j19-20020a19f513000000b004e84b79de9bsm1900701lfb.254.2023.03.20.16.34.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 16:34:20 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Mar 2023 01:34:07 +0200 Message-Id: <20230320233408.134255-14-jeebjp@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230320233408.134255-1-jeebjp@gmail.com> References: <20230320233408.134255-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v0 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: OmGU7oWWNenu 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..83c870609a 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->internal->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;