From patchwork Sun May 21 12:24:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 41757 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp1072863pzb; Sun, 21 May 2023 05:25:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ76CmV7r6w78aAPaQEIV/Ag+ijz9tvyHtNz1Rv3Q75olFiH1AqdDpBsBxU4kGQuDMScC9aT X-Received: by 2002:a05:6402:78c:b0:510:5630:cd0f with SMTP id d12-20020a056402078c00b005105630cd0fmr6631783edy.35.1684671912052; Sun, 21 May 2023 05:25:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684671912; cv=none; d=google.com; s=arc-20160816; b=XaKBWJNzZHVK/SN9GcpyeoGq+GwJ5gMdJU9ejAqUl33zYU3PnflHfpTlKDeS0NOYQX 9XU1JIRvsm2kODmFNRD6emlybl5W8ztSiEZgRV2wqmhEsnSb/nwsNyKCo0KECMpE+4Ao mVJoRYg7mYQGHtaupAhKuBdXwo2AkewkNQlOGDCdlfqmP4G35CGRmCqKtUTdkdoNU1uO 5fCiS9yIWSW1bl4aFYs7LPPEKjxY7rEWO2F58LTVG70MdAexfQbCawDPWFJiPTAbFHqe f5aZ5P6HzGEn1pkHI5FWJXpg152Et46jU0uB2xVrov6lGtNec6kCF/ITei9EYb5aI5Wh /APQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=ptXWPkd7sY5T2a1Z1UFIaWlERH3qoSPYkBfc5W3qxRw=; b=KZqKKxuyXwMLMQ15/+b6V3Po3EVZcQaH8RfB/WEijspN96vgDUW73mRtZkY4az5MGo LoRfigQj1yPDf0Mj+t1tPpKkH5kbShUGA+O47b89zraTEZ4YlGaFoi2t46CtR4rRY7N9 JbY7mdczhNzTzFhi3xw+u7oyRT5RVwoyKFVnTpu6j5Ao6TlM/opZB1UhuSfuNLHir7JM Damd5RtF1HQEIsi7IfOZ4fjCcBGDuDoIXmYjYJ2egvXnlFD05yZbzPdpmLxjTulW+Rtb uojKbCd080HtyO21A8Bk8hCA5UJ5Tbzu6Lz7WxLqpi6JqFu20wtmRh0DaPstoZDWQfgJ fbOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=mPBgtU5A; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r22-20020a056402035600b0050d0ddf6582si2971128edw.474.2023.05.21.05.25.11; Sun, 21 May 2023 05:25:12 -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=@haasn.xyz header.s=mail header.b=mPBgtU5A; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9848C68BF98; Sun, 21 May 2023 15:24:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9837868BBF7 for ; Sun, 21 May 2023 15:24:41 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 5750048F98; Sun, 21 May 2023 14:24:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1684671881; bh=8pqZ4JjAtLpRh7eqew8Xh60AIzk+fETSZaolLIeKgVI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mPBgtU5AwyEOE4JQAcG5SV4DX1iVRybHvW5PNp7SlUQooH4vUaUptoZ3325yVGFTN X4VC887iBvTvaJldk8bgvmqv0i4ciCCPE4rGni4LxCOeURSuSbAqdRvJxBjSGOB7Os yyQXFFnd5gy9+B+LaJ10K3aU8PzDDwOX/5bkm7h8= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 May 2023 14:24:37 +0200 Message-Id: <20230521122438.78375-3-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230521122438.78375-1-ffmpeg@haasn.xyz> References: <20230521122438.78375-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] lavfi/vf_libplacebo: update peak detection options 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 Cc: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HmX6hzi1jfOS From: Niklas Haas Upstream peak detection lost one option and gained one option. Update code and documentation as required. --- doc/filters.texi | 9 +++++---- libavfilter/vf_libplacebo.c | 11 +++++++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index eaa1a282209..a7b091df6ec 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -16341,10 +16341,11 @@ logarithmic scale between @code{0.0} and @code{100.0}. Default to @code{5.5} and @code{10.0}, respectively. Setting either to a negative value disables this functionality. -@item overshoot -Peak smoothing overshoot margin, between @code{0.0} and @code{1.0}. Provides a -safety margin to prevent clipping as a result of peak smoothing. Defaults to -@code{0.05}, corresponding to a margin of 5%. +@item percentile +Which percentile of the frame brightness histogram to use as the source peak +for tone-mapping. Defaults to @code{99.995}, a fairly conservative value. +Setting this to @code{100.0} disables frame histogram measurement and instead +uses the true peak brightness for tone-mapping. @end table @subsubsection Tone mapping diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index b8b12f9c92d..dda6f6279c2 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -195,7 +195,7 @@ typedef struct LibplaceboContext { float min_peak; float scene_low; float scene_high; - float overshoot; + float percentile; /* pl_color_map_params */ struct pl_color_map_params color_map_params; @@ -216,6 +216,7 @@ typedef struct LibplaceboContext { int intent; int tonemapping_mode; float crosstalk; + float overshoot; #endif /* pl_dither_params */ @@ -409,7 +410,12 @@ static int update_settings(AVFilterContext *ctx) .minimum_peak = s->min_peak, .scene_threshold_low = s->scene_low, .scene_threshold_high = s->scene_high, +#if PL_API_VER >= 263 + .percentile = s->percentile, +#endif +#if FF_API_LIBPLACEBO_OPTS && PL_API_VER < 256 .overshoot_margin = s->overshoot, +#endif ); s->color_map_params = *pl_color_map_params( @@ -1192,7 +1198,7 @@ static const AVOption libplacebo_options[] = { { "minimum_peak", "Peak detection minimum peak", OFFSET(min_peak), AV_OPT_TYPE_FLOAT, {.dbl = 1.0}, 0.0, 100.0, DYNAMIC }, { "scene_threshold_low", "Scene change low threshold", OFFSET(scene_low), AV_OPT_TYPE_FLOAT, {.dbl = 5.5}, -1.0, 100.0, DYNAMIC }, { "scene_threshold_high", "Scene change high threshold", OFFSET(scene_high), AV_OPT_TYPE_FLOAT, {.dbl = 10.0}, -1.0, 100.0, DYNAMIC }, - { "overshoot", "Tone-mapping overshoot margin", OFFSET(overshoot), AV_OPT_TYPE_FLOAT, {.dbl = 0.05}, 0.0, 1.0, DYNAMIC }, + { "percentile", "Peak detection percentile", OFFSET(percentile), AV_OPT_TYPE_FLOAT, {.dbl = 99.995}, 0.0, 100.0, DYNAMIC }, { "gamut_mode", "Gamut-mapping mode", OFFSET(gamut_mode), AV_OPT_TYPE_INT, {.i64 = GAMUT_MAP_PERCEPTUAL}, 0, GAMUT_MAP_COUNT - 1, DYNAMIC, "gamut_mode" }, { "clip", "Hard-clip (RGB per-channel)", 0, AV_OPT_TYPE_CONST, {.i64 = GAMUT_MAP_CLIP}, 0, 0, STATIC, "gamut_mode" }, @@ -1242,6 +1248,7 @@ static const AVOption libplacebo_options[] = { { "hybrid", "Hybrid of Luma/RGB", 0, AV_OPT_TYPE_CONST, {.i64 = 3}, 0, 0, STATIC, "tonemap_mode" }, { "luma", "Luminance", 0, AV_OPT_TYPE_CONST, {.i64 = 4}, 0, 0, STATIC, "tonemap_mode" }, { "tonemapping_crosstalk", "Crosstalk factor for tone-mapping", OFFSET(crosstalk), AV_OPT_TYPE_FLOAT, {.dbl = 0.04}, 0.0, 0.30, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, + { "overshoot", "Tone-mapping overshoot margin", OFFSET(overshoot), AV_OPT_TYPE_FLOAT, {.dbl = 0.05}, 0.0, 1.0, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, #endif { "dithering", "Dither method to use", OFFSET(dithering), AV_OPT_TYPE_INT, {.i64 = PL_DITHER_BLUE_NOISE}, -1, PL_DITHER_METHOD_COUNT - 1, DYNAMIC, "dither" },