diff options
| author | wm4 <wm4@nowhere> | 2013-12-10 19:07:29 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-10 20:07:39 +0100 |
| commit | 9838bf55657c3944150afec44668c3c3b559c1ff (patch) | |
| tree | 6c4b37bddb6a7594a7abe361f2c5d2bad1280039 /mpvcore/player/command.c | |
| parent | 218b9d3737134a9f619c49992a5fb34ad9e3733b (diff) | |
| download | mpv-9838bf55657c3944150afec44668c3c3b559c1ff.tar.bz2 mpv-9838bf55657c3944150afec44668c3c3b559c1ff.tar.xz | |
video: move video filter chain initialization from decoder to player
This should help fixing some issues (like not draining video frames
correctly on reinit), as well as decoupling the decoder, filter chain,
and VO code.
I also wanted to make the hardware video decoding fallback work properly
if software-only video filters are inserted. This currently has the
issue that the fallback is too violent, and throws away a bunch of
demuxer packets needed to restart software decoding properly. But
keeping "backup" packets turned out as too hacky, so I'm not doing this,
at least not yet.
Diffstat (limited to 'mpvcore/player/command.c')
| -rw-r--r-- | mpvcore/player/command.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mpvcore/player/command.c b/mpvcore/player/command.c index 728e01c636..339327d280 100644 --- a/mpvcore/player/command.c +++ b/mpvcore/player/command.c @@ -1261,7 +1261,7 @@ static int mp_property_colormatrix(m_option_t *prop, int action, void *arg, struct mp_image_params vd_csp = {0}; if (mpctx->d_video) - video_vd_control(mpctx->d_video, VDCTRL_GET_PARAMS, &vd_csp); + vd_csp = mpctx->d_video->decoder_output; char *res = talloc_asprintf(NULL, "%s", mp_csp_names[opts->requested_colorspace]); @@ -1295,7 +1295,7 @@ static int mp_property_colormatrix_input_range(m_option_t *prop, int action, struct mp_image_params vd_csp = {0}; if (mpctx->d_video) - video_vd_control(mpctx->d_video, VDCTRL_GET_PARAMS, &vd_csp); + vd_csp = mpctx->d_video->decoder_output; char *res = talloc_asprintf(NULL, "%s", mp_csp_levels_names[opts->requested_input_range]); |