diff options
| author | wm4 <wm4@nowhere> | 2013-12-10 19:08:56 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-10 20:07:39 +0100 |
| commit | 2f46b23d51684eef7cfa2bd5fa5e2892772ca816 (patch) | |
| tree | bb4363f817e6631d037cc77e225bcef2bc5b092e /mpvcore/player | |
| parent | 5f0585177e58349a8a309037803ff99046a3ab27 (diff) | |
| download | mpv-2f46b23d51684eef7cfa2bd5fa5e2892772ca816.tar.bz2 mpv-2f46b23d51684eef7cfa2bd5fa5e2892772ca816.tar.xz | |
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.
Diffstat (limited to 'mpvcore/player')
| -rw-r--r-- | mpvcore/player/command.c | 12 | ||||
| -rw-r--r-- | mpvcore/player/video.c | 1 |
2 files changed, 7 insertions, 6 deletions
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"); } } diff --git a/mpvcore/player/video.c b/mpvcore/player/video.c index 2f069a634b..7584f84c1c 100644 --- a/mpvcore/player/video.c +++ b/mpvcore/player/video.c @@ -123,6 +123,7 @@ int reinit_video_chain(struct MPContext *mpctx) d_video->opts = mpctx->opts; d_video->header = sh; d_video->fps = sh->video->fps; + d_video->vo = mpctx->video_out; mpctx->initialized_flags |= INITIALIZED_VCODEC; vo_control(mpctx->video_out, VOCTRL_GET_HWDEC_INFO, &d_video->hwdec_info); |