options: target-gamut now accepts custom CIE xy primaries

Fixes: #17633

Author: kasper93

DOCS/interface-changes/target-gamut-custom-primaries.txt

@@ -0,0 +1 @@
+`--target-gamut` now accepts custom CIE xy primaries as comma-separated values (Rx,Ry,Gx,Gy,Bx,By,Wx,Wy) in addition to named primary sets

DOCS/man/options.rst

@@ -7366,8 +7366,13 @@ them.
     Constrains the gamut of the display. You can use this option to output e.g.
     DCIP3-in-BT.2020. Set ``--target-prim`` to the primaries of the containing
     colorspace (into which values will be encoded), and ``--target-gamut`` to
-    the gamut you want to limit colors to. Takes the same values as
-    ``--target-prim``. (Only for ``--vo=gpu-next``)
+    the gamut you want to limit colors to.
+
+    Accepts either a named primary set (same values as ``--target-prim``) or
+    8 comma-separated CIE xy chromaticity values specifying custom primaries
+    in the format ``Rx,Ry,Gx,Gy,Bx,By,Wx,Wy`` (red, green, blue, white point).
+    All values must be in the range 0.0-1.0. Use ``--target-gamut=help`` to
+    list all named primaries. (Only for ``--vo=gpu-next``)
 
     .. note::
 

video/csputils.c

@@ -27,6 +27,7 @@
 
 #include "mp_image.h"
 #include "csputils.h"
+#include "common/msg.h"
 #include "options/m_config.h"
 #include "options/m_option.h"
 
@@ -586,3 +587,40 @@ enum pl_color_primaries mp_get_best_prim_container(const struct pl_raw_primaries
 
     return container;
 }
+
+int mp_parse_raw_primaries(struct mp_log *log, const char *str,
+                           struct pl_raw_primaries *out)
+{
+    if (!str)
+        return M_OPT_INVALID;
+
+    if (!*str)
+        return M_OPT_MISSING_PARAM;
+
+    // Comma-separated CIE xy values: Rx,Ry,Gx,Gy,Bx,By,Wx,Wy
+    struct pl_raw_primaries prim;
+    if (sscanf(str, "%f,%f,%f,%f,%f,%f,%f,%f",
+            &prim.red.x, &prim.red.y, &prim.green.x, &prim.green.y,
+            &prim.blue.x, &prim.blue.y, &prim.white.x, &prim.white.y) == 8)
+    {
+        if (!pl_primaries_valid(&prim))
+            return M_OPT_OUT_OF_RANGE;
+        *out = prim;
+        return 1;
+    }
+
+    const m_option_t choice_opt = {
+        .priv = (void *)pl_csp_prim_names,
+    };
+
+    int prim_choice;
+    int ret = m_option_type_choice.parse(log, &choice_opt, bstr0("target-gamut"),
+                                         bstr0(str), &prim_choice);
+    if (ret >= 0) {
+        *out = *pl_raw_primaries_get(prim_choice);
+    } else if (ret != M_OPT_MISSING_PARAM) {
+        mp_info(log, "    Rx,Ry,Gx,Gy,Bx,By,Wx,Wy (custom CIE xy primaries)\n");
+    }
+
+    return ret;
+}

video/csputils.h

@@ -127,4 +127,7 @@ void mp_map_fixp_color(struct pl_transform3x3 *matrix, int ibits, int in[3],
 
 enum pl_color_primaries mp_get_best_prim_container(const struct pl_raw_primaries *gamut);
 
+int mp_parse_raw_primaries(struct mp_log *log, const char *str,
+                           struct pl_raw_primaries *out);
+
 #endif /* MPLAYER_CSPUTILS_H */

video/out/gpu/video.c

@@ -413,6 +413,7 @@ static const struct gl_video_opts gl_video_opts_def = {
 };
 
 static OPT_STRING_VALIDATE_FUNC(validate_error_diffusion_opt);
+static OPT_STRING_VALIDATE_FUNC(validate_target_gamut);
 
 #define OPT_BASE_STRUCT struct gl_video_opts
 
@@ -452,7 +453,7 @@ const struct m_sub_options gl_video_conf = {
             {"no", 0}, {"input", 1}, {"output", 2}, {"both", 1|2}, {"auto", 1|2|4})},
         {"target-contrast", OPT_CHOICE(target_contrast, {"auto", 0}, {"inf", -1}),
             M_RANGE(10, 10 / PL_COLOR_HDR_BLACK)},
-        {"target-gamut", OPT_CHOICE_C(target_gamut, pl_csp_prim_names)},
+        {"target-gamut", OPT_STRING_VALIDATE(target_gamut, validate_target_gamut)},
         {"tone-mapping", OPT_CHOICE(tone_map.curve,
             {"auto",     TONE_MAPPING_AUTO},
             {"clip",     TONE_MAPPING_CLIP},
@@ -4331,6 +4332,13 @@ static int validate_error_diffusion_opt(struct mp_log *log, const m_option_t *op
     return r;
 }
 
+static int validate_target_gamut(struct mp_log *log, const m_option_t *opt,
+                                 struct bstr name, const char **value)
+{
+    struct pl_raw_primaries tmp;
+    return mp_parse_raw_primaries(log, *value, &tmp);
+}
+
 void gl_video_set_ambient_lux(struct gl_video *p, double lux)
 {
     if (p->opts.gamma_auto) {

video/out/gpu/video.h

@@ -142,7 +142,7 @@ struct gl_video_opts {
     int sdr_adjust_gamma;
     int treat_srgb_as_power22;
     int target_contrast;
-    int target_gamut;
+    char *target_gamut;
     struct gl_tone_map_opts tone_map;
     bool correct_downscaling;
     bool linear_downscaling;

video/out/vo_gpu_next.c

@@ -925,7 +925,7 @@ static void apply_target_options(struct priv *p, struct pl_frame *target,
     if ((!target->color.hdr.min_luma || !hint))
         apply_target_contrast(p, &target->color, min_luma);
     if (opts->target_gamut)
-        target->color.hdr.prim = *pl_raw_primaries_get(opts->target_gamut);
+        mp_parse_raw_primaries(mp_null_log, opts->target_gamut, &target->color.hdr.prim);
     int dither_depth = opts->dither_depth;
     if (dither_depth == 0) {
         struct ra_swapchain *sw = p->ra_ctx->swapchain;
@@ -1190,7 +1190,7 @@ static bool draw_frame(struct vo *vo, struct vo_frame *frame)
         if (opts->target_prim)
             hint.primaries = opts->target_prim;
         if (opts->target_gamut)
-            hint.hdr.prim = *pl_raw_primaries_get(opts->target_gamut);
+            mp_parse_raw_primaries(mp_null_log, opts->target_gamut, &hint.hdr.prim);
         if (opts->target_trc)
             hint.transfer = opts->target_trc;
         if (opts->target_peak)