From 03cf150ff3516789d581214177f291d46310aaf4 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
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/filter/vf.h       |  7 -------
 video/filter/vf_scale.c | 19 -------------------
 2 files changed, 26 deletions(-)

(limited to 'video/filter')

diff --git a/video/filter/vf.h b/video/filter/vf.h
index 546fd823ad..8a9815078d 100644
--- a/video/filter/vf.h
+++ b/video/filter/vf.h
@@ -141,15 +141,8 @@ struct vf_chain {
     void *wakeup_callback_ctx;
 };
 
-typedef struct vf_seteq {
-    const char *item;
-    int value;
-} vf_equalizer_t;
-
 enum vf_ctrl {
     VFCTRL_SEEK_RESET = 1,   // reset on picture and PTS discontinuities
-    VFCTRL_SET_EQUALIZER,    // set color options (brightness,contrast etc)
-    VFCTRL_GET_EQUALIZER,    // get color options (brightness,contrast etc)
 #if HAVE_GPL
     VFCTRL_SET_DEINTERLACE,  // Set deinterlacing status
     VFCTRL_GET_DEINTERLACE,  // Get deinterlacing status
diff --git a/video/filter/vf_scale.c b/video/filter/vf_scale.c
index 0759d28723..9c74db363d 100644
--- a/video/filter/vf_scale.c
+++ b/video/filter/vf_scale.c
@@ -202,24 +202,6 @@ static struct mp_image *filter(struct vf_instance *vf, struct mp_image *mpi)
     return dmpi;
 }
 
-static int control(struct vf_instance *vf, int request, void *data)
-{
-    struct mp_sws_context *sws = vf->priv->sws;
-
-    switch (request) {
-    case VFCTRL_GET_EQUALIZER:
-        if (mp_sws_get_vf_equalizer(sws, data) < 1)
-            break;
-        return CONTROL_TRUE;
-    case VFCTRL_SET_EQUALIZER:
-        if (mp_sws_set_vf_equalizer(sws, data) < 1)
-            break;
-        return CONTROL_TRUE;
-    }
-
-    return CONTROL_UNKNOWN;
-}
-
 static int query_format(struct vf_instance *vf, unsigned int fmt)
 {
     if (IMGFMT_IS_HWACCEL(fmt) || sws_isSupportedInput(imgfmt2pixfmt(fmt)) < 1)
@@ -236,7 +218,6 @@ static int vf_open(vf_instance_t *vf)
     vf->reconfig = reconfig;
     vf->filter = filter;
     vf->query_format = query_format;
-    vf->control = control;
     vf->uninit = uninit;
     vf->priv->sws = mp_sws_alloc(vf);
     vf->priv->sws->log = vf->log;
-- 
cgit v1.2.3