vo_gpu_next: remove --tone-mapping-crosstalk

Removed upstream, to be replaced by constant 0.04.

DOCS/interface-changes.rst

@@ -75,6 +75,7 @@ Interface changes
     - add `--icc-cache` and `--gpu-shader-cache` options to control whether or not to
       save cache files for these features; explictly setting `--icc-cache-dir` and
       `--gpu-shader-cache` is no longer required
+    - remove the `--tone-mapping-crosstalk` option
  --- mpv 0.35.0 ---
     - add the `--vo=gpu-next` video output driver, as well as the options
       `--allow-delayed-peak-detect`, `--builtin-scalers`,

DOCS/man/options.rst

@@ -6506,11 +6506,6 @@ them.
     If set, allows inverse tone mapping (expanding SDR to HDR). Not supported
     by all tone mapping curves. Use with caution. (``--vo=gpu-next`` only)
 
-``--tone-mapping-crosstalk=<0.0..0.30>``
-    If nonzero, apply an extra crosstalk matrix before tone mapping. Can help
-    improve the appearance of strongly saturated monochromatic highlights.
-    (Default: 0.04, only affects ``--vo=gpu-next``)
-
 ``--tone-mapping-max-boost=<1.0..10.0>``
     Upper limit for how much the tone mapping algorithm is allowed to boost
     the average brightness by over-exposing the image. The default value of 1.0

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),

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;

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;