summaryrefslogtreecommitdiffstats
path: root/video/csputils.c
diff options
context:
space:
mode:
Diffstat (limited to 'video/csputils.c')
-rw-r--r--video/csputils.c33
1 files changed, 16 insertions, 17 deletions
diff --git a/video/csputils.c b/video/csputils.c
index f8613399c8..3282e3b8ed 100644
--- a/video/csputils.c
+++ b/video/csputils.c
@@ -93,25 +93,24 @@ const struct m_opt_choice_alternatives mp_chroma_names[] = {
};
// The short name _must_ match with what vf_stereo3d accepts (if supported).
-// The long name is closer to the Matroska spec (StereoMode element).
+// The long name in comments is closer to the Matroska spec (StereoMode element).
// The numeric index matches the Matroska StereoMode value. If you add entries
// that don't match Matroska, make sure demux_mkv.c rejects them properly.
-// The long name is unused.
-#define E(index, short, long) [index] = short
-const char *const mp_stereo3d_names[MP_STEREO3D_COUNT] = {
- E(0, "mono", "mono"), // unsupported by vf_stereo3d
- E(1, "sbs2l", "side_by_side_left"),
- E(2, "ab2r", "top_bottom_right"),
- E(3, "ab2l", "top_bottom_left"),
- E(4, "checkr", "checkboard_right"), // unsupported by vf_stereo3d
- E(5, "checkl", "checkboard_left"), // unsupported by vf_stereo3d
- E(6, "irr", "row_interleaved_right"),
- E(7, "irl", "row_interleaved_left"),
- E(8, "icr", "column_interleaved_right"),// unsupported by vf_stereo3d
- E(9, "icl", "column_interleaved_left"), // unsupported by vf_stereo3d
- E(10, "arcc", "anaglyph_cyan_red"), // Matroska: unclear which mode
- E(11, "sbs2r", "side_by_side_right"),
- E(12, "agmc", "anaglyph_green_magenta"), // Matroska: unclear which mode
+const struct m_opt_choice_alternatives mp_stereo3d_names[] = {
+ {"mono", 0},
+ {"sbs2l", 1}, // "side_by_side_left"
+ {"ab2r", 2}, // "top_bottom_right"
+ {"ab2l", 3}, // "top_bottom_left"
+ {"checkr", 4}, // "checkboard_right" (unsupported by vf_stereo3d)
+ {"checkl", 5}, // "checkboard_left" (unsupported by vf_stereo3d)
+ {"irr", 6}, // "row_interleaved_right"
+ {"irl", 7}, // "row_interleaved_left"
+ {"icr", 8}, // "column_interleaved_right" (unsupported by vf_stereo3d)
+ {"icl", 9}, // "column_interleaved_left" (unsupported by vf_stereo3d)
+ {"arcc", 10}, // "anaglyph_cyan_red" (Matroska: unclear which mode)
+ {"sbs2r", 11}, // "side_by_side_right"
+ {"agmc", 12}, // "anaglyph_green_magenta" (Matroska: unclear which mode)
+ {0}
};
enum mp_csp avcol_spc_to_mp_csp(int avcolorspace)