From 1d29177c5c150e700cace0c875185c6fa5e92d3c Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 7 Jul 2015 14:25:37 +0200 Subject: options: cleanup hwdec name mappings Now there's a "canonical" table for mapping the names, that other code can use, without having to rely too much on option code magic. Also, use the central HWDEC constants, instead of magic values. (There used to be semi-ok reasons to do this, but now it makes no sense anymore.) --- options/options.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'options') diff --git a/options/options.c b/options/options.c index 4ba2db1590..d286e5b63c 100644 --- a/options/options.c +++ b/options/options.c @@ -38,6 +38,7 @@ #include "common/common.h" #include "stream/stream.h" #include "video/csputils.h" +#include "video/hwdec.h" #include "sub/osd.h" #include "audio/mixer.h" #include "audio/filter/af.h" @@ -79,6 +80,18 @@ extern const struct m_obj_list af_obj_list; extern const struct m_obj_list vo_obj_list; extern const struct m_obj_list ao_obj_list; +const struct m_opt_choice_alternatives mp_hwdec_names[] = { + {"no", HWDEC_NONE}, + {"auto", HWDEC_AUTO}, + {"vdpau", HWDEC_VDPAU}, + {"vda", HWDEC_VDA}, + {"vaapi", HWDEC_VAAPI}, + {"vaapi-copy", HWDEC_VAAPI_COPY}, + {"dxva2-copy", HWDEC_DXVA2_COPY}, + {"rpi", HWDEC_RPI}, + {0} +}; + #define OPT_BASE_STRUCT struct MPOpts const m_option_t mp_opts[] = { @@ -283,15 +296,7 @@ const m_option_t mp_opts[] = { OPT_FLAG("ad-spdif-dtshd", dtshd, 0), - OPT_CHOICE("hwdec", hwdec_api, 0, - ({"no", 0}, - {"auto", -1}, - {"vdpau", 1}, - {"vda", 2}, - {"vaapi", 4}, - {"vaapi-copy", 5}, - {"dxva2-copy", 6}, - {"rpi", 7})), + OPT_CHOICE_C("hwdec", hwdec_api, 0, mp_hwdec_names), OPT_STRING("hwdec-codecs", hwdec_codecs, 0), OPT_SUBSTRUCT("sws", vo.sws_opts, sws_conf, 0), -- cgit v1.2.3