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. --- options/options.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'options/options.h') diff --git a/options/options.h b/options/options.h index 9ea09a83b3..ecb38e3995 100644 --- a/options/options.h +++ b/options/options.h @@ -119,13 +119,7 @@ typedef struct MPOpts { char *media_title; int force_rgba_osd; - // ranges -100 - 100, 1000 if the vo default should be used - int gamma_gamma; - int gamma_brightness; - int gamma_contrast; - int gamma_saturation; - int gamma_hue; - int video_output_levels; + struct mp_csp_equalizer_opts *video_equalizer; int stop_screensaver; int cursor_autohide_delay; -- cgit v1.2.3