video: move colorspace overrides to vf_format, simplify

Remove the colorspace-related top-level options, add them to vf_format.
They are rather obscure and not needed often, so it's better to get them
out of the way. In particular, this gets rid of the semi-complicated
logic in command.c (most of which was needed for OSD display and the
direct feedback from the VO). It removes the duplicated color-related
name mappings.

This removes the ability to write the colormatrix and related
properties. Since filters can be changed at runtime, there's no loss of
functionality, except that you can't cycle automatically through the
color constants anymore (but who needs to do this).

This also changes the type of the mp_csp_names and related variables, so
they can directly be used with OPT_CHOICE. This probably ended up a bit
awkward, for the sake of not adding a new option type which would have
used the previous format.

2 files changed, 91 insertions, 95 deletions

diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 7c42088c8c..fed1d4ef52 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -1995,101 +1995,6 @@ Equalizer
     negative of the image with this option. Not supported by all video output
     drivers.
 
-``--colormatrix=<colorspace>``
-    Controls the YUV to RGB color space conversion when playing video. There
-    are various standards. Normally, BT.601 should be used for SD video, and
-    BT.709 for HD video. (This is done by default.) Using incorrect color space
-    results in slightly under or over saturated and shifted colors.
-
-    The color space conversion is additionally influenced by the related
-    options --colormatrix-input-range and --colormatrix-output-range.
-
-    These options are not always supported. Different video outputs provide
-    varying degrees of support. The ``opengl`` and ``vdpau`` video output
-    drivers usually offer full support. The ``xv`` output can set the color
-    space if the system video driver supports it, but not input and output
-    levels. The ``scale`` video filter can configure color space and input
-    levels, but only if the output format is RGB (if the video output driver
-    supports RGB output, you can force this with ``-vf scale,format=rgba``).
-
-    If this option is set to ``auto`` (which is the default), the video's
-    color space flag will be used. If that flag is unset, the color space
-    will be selected automatically. This is done using a simple heuristic that
-    attempts to distinguish SD and HD video. If the video is larger than
-    1279x576 pixels, BT.709 (HD) will be used; otherwise BT.601 (SD) is
-    selected.
-
-    Available color spaces are:
-
-    :auto:          automatic selection (default)
-    :bt.601:        ITU-R BT.601 (SD)
-    :bt.709:        ITU-R BT.709 (HD)
-    :bt.2020-ncl:   ITU-R BT.2020 non-constant luminance system
-    :bt.2020-cl:    ITU-R BT.2020 constant luminance system
-    :smpte-240m:    SMPTE-240M
-
-``--colormatrix-input-range=<color-range>``
-    YUV color levels used with YUV to RGB conversion. This option is only
-    necessary when playing broken files which do not follow standard color
-    levels or which are flagged wrong. If the video does not specify its
-    color range, it is assumed to be limited range.
-
-    The same limitations as with --colormatrix apply.
-
-    Available color ranges are:
-
-    :auto:      automatic selection (normally limited range) (default)
-    :limited:   limited range (16-235 for luma, 16-240 for chroma)
-    :full:      full range (0-255 for both luma and chroma)
-
-``--colormatrix-output-range=<color-range>``
-    RGB color levels used with YUV to RGB conversion. Normally, output devices
-    such as PC monitors use full range color levels. However, some TVs and
-    video monitors expect studio RGB levels. Providing full range output to a
-    device expecting studio level input results in crushed blacks and whites,
-    the reverse in dim gray blacks and dim whites.
-
-    The same limitations as with ``--colormatrix`` apply.
-
-    Available color ranges are:
-
-    :auto:      automatic selection (equals to full range) (default)
-    :limited:   limited range (16-235 per component), studio levels
-    :full:      full range (0-255 per component), PC levels
-
-    .. note::
-
-        It is advisable to use your graphics driver's color range option
-        instead, if available.
-
-``--colormatrix-primaries=<primaries>``
-    RGB primaries the source file was encoded with. Normally this should be set
-    in the file header, but when playing broken or mistagged files this can be
-    used to override the setting. By default, when unset, BT.709 is used for
-    all files except those tagged with a BT.2020 color matrix.
-
-    This option only affects video output drivers that perform color
-    management, for example ``opengl`` with the ``srgb`` or ``icc-profile``
-    suboptions set.
-
-    If this option is set to ``auto`` (which is the default), the video's
-    primaries flag will be used. If that flag is unset, the color space will
-    be selected automatically, using the following heuristics: If the
-    ``--colormatrix`` is set or determined as BT.2020 or BT.709, the
-    corresponding primaries are used. Otherwise, if the video height is
-    exactly 576 (PAL), BT.601-625 is used. If it's exactly 480 or 486 (NTSC),
-    BT.601-525 is used. If the video resolution is anything else, BT.709 is
-    used.
-
-    Available primaries are:
-
-    :auto:         automatic selection (default)
-    :bt.601-525:   ITU-R BT.601 (SD) 525-line systems (NTSC, SMPTE-C)
-    :bt.601-625:   ITU-R BT.601 (SD) 625-line systems (PAL, SECAM)
-    :bt.709:       ITU-R BT.709 (HD) (same primaries as sRGB)
-    :bt.2020:      ITU-R BT.2020 (UHD)
-
-
 Demuxer
 -------
 
diff --git a/DOCS/man/vf.rst b/DOCS/man/vf.rst
index 984bdda656..0e944f110e 100644
--- a/DOCS/man/vf.rst
+++ b/DOCS/man/vf.rst
@@ -211,6 +211,97 @@ Available filters are:
     ``<outfmt>``
         Format name that should be substituted for the output. If they do not
         have the same bytes per pixel and chroma subsamplimg, it will fail.
+    ``<colormatrix>``
+        Controls the YUV to RGB color space conversion when playing video. There
+        are various standards. Normally, BT.601 should be used for SD video, and
+        BT.709 for HD video. (This is done by default.) Using incorrect color space
+        results in slightly under or over saturated and shifted colors.
+
+        These options are not always supported. Different video outputs provide
+        varying degrees of support. The ``opengl`` and ``vdpau`` video output
+        drivers usually offer full support. The ``xv`` output can set the color
+        space if the system video driver supports it, but not input and output
+        levels. The ``scale`` video filter can configure color space and input
+        levels, but only if the output format is RGB (if the video output driver
+        supports RGB output, you can force this with ``-vf scale,format=rgba``).
+
+        If this option is set to ``auto`` (which is the default), the video's
+        color space flag will be used. If that flag is unset, the color space
+        will be selected automatically. This is done using a simple heuristic that
+        attempts to distinguish SD and HD video. If the video is larger than
+        1279x576 pixels, BT.709 (HD) will be used; otherwise BT.601 (SD) is
+        selected.
+
+        Available color spaces are:
+
+        :auto:          automatic selection (default)
+        :bt.601:        ITU-R BT.601 (SD)
+        :bt.709:        ITU-R BT.709 (HD)
+        :bt.2020-ncl:   ITU-R BT.2020 non-constant luminance system
+        :bt.2020-cl:    ITU-R BT.2020 constant luminance system
+        :smpte-240m:    SMPTE-240M
+
+    ``<colorlevels>``
+        YUV color levels used with YUV to RGB conversion. This option is only
+        necessary when playing broken files which do not follow standard color
+        levels or which are flagged wrong. If the video does not specify its
+        color range, it is assumed to be limited range.
+
+        The same limitations as with ``<colormatrix>`` apply.
+
+        Available color ranges are:
+
+        :auto:      automatic selection (normally limited range) (default)
+        :limited:   limited range (16-235 for luma, 16-240 for chroma)
+        :full:      full range (0-255 for both luma and chroma)
+
+    ``<outputlevels>``
+        RGB color levels used with YUV to RGB conversion. Normally, output devices
+        such as PC monitors use full range color levels. However, some TVs and
+        video monitors expect studio RGB levels. Providing full range output to a
+        device expecting studio level input results in crushed blacks and whites,
+        the reverse in dim gray blacks and dim whites.
+
+        The same limitations as with ``<colormatrix>`` apply.
+
+        Available color ranges are:
+
+        :auto:      automatic selection (equals to full range) (default)
+        :limited:   limited range (16-235 per component), studio levels
+        :full:      full range (0-255 per component), PC levels
+
+        .. note::
+
+            It is advisable to use your graphics driver's color range option
+            instead, if available.
+
+    ``<primaries>``
+        RGB primaries the source file was encoded with. Normally this should be set
+        in the file header, but when playing broken or mistagged files this can be
+        used to override the setting. By default, when unset, BT.709 is used for
+        all files except those tagged with a BT.2020 color matrix.
+
+        This option only affects video output drivers that perform color
+        management, for example ``opengl`` with the ``srgb`` or ``icc-profile``
+        suboptions set.
+
+        If this option is set to ``auto`` (which is the default), the video's
+        primaries flag will be used. If that flag is unset, the color space will
+        be selected automatically, using the following heuristics: If the
+        ``<colormatrix>`` is set or determined as BT.2020 or BT.709, the
+        corresponding primaries are used. Otherwise, if the video height is
+        exactly 576 (PAL), BT.601-625 is used. If it's exactly 480 or 486 (NTSC),
+        BT.601-525 is used. If the video resolution is anything else, BT.709 is
+        used.
+
+        Available primaries are:
+
+        :auto:         automatic selection (default)
+        :bt.601-525:   ITU-R BT.601 (SD) 525-line systems (NTSC, SMPTE-C)
+        :bt.601-625:   ITU-R BT.601 (SD) 625-line systems (PAL, SECAM)
+        :bt.709:       ITU-R BT.709 (HD) (same primaries as sRGB)
+        :bt.2020:      ITU-R BT.2020 (UHD)
+
 
 ``noformat[=fmt]``
     Restricts the color space for the next filter without doing any conversion.