RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-24 07:42:17 +00:00
Code Issues Releases Wiki Activity

player: remove auto-inserted filters before adding them again

Browse Source 
Makes certain cases of runtime changes actually work.

Also change the label for the stereo3d filter and make it consistent
with the rotate one.
This commit is contained in:
wm4 2016-03-28 19:36:11 +02:00
parent bd98d9e232
commit cdd30fd0ab
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
player/video.c
View File

@ -166,6 +166,16 @@ static void filter_reconfig(struct vo_chain *vo_c)
if (vf_reconfig(vo_c->vf, &params) < 0) if (vf_reconfig(vo_c->vf, &params) < 0)
return; return;
char *filters[] = {"autorotate", "autostereo3d", NULL};
for (int n = 0; filters[n]; n++) {
struct vf_instance *vf = vf_find_by_label(vo_c->vf, filters[n]);
if (vf) {
vf_remove_filter(vo_c->vf, vf);
if (vf_reconfig(vo_c->vf, &params) < 0)
return;
}
}
if (params.rotate && (params.rotate % 90 == 0)) { if (params.rotate && (params.rotate % 90 == 0)) {
if (!(vo_c->vo->driver->caps & VO_CAP_ROTATE90)) { if (!(vo_c->vo->driver->caps & VO_CAP_ROTATE90)) {
// Try to insert a rotation filter. // Try to insert a rotation filter.
@ -184,7 +194,7 @@ static void filter_reconfig(struct vo_chain *vo_c)
char *to = (char *)MP_STEREO3D_NAME(params.stereo_out); char *to = (char *)MP_STEREO3D_NAME(params.stereo_out);
if (to) { if (to) {
char *args[] = {"in", "auto", "out", to, NULL, NULL}; char *args[] = {"in", "auto", "out", to, NULL, NULL};
if (try_filter(vo_c, params, "stereo3d", "stereo3d", args) < 0) if (try_filter(vo_c, params, "stereo3d", "autostereo3d", args) < 0)
MP_ERR(vo_c, "Can't insert 3D conversion filter.\n"); MP_ERR(vo_c, "Can't insert 3D conversion filter.\n");
} }
} }