From 2f46b23d51684eef7cfa2bd5fa5e2892772ca816 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 10 Dec 2013 19:08:56 +0100 Subject: video: move handling of brightness and deinterlacing control Handling of brightness/gamma/saturation/etc. and deinterlacing is moved from vf_vo.c to dec_video.c. --- mpvcore/player/command.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mpvcore/player/command.c') diff --git a/mpvcore/player/command.c b/mpvcore/player/command.c index 339327d280..7f92c50bd9 100644 --- a/mpvcore/player/command.c +++ b/mpvcore/player/command.c @@ -1189,13 +1189,13 @@ static int probe_deint_filters(struct MPContext *mpctx, const char *cmd) static int get_deinterlacing(struct MPContext *mpctx) { - struct vf_chain *c = mpctx->d_video->vfilter; + struct dec_video *vd = mpctx->d_video; int enabled = 0; - if (vf_control_any(c, VFCTRL_GET_DEINTERLACE, &enabled) != CONTROL_OK) + if (video_vf_vo_control(vd, VFCTRL_GET_DEINTERLACE, &enabled) != CONTROL_OK) enabled = -1; if (enabled < 0) { // vf_lavfi doesn't support VFCTRL_GET_DEINTERLACE - if (vf_find_by_label(c, VF_DEINTERLACE_LABEL)) + if (vf_find_by_label(vd->vfilter, VF_DEINTERLACE_LABEL)) enabled = 1; } return enabled; @@ -1203,14 +1203,14 @@ static int get_deinterlacing(struct MPContext *mpctx) static void set_deinterlacing(struct MPContext *mpctx, bool enable) { - struct vf_chain *c = mpctx->d_video->vfilter; - if (vf_find_by_label(c, VF_DEINTERLACE_LABEL)) { + struct dec_video *vd = mpctx->d_video; + if (vf_find_by_label(vd->vfilter, VF_DEINTERLACE_LABEL)) { if (!enable) edit_filters(mpctx, STREAM_VIDEO, "del", "@" VF_DEINTERLACE_LABEL); } else { if ((get_deinterlacing(mpctx) > 0) != enable) { int arg = enable; - if (vf_control_any(c, VFCTRL_SET_DEINTERLACE, &arg) != CONTROL_OK) + if (video_vf_vo_control(vd, VFCTRL_SET_DEINTERLACE, &arg) != CONTROL_OK) probe_deint_filters(mpctx, "pre"); } } -- cgit v1.2.3