From 51bb5e819469574f210dbdf916741511282956ce Mon Sep 17 00:00:00 2001
From: Niklas Haas <git@nand.wakku.to>
Date: Tue, 31 Mar 2015 07:31:35 +0200
Subject: vo_opengl: make csp options consistent with vf_format

---
 DOCS/man/vo.rst      | 18 +++++++++---------
 video/out/gl_video.c | 22 ++--------------------
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst
index e235aa9d70..5d4bbe1c61 100644
--- a/DOCS/man/vo.rst
+++ b/DOCS/man/vo.rst
@@ -606,15 +606,15 @@ Available video output drivers are:
 
         auto
             Disable any adaptation (default)
-        bt470m
+        bt.470m
             ITU-R BT.470 M
-        bt601-525
+        bt.601-525
             ITU-R BT.601 (525-line SD systems, eg. NTSC), SMPTE 170M/240M
-        bt601-625
+        bt.601-625
             ITU-R BT.601 (625-line SD systems, eg. PAL/SECAM), ITU-R BT.470 B/G
-        bt709
+        bt.709
             ITU-R BT.709 (HD), IEC 61966-2-4 (sRGB), SMPTE RP177 Annex B
-        bt2020
+        bt.2020
             ITU-R BT.2020 (UHD)
         apple
             Apple RGB
@@ -631,17 +631,17 @@ Available video output drivers are:
 
         auto
             Disable any adaptation (default)
-        bt1886
+        bt.1886
             ITU-R BT.1886 curve, without the brightness drop (approx. 1.961)
         srgb
             IEC 61966-2-4 (sRGB)
         linear
             Linear light output
-        gamma18
+        gamma1.8
             Pure power curve (gamma 1.8), also used for Apple RGB
-        gamma22
+        gamma2.2
             Pure power curve (gamma 2.2)
-        gamma28
+        gamma2.8
             Pure power curve (gamma 2.8), also used for BT.470-BG
         prophoto
             ProPhoto RGB (ROMM)
diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index 34defb1db1..e5320fc184 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -366,26 +366,8 @@ const struct m_sub_options gl_video_conf = {
     .opts = (const m_option_t[]) {
         OPT_FLOATRANGE("gamma", gamma, 0, 0.1, 2.0),
         OPT_FLAG("gamma-auto", gamma_auto, 0),
-        OPT_CHOICE("target-prim", target_prim, 0,
-                   ({"auto",      MP_CSP_PRIM_AUTO},
-                    {"bt601-525", MP_CSP_PRIM_BT_601_525},
-                    {"bt601-625", MP_CSP_PRIM_BT_601_625},
-                    {"bt709",     MP_CSP_PRIM_BT_709},
-                    {"bt2020",    MP_CSP_PRIM_BT_2020},
-                    {"bt470m",    MP_CSP_PRIM_BT_470M},
-                    {"apple",     MP_CSP_PRIM_APPLE},
-                    {"adobe",     MP_CSP_PRIM_ADOBE},
-                    {"prophoto",  MP_CSP_PRIM_PRO_PHOTO},
-                    {"cie1931",   MP_CSP_PRIM_CIE_1931})),
-        OPT_CHOICE("target-trc", target_trc, 0,
-                   ({"auto",    MP_CSP_TRC_AUTO},
-                    {"bt1886",  MP_CSP_TRC_BT_1886},
-                    {"srgb",    MP_CSP_TRC_SRGB},
-                    {"linear",  MP_CSP_TRC_LINEAR},
-                    {"gamma18", MP_CSP_TRC_GAMMA18},
-                    {"gamma22", MP_CSP_TRC_GAMMA22},
-                    {"gamma28", MP_CSP_TRC_GAMMA28},
-                    {"prophoto", MP_CSP_TRC_PRO_PHOTO})),
+        OPT_CHOICE_C("target-prim", target_prim, 0, mp_csp_prim_names),
+        OPT_CHOICE_C("target-trc", target_trc, 0, mp_csp_trc_names),
         OPT_FLAG("npot", npot, 0),
         OPT_FLAG("pbo", pbo, 0),
         OPT_STRING_VALIDATE("scale",  scaler[0].kernel.name, 0, validate_scaler_opt),
-- 
cgit v1.2.3