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/sws_utils.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'video/sws_utils.h') diff --git a/video/sws_utils.h b/video/sws_utils.h index f8b4384e97..a3e91b3aa9 100644 --- a/video/sws_utils.h +++ b/video/sws_utils.h @@ -56,10 +56,6 @@ void mp_sws_set_from_cmdline(struct mp_sws_context *ctx, struct sws_opts *opts); int mp_sws_scale(struct mp_sws_context *ctx, struct mp_image *dst, struct mp_image *src); -struct vf_seteq; -int mp_sws_set_vf_equalizer(struct mp_sws_context *sws, struct vf_seteq *eq); -int mp_sws_get_vf_equalizer(struct mp_sws_context *sws, struct vf_seteq *eq); - struct mp_image *mp_img_swap_to_native(struct mp_image *img); #endif /* MP_SWS_UTILS_H */ -- cgit v1.2.3