From 03cf150ff3516789d581214177f291d46310aaf4 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 22 Aug 2017 17:01:35 +0200 Subject: video: redo video equalizer option handling I really wouldn't care much about this, but some parts of the core code are under HAVE_GPL, so there's some need to get rid of it. Simply turn the video equalizer from its current fine-grained handling with vf/vo fallbacks into global options. This makes updating them much simpler. This removes any possibility of applying video equalizers in filters, which affects vf_scale, and the previously removed vf_eq. Not a big loss, since the preferred VOs have this builtin. Remove video equalizer handling from vo_direct3d, vo_sdl, vo_vaapi, and vo_xv. I'm not going to waste my time on these legacy VOs. vo.eq_opts_cache exists _only_ to send a VOCTRL_SET_EQUALIZER, which exists _only_ to trigger a redraw. This seems silly, but for now I feel like this is less of a pain. The rest of the equalizer using code is self-updating. See commit 96b906a51d5 for how some video equalizer code was GPL only. Some command line option names and ranges can probably be traced back to a GPL only committer, but we don't consider these copyrightable. --- video/csputils.h | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) (limited to 'video/csputils.h') diff --git a/video/csputils.h b/video/csputils.h index 2119cca45a..246dfdcfcf 100644 --- a/video/csputils.h +++ b/video/csputils.h @@ -185,6 +185,8 @@ enum mp_chroma_location { extern const struct m_opt_choice_alternatives mp_chroma_names[]; +extern const struct m_sub_options mp_csp_equalizer_conf; + enum mp_csp_equalizer_param { MP_CSP_EQ_BRIGHTNESS, MP_CSP_EQ_CONTRAST, @@ -195,28 +197,23 @@ enum mp_csp_equalizer_param { MP_CSP_EQ_COUNT, }; -#define MP_CSP_EQ_CAPS_COLORMATRIX \ - ( (1 << MP_CSP_EQ_BRIGHTNESS) \ - | (1 << MP_CSP_EQ_CONTRAST) \ - | (1 << MP_CSP_EQ_HUE) \ - | (1 << MP_CSP_EQ_SATURATION) \ - | (1 << MP_CSP_EQ_OUTPUT_LEVELS) ) - -#define MP_CSP_EQ_CAPS_GAMMA (1 << MP_CSP_EQ_GAMMA) -#define MP_CSP_EQ_CAPS_BRIGHTNESS (1 << MP_CSP_EQ_BRIGHTNESS) - -extern const char *const mp_csp_equalizer_names[MP_CSP_EQ_COUNT]; - // Default initialization with 0 is enough, except for the capabilities field -struct mp_csp_equalizer { - // Bit field of capabilities. For example (1 << MP_CSP_EQ_HUE) means hue - // support is available. - int capabilities; +struct mp_csp_equalizer_opts { // Value for each property is in the range [-100, 100]. // 0 is default, meaning neutral or no change. int values[MP_CSP_EQ_COUNT]; }; +void mp_csp_copy_equalizer_values(struct mp_csp_params *params, + const struct mp_csp_equalizer_opts *eq); + +struct mpv_global; +struct mp_csp_equalizer_state *mp_csp_equalizer_create(void *ta_parent, + struct mpv_global *global); +bool mp_csp_equalizer_state_changed(struct mp_csp_equalizer_state *state); +void mp_csp_equalizer_state_get(struct mp_csp_equalizer_state *state, + struct mp_csp_params *params); + struct mp_csp_col_xy { float x, y; }; @@ -233,13 +230,6 @@ struct mp_csp_primaries { struct mp_csp_col_xy red, green, blue, white; }; -void mp_csp_copy_equalizer_values(struct mp_csp_params *params, - const struct mp_csp_equalizer *eq); -int mp_csp_equalizer_set(struct mp_csp_equalizer *eq, const char *property, - int value); -int mp_csp_equalizer_get(struct mp_csp_equalizer *eq, const char *property, - int *out_value); - enum mp_csp avcol_spc_to_mp_csp(int avcolorspace); enum mp_csp_levels avcol_range_to_mp_csp_levels(int avrange); enum mp_csp_prim avcol_pri_to_mp_csp_prim(int avpri); -- cgit v1.2.3