From patchwork Thu Jan 25 13:43:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 45822 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8888:b0:199:de12:6fa6 with SMTP id d8csp81575pzf; Thu, 25 Jan 2024 05:46:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IH4EgGvXwFcsMTnTNz6PUewJKecvkJ7RPLSxuuxKEsF9Ze1QCuC9Pobe8zShk03tF/MtRZs X-Received: by 2002:a19:641d:0:b0:510:cb0:ec2b with SMTP id y29-20020a19641d000000b005100cb0ec2bmr511302lfb.97.1706190400611; Thu, 25 Jan 2024 05:46:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706190400; cv=none; d=google.com; s=arc-20160816; b=mqEcFAVv3PlXCfIxjGRmzaV60l75G0ivXPQq3Xa3ktk7F2vJ6/gPLCxXaNl5su3d06 JP3J2TMbDNJvOPKw+Cxi9U+uCONqLtFZo8h5m7URA8IRhiZIZaaji7Q1GtLe3dokHp5o 6dilv7/7PtU2Lo8yarvlWokQUBMS3DzUA0LWwZBxR16VN1X7QuDsp2rRRSQg9kmK81Ht Mr+pUgyUlUv3GpD6bXEnziXEqLS8ie4vu6SsgVG/bjft6vUdcb4wlIkQ2nsV7WVpd++M MR9tiiDtnJadhJ8QhKbNzRtTyePTXLHiAchKinu7/0GABrbEGF2Q5lPKf58lLhchpODC NDhA== 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=LEZ+Vrwi5OIwQD6nv5xlMmilQReyEwbW5FrWIad9yls=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=iAdhQihoNq2yG5w9uKKxzkFmSGwYdANso3VrR2yRJigae8JV7159KnMzSpRhqHiQWl MR3DRVCdChFSEKvxwkzfZkjvlSPb/Lf+XMPTE5yeU2Ns8qhUWZ18rnxt7O/5D/O0MU+o E4X59Pr2pbjw33GU7rYVd4Uf6piXwIngBLDA+SaSG9J92eZafr+vxnQlhpxBcQn2ZJ30 26SBo1YxQhJjZKqVfOGPYre4xY5cedhCN7eQMaRpHZfF8U0DJFQxu7UHXhO9QaxRlOVT 7TkHcZ2aanpaMkZnXN1nvjA0G3ZPrDhkvhMBOX3xyLyL1jOG/vKPoVjI+XuI7nE/faeB vhQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=OR0+2eOH; 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 l16-20020a170906415000b00a30c1cccb38si975669ejk.379.2024.01.25.05.46.39; Thu, 25 Jan 2024 05:46:40 -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=OR0+2eOH; 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 5070768D0F6; Thu, 25 Jan 2024 15:44:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E5EAA68D111 for ; Thu, 25 Jan 2024 15:44:48 +0200 (EET) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1d88e775d91so3769385ad.2 for ; Thu, 25 Jan 2024 05:44:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706190286; x=1706795086; 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=COGlsi/HUkX9z5PhH85eBE6hyq0kYQyo/keK651eeJQ=; b=OR0+2eOHO7+IkDh+nfvqvCEVgFeZqi6LhYvZxwPlCJ42X/Cs9Pcu4HqIJhbLWDm+fF LmgcXODHyTe/aEz5slH00fxrb6oTW2Pow8GEpgOdxnoJR7nraaTCNrqeBsu88LvtGkiT ZUodWJffpvAehL9LSIuLZDFSMcBhA9vJWE7PkqHDidEKAJLEimSffwAve+RT8x+ZosJI +6a7adBk0ISCmGpmKrlDZU5Fc6I8B5uLK4FAdv1aNQ5eNWpoobpXuLXCNOSSwQ+FFTM1 qS/6u8IbhvHQ4eyjnU+oa/RnBOgx39CRyNZt3V8Z/qpE4aIAW2zeXNdejMaDe4jBHrZe +ZEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706190286; x=1706795086; 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=COGlsi/HUkX9z5PhH85eBE6hyq0kYQyo/keK651eeJQ=; b=jAOzJa8d7bofNi6bryRsMk49v3p5wnwLUh+GlblWlPrSeii++az09QSc7mg1o9iT30 ns2SjiRbIyigiNXwKNijgKxd9iJ0MaphzwxKipsQuxdT3WhY24dijjC/X9SjTQZH1V6A /4RsrCQldPw9MvNLvH8SNX3kWIjSuBjt1vq/LH+nwg4UaJ/3tVP5Z5OIMMY+0QE1CHX4 yORNkLvSA+Lpj5JlBcObclsk5n3M7YU4xXBh56hgP/zQ69/oJhAqyAuIXDcxy1JTvpo5 GMQWt4JSXBg429o59wnGxnlfDksx0ndwSavmpQF/+9bUbxVfElWjrzpluuoBEgbzEZno evMA== X-Gm-Message-State: AOJu0Yysw57sMDkPXoBdatr7lv8V2aadNEItbf5SFg9kiNX8JWvPNKn8 pNFeoIC8XdOwgZ3W/5iMBi6ImRqMb9QLrUu4acTPS19213OhKpqb59l18phZ X-Received: by 2002:a17:903:2642:b0:1d7:857e:a3 with SMTP id je2-20020a170903264200b001d7857e00a3mr859218plb.28.1706190286537; Thu, 25 Jan 2024 05:44:46 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id k17-20020a170902f29100b001d707a14316sm11785146plc.75.2024.01.25.05.44.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 05:44:46 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Jan 2024 10:43:35 -0300 Message-ID: <20240125134425.374-13-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240125134425.374-1-jamrial@gmail.com> References: <20240125134425.374-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/24] avfilter: remove deprecated FF_API_LIBPLACEBO_OPTS 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: 0NONuFTxNaVw Signed-off-by: James Almer --- libavfilter/version_major.h | 2 - libavfilter/vf_libplacebo.c | 76 ------------------------------------- 2 files changed, 78 deletions(-) diff --git a/libavfilter/version_major.h b/libavfilter/version_major.h index 1decc4012e..899dfdb27d 100644 --- a/libavfilter/version_major.h +++ b/libavfilter/version_major.h @@ -35,6 +35,4 @@ * the public API and may change, break or disappear at any time. */ -#define FF_API_LIBPLACEBO_OPTS (LIBAVFILTER_VERSION_MAJOR < 10) - #endif /* AVFILTER_VERSION_MAJOR_H */ diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index a9a3d884ce..7d1ca6daee 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -240,20 +240,6 @@ typedef struct LibplaceboContext { float contrast_recovery; float contrast_smoothness; -#if FF_API_LIBPLACEBO_OPTS - /* for backwards compatibility */ - float desat_str; - float desat_exp; - int gamut_warning; - int gamut_clipping; - int force_icc_lut; - int intent; - int tonemapping_mode; - float crosstalk; - float overshoot; - float hybrid_mix; -#endif - /* pl_dither_params */ int dithering; int dither_lut_size; @@ -382,32 +368,6 @@ static int update_settings(AVFilterContext *ctx) int gamut_mode = s->gamut_mode; uint8_t color_rgba[4]; -#if FF_API_LIBPLACEBO_OPTS - float hybrid_mix = s->hybrid_mix; - /* backwards compatibility with older API */ - switch (s->tonemapping_mode) { - case 0: /*PL_TONE_MAP_AUTO*/ - if (s->desat_str >= 0.0f) - hybrid_mix = s->desat_str; - break; - case 1: /*PL_TONE_MAP_RGB*/ hybrid_mix = 1.0f; break; - case 2: /*PL_TONE_MAP_HYBRID*/ hybrid_mix = 0.2f; break; - case 3: /*PL_TONE_MAP_LUMA*/ hybrid_mix = 0.0f; break; - case 4: /*PL_TONE_MAP_MAX*/ hybrid_mix = 0.0f; break; - } - - switch (s->intent) { - case PL_INTENT_SATURATION: gamut_mode = GAMUT_MAP_SATURATION; break; - case PL_INTENT_RELATIVE_COLORIMETRIC: gamut_mode = GAMUT_MAP_RELATIVE; break; - case PL_INTENT_ABSOLUTE_COLORIMETRIC: gamut_mode = GAMUT_MAP_ABSOLUTE; break; - } - - if (s->gamut_warning) - gamut_mode = GAMUT_MAP_HIGHLIGHT; - if (s->gamut_clipping) - gamut_mode = GAMUT_MAP_DESATURATE; -#endif - RET(av_parse_color(color_rgba, s->fillcolor, -1, s)); opts->deband_params = *pl_deband_params( @@ -434,21 +394,10 @@ static int update_settings(AVFilterContext *ctx) .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 ); opts->color_map_params = *pl_color_map_params( -#if FF_API_LIBPLACEBO_OPTS -# if PL_API_VER >= 269 - .hybrid_mix = hybrid_mix, -# else - .tone_mapping_mode = s->tonemapping_mode, - .tone_mapping_crosstalk = s->crosstalk, -# endif -#endif .tone_mapping_function = get_tonemapping_func(s->tonemapping), .tone_mapping_param = s->tonemapping_param, .inverse_tone_mapping = s->inverse_tonemapping, @@ -1458,28 +1407,6 @@ static const AVOption libplacebo_options[] = { { "contrast_recovery", "HDR contrast recovery strength", OFFSET(contrast_recovery), AV_OPT_TYPE_FLOAT, {.dbl = 0.30}, 0.0, 3.0, DYNAMIC }, { "contrast_smoothness", "HDR contrast recovery smoothness", OFFSET(contrast_smoothness), AV_OPT_TYPE_FLOAT, {.dbl = 3.50}, 1.0, 32.0, DYNAMIC }, -#if FF_API_LIBPLACEBO_OPTS - /* deprecated options for backwards compatibility, defaulting to -1 to not override the new defaults */ - { "desaturation_strength", "Desaturation strength", OFFSET(desat_str), AV_OPT_TYPE_FLOAT, {.dbl = -1.0}, -1.0, 1.0, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, - { "desaturation_exponent", "Desaturation exponent", OFFSET(desat_exp), AV_OPT_TYPE_FLOAT, {.dbl = -1.0}, -1.0, 10.0, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, - { "gamut_warning", "Highlight out-of-gamut colors", OFFSET(gamut_warning), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, - { "gamut_clipping", "Enable desaturating colorimetric gamut clipping", OFFSET(gamut_clipping), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, - { "intent", "Rendering intent", OFFSET(intent), AV_OPT_TYPE_INT, {.i64 = PL_INTENT_PERCEPTUAL}, 0, 3, DYNAMIC | AV_OPT_FLAG_DEPRECATED, "intent" }, - { "perceptual", "Perceptual", 0, AV_OPT_TYPE_CONST, {.i64 = PL_INTENT_PERCEPTUAL}, 0, 0, STATIC, "intent" }, - { "relative", "Relative colorimetric", 0, AV_OPT_TYPE_CONST, {.i64 = PL_INTENT_RELATIVE_COLORIMETRIC}, 0, 0, STATIC, "intent" }, - { "absolute", "Absolute colorimetric", 0, AV_OPT_TYPE_CONST, {.i64 = PL_INTENT_ABSOLUTE_COLORIMETRIC}, 0, 0, STATIC, "intent" }, - { "saturation", "Saturation mapping", 0, AV_OPT_TYPE_CONST, {.i64 = PL_INTENT_SATURATION}, 0, 0, STATIC, "intent" }, - { "tonemapping_mode", "Tone-mapping mode", OFFSET(tonemapping_mode), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 4, DYNAMIC | AV_OPT_FLAG_DEPRECATED, "tonemap_mode" }, - { "auto", "Automatic selection", 0, AV_OPT_TYPE_CONST, {.i64 = 0}, 0, 0, STATIC, "tonemap_mode" }, - { "rgb", "Per-channel (RGB)", 0, AV_OPT_TYPE_CONST, {.i64 = 1}, 0, 0, STATIC, "tonemap_mode" }, - { "max", "Maximum component", 0, AV_OPT_TYPE_CONST, {.i64 = 2}, 0, 0, STATIC, "tonemap_mode" }, - { "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 }, - { "hybrid_mix", "Tone-mapping hybrid LMS mixing coefficient", OFFSET(hybrid_mix), AV_OPT_TYPE_FLOAT, {.dbl = 0.20}, 0.0, 1.00, DYNAMIC }, -#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" }, { "none", "Disable dithering", 0, AV_OPT_TYPE_CONST, {.i64 = -1}, 0, 0, STATIC, "dither" }, { "blue", "Blue noise", 0, AV_OPT_TYPE_CONST, {.i64 = PL_DITHER_BLUE_NOISE}, 0, 0, STATIC, "dither" }, @@ -1503,9 +1430,6 @@ static const AVOption libplacebo_options[] = { { "polar_cutoff", "Polar LUT cutoff", OFFSET(polar_cutoff), AV_OPT_TYPE_FLOAT, {.dbl = 0}, 0.0, 1.0, DYNAMIC }, { "disable_linear", "Disable linear scaling", OFFSET(disable_linear), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, { "disable_builtin", "Disable built-in scalers", OFFSET(disable_builtin), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, -#if FF_API_LIBPLACEBO_OPTS - { "force_icc_lut", "Deprecated, does nothing", OFFSET(force_icc_lut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, -#endif { "force_dither", "Force dithering", OFFSET(force_dither), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, { "disable_fbos", "Force-disable FBOs", OFFSET(disable_fbos), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, { NULL },