From 205a2ef16919a6baa6ac37e17098038b0d68df1b Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 30 Mar 2015 21:28:42 +0200 Subject: csputils: unify names for colorspace/etc. names --- DOCS/man/options.rst | 18 +++++++++--------- options/options.c | 18 +++++++++--------- video/csputils.c | 46 +++++++++++++++++++++++----------------------- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index da0012c948..7c42088c8c 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -2022,11 +2022,11 @@ Equalizer 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 + :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=`` YUV color levels used with YUV to RGB conversion. This option is only @@ -2084,10 +2084,10 @@ Equalizer 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) + :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/options/options.c b/options/options.c index 80b2c2bc5d..8c33e4560a 100644 --- a/options/options.c +++ b/options/options.c @@ -426,11 +426,11 @@ const m_option_t mp_opts[] = { OPT_FLAG("force-rgba-osd-rendering", force_rgba_osd, 0), OPT_CHOICE("colormatrix", requested_colorspace, 0, ({"auto", MP_CSP_AUTO}, - {"BT.601", MP_CSP_BT_601}, - {"BT.709", MP_CSP_BT_709}, - {"SMPTE-240M", MP_CSP_SMPTE_240M}, - {"BT.2020-NCL", MP_CSP_BT_2020_NC}, - {"BT.2020-CL", MP_CSP_BT_2020_C}, + {"bt.601", MP_CSP_BT_601}, + {"bt.709", MP_CSP_BT_709}, + {"smpte-240m", MP_CSP_SMPTE_240M}, + {"bt.2020-ncl", MP_CSP_BT_2020_NC}, + {"bt.2020-cl", MP_CSP_BT_2020_C}, {"YCgCo", MP_CSP_YCGCO})), OPT_CHOICE("colormatrix-input-range", requested_input_range, 0, ({"auto", MP_CSP_LEVELS_AUTO}, @@ -442,10 +442,10 @@ const m_option_t mp_opts[] = { {"full", MP_CSP_LEVELS_PC})), OPT_CHOICE("colormatrix-primaries", requested_primaries, 0, ({"auto", MP_CSP_PRIM_AUTO}, - {"BT.601-525", MP_CSP_PRIM_BT_601_525}, - {"BT.601-625", MP_CSP_PRIM_BT_601_625}, - {"BT.709", MP_CSP_PRIM_BT_709}, - {"BT.2020", MP_CSP_PRIM_BT_2020})), + {"bt.601-525", MP_CSP_PRIM_BT_601_525}, + {"bt.601-625", MP_CSP_PRIM_BT_601_625}, + {"bt.709", MP_CSP_PRIM_BT_709}, + {"bt.2020", MP_CSP_PRIM_BT_2020})), OPT_CHOICE_OR_INT("video-rotate", video_rotate, 0, 0, 359, ({"no", -1})), OPT_VID_STEREO_MODE("video-stereo-mode", video_stereo_mode, 0), diff --git a/video/csputils.c b/video/csputils.c index 06de4bb9e8..c10cfe5a7c 100644 --- a/video/csputils.c +++ b/video/csputils.c @@ -39,38 +39,38 @@ #include "csputils.h" const char *const mp_csp_names[MP_CSP_COUNT] = { - "Autoselect", - "BT.601 (SD)", - "BT.709 (HD)", - "SMPTE-240M", - "BT.2020-NCL (UHD)", - "BT.2020-CL (UHD)", - "RGB", - "XYZ", - "YCgCo", + "auto", + "bt.601", + "bt.709", + "smpte-240m", + "bt.2020-ncl", + "bt.2020-cl", + "rgb", + "xyz", + "ycgco", }; const char *const mp_csp_levels_names[MP_CSP_LEVELS_COUNT] = { - "Autoselect", - "TV", - "PC", + "auto", + "limited", + "full", }; const char *const mp_csp_prim_names[MP_CSP_PRIM_COUNT] = { - "Autoselect", - "BT.601 (525-line SD)", - "BT.601 (625-line SD)", - "BT.709 (HD)", - "BT.2020 (UHD)", - "BT.470 M", + "auto", + "bt.601-525", + "bt.601-625", + "bt.709", + "bt.2020", + "bt.470 m", }; const char *const mp_csp_trc_names[MP_CSP_TRC_COUNT] = { - "Autoselect", - "BT.1886 (SD, HD, UHD)", - "sRGB (IEC 61966-2-1)", - "Linear light", - "Pure power (gamma 2.2)", + "auto", + "bt.1886", + "srgb", + "linear", + "gamma2.2", }; const char *const mp_csp_equalizer_names[MP_CSP_EQ_COUNT] = { -- cgit v1.2.3