diff options
author | wm4 <wm4@nowhere> | 2017-08-22 17:01:35 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2017-08-22 17:01:35 +0200 |
commit | 03cf150ff3516789d581214177f291d46310aaf4 (patch) | |
tree | 2f352bf9c6d36e10001accdb72cef2d7683ab04a /video/out/vo_opengl.c | |
parent | d67aa6da6bbd3cba9eabd12cda4703821fecc7a1 (diff) | |
download | mpv-03cf150ff3516789d581214177f291d46310aaf4.tar.bz2 mpv-03cf150ff3516789d581214177f291d46310aaf4.tar.xz |
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.
Diffstat (limited to 'video/out/vo_opengl.c')
-rw-r--r-- | video/out/vo_opengl.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c index 02a7318970..72691e56c2 100644 --- a/video/out/vo_opengl.c +++ b/video/out/vo_opengl.c @@ -262,22 +262,9 @@ static int control(struct vo *vo, uint32_t request, void *data) case VOCTRL_SET_PANSCAN: resize(p); return VO_TRUE; - case VOCTRL_GET_EQUALIZER: { - struct voctrl_get_equalizer_args *args = data; - struct mp_csp_equalizer *eq = gl_video_eq_ptr(p->renderer); - bool r = mp_csp_equalizer_get(eq, args->name, args->valueptr) >= 0; - return r ? VO_TRUE : VO_NOTIMPL; - } - case VOCTRL_SET_EQUALIZER: { - struct voctrl_set_equalizer_args *args = data; - struct mp_csp_equalizer *eq = gl_video_eq_ptr(p->renderer); - if (mp_csp_equalizer_set(eq, args->name, args->value) >= 0) { - gl_video_eq_update(p->renderer); - vo->want_redraw = true; - return VO_TRUE; - } - return VO_NOTIMPL; - } + case VOCTRL_SET_EQUALIZER: + vo->want_redraw = true; + return VO_TRUE; case VOCTRL_SCREENSHOT_WIN: { struct mp_image *screen = gl_read_fbo_contents(p->gl, p->glctx->main_fb, vo->dwidth, vo->dheight); |