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.c | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'video/sws_utils.c') diff --git a/video/sws_utils.c b/video/sws_utils.c index 974a111e83..b1ab499f68 100644 --- a/video/sws_utils.c +++ b/video/sws_utils.c @@ -291,37 +291,6 @@ int mp_image_sw_blur_scale(struct mp_image *dst, struct mp_image *src, return res; } -int mp_sws_get_vf_equalizer(struct mp_sws_context *sws, struct vf_seteq *eq) -{ - if (!sws->supports_csp) - return 0; - if (!strcmp(eq->item, "brightness")) - eq->value = ((sws->brightness * 100) + (1 << 15)) >> 16; - else if (!strcmp(eq->item, "contrast")) - eq->value = (((sws->contrast * 100) + (1 << 15)) >> 16) - 100; - else if (!strcmp(eq->item, "saturation")) - eq->value = (((sws->saturation * 100) + (1 << 15)) >> 16) - 100; - else - return 0; - return 1; -} - -int mp_sws_set_vf_equalizer(struct mp_sws_context *sws, struct vf_seteq *eq) -{ - if (!sws->supports_csp) - return 0; - if (!strcmp(eq->item, "brightness")) - sws->brightness = ((eq->value << 16) + 50) / 100; - else if (!strcmp(eq->item, "contrast")) - sws->contrast = MPMAX(1, (((eq->value + 100) << 16) + 50) / 100); - else if (!strcmp(eq->item, "saturation")) - sws->saturation = (((eq->value + 100) << 16) + 50) / 100; - else - return 0; - - return mp_sws_reinit(sws) >= 0 ? 1 : -1; -} - static const int endian_swaps[][2] = { #if BYTE_ORDER == LITTLE_ENDIAN #if defined(AV_PIX_FMT_YA16) && defined(AV_PIX_FMT_RGBA64) -- cgit v1.2.3