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.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'options/options.c') diff --git a/options/options.c b/options/options.c index b35dd9b265..258cba0d31 100644 --- a/options/options.c +++ b/options/options.c @@ -572,15 +572,7 @@ const m_option_t mp_opts[] = { .deprecation_message = "use Lua scripting instead"), OPT_FLOAT("heartbeat-interval", heartbeat_interval, CONF_MIN, 0), -#if HAVE_GPL - OPT_INTRANGE("brightness", gamma_brightness, 0, -100, 100), - OPT_INTRANGE("saturation", gamma_saturation, 0, -100, 100), - OPT_INTRANGE("contrast", gamma_contrast, 0, -100, 100), - OPT_INTRANGE("hue", gamma_hue, 0, -100, 100), - OPT_INTRANGE("gamma", gamma_gamma, 0, -100, 100), - OPT_CHOICE_C("video-output-levels", video_output_levels, 0, - mp_csp_levels_names), -#endif + OPT_SUBSTRUCT("", video_equalizer, mp_csp_equalizer_conf, 0), OPT_FLAG("use-filedir-conf", use_filedir_conf, 0), OPT_CHOICE("osd-level", osd_level, 0, @@ -856,11 +848,6 @@ const struct MPOpts mp_default_opts = { .heartbeat_interval = 30.0, .stop_screensaver = 1, .cursor_autohide_delay = 1000, - .gamma_gamma = 0, - .gamma_brightness = 0, - .gamma_contrast = 0, - .gamma_saturation = 0, - .gamma_hue = 0, .video_osd = 1, .osd_level = 1, .osd_duration = 1000, -- cgit v1.2.3