From dc13d47c735f10ff95015cd2feb82ab66e52a219 Mon Sep 17 00:00:00 2001
From: Niklas Haas <git@haasn.dev>
Date: Wed, 24 May 2023 21:32:00 +0200
Subject: vo_gpu_next: remove --tone-mapping-crosstalk

Removed upstream, to be replaced by constant 0.04.
---
 video/out/gpu/video.c   | 4 +---
 video/out/gpu/video.h   | 1 -
 video/out/vo_gpu_next.c | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'video/out')

diff --git a/video/out/gpu/video.c b/video/out/gpu/video.c
index 2d16d8435e..dbe138c009 100644
--- a/video/out/gpu/video.c
+++ b/video/out/gpu/video.c
@@ -322,7 +322,6 @@ static const struct gl_video_opts gl_video_opts_def = {
         .curve = TONE_MAPPING_AUTO,
         .curve_param = NAN,
         .max_boost = 1.0,
-        .crosstalk = 0.04,
         .decay_rate = 100.0,
         .scene_threshold_low = 5.5,
         .scene_threshold_high = 10.0,
@@ -389,8 +388,6 @@ const struct m_sub_options gl_video_conf = {
             {"st2094-10", TONE_MAPPING_ST2094_10})},
         {"tone-mapping-param", OPT_FLOATDEF(tone_map.curve_param)},
         {"inverse-tone-mapping", OPT_BOOL(tone_map.inverse)},
-        {"tone-mapping-crosstalk", OPT_FLOAT(tone_map.crosstalk),
-            M_RANGE(0.0, 0.3)},
         {"tone-mapping-max-boost", OPT_FLOAT(tone_map.max_boost),
             M_RANGE(1.0, 10.0)},
         {"tone-mapping-mode", OPT_CHOICE(tone_map.mode,
@@ -486,6 +483,7 @@ const struct m_sub_options gl_video_conf = {
         {"gamut-clipping", OPT_REMOVED("Replaced by --gamut-mapping-mode=desaturate")},
         {"tone-mapping-desaturate", OPT_REMOVED("Replaced by --tone-mapping-mode")},
         {"tone-mapping-desaturate-exponent", OPT_REMOVED("Replaced by --tone-mapping-mode")},
+        {"tone-mapping-crosstalk", OPT_REMOVED("Hard-coded as 0.04")},
         {0}
     },
     .size = sizeof(struct gl_video_opts),
diff --git a/video/out/gpu/video.h b/video/out/gpu/video.h
index 5a974f9ee0..d2b451d5f6 100644
--- a/video/out/gpu/video.h
+++ b/video/out/gpu/video.h
@@ -123,7 +123,6 @@ struct gl_tone_map_opts {
     float curve_param;
     float max_boost;
     bool inverse;
-    float crosstalk;
     int mode;
     int compute_peak;
     float decay_rate;
diff --git a/video/out/vo_gpu_next.c b/video/out/vo_gpu_next.c
index 4f93681097..1bf94f7955 100644
--- a/video/out/vo_gpu_next.c
+++ b/video/out/vo_gpu_next.c
@@ -1867,7 +1867,6 @@ static void update_render_options(struct vo *vo)
     p->color_map.tone_mapping_function = tone_map_funs[opts->tone_map.curve];
     p->color_map.tone_mapping_param = opts->tone_map.curve_param;
     p->color_map.inverse_tone_mapping = opts->tone_map.inverse;
-    p->color_map.tone_mapping_crosstalk = opts->tone_map.crosstalk;
     p->color_map.tone_mapping_mode = tone_map_modes[opts->tone_map.mode];
     if (isnan(p->color_map.tone_mapping_param)) // vo_gpu compatibility
         p->color_map.tone_mapping_param = 0.0;
-- 
cgit v1.2.3