RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-27 10:50:53 +00:00
Code Issues Releases Wiki Activity

loadfile: make --lavfi-complex runtime changes more flexible

Browse Source 
Setting lavfi-complex at runtime will now forcefully reselect the tracks
as needed, even if it was a "proper" track selection via --aid or --vid.
Before this commit, it just failed and complained that the VO/AO was
already "used".

Requested.
This commit is contained in:
wm4 2018-02-02 17:45:01 +01:00 committed by Kevin Mitchell
parent 42125844f9
commit 07c54d8c5c
No known key found for this signature in database
GPG Key ID: 559A34B46A917232
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
player/loadfile.c
View File

@ -1003,6 +1003,16 @@ static void cleanup_deassociated_complex_filters(struct MPContext *mpctx)
} }
} }
static void kill_outputs(struct MPContext *mpctx, struct track *track)
{
if (track->vo_c || track->ao_c) {
MP_VERBOSE(mpctx, "deselecting track %d for lavfi-complex option\n",
track->user_tid);
mp_switch_track(mpctx, track->type, NULL, 0);
}
assert(!(track->vo_c || track->ao_c));
}
// >0: changed, 0: no change, -1: error // >0: changed, 0: no change, -1: error
static int reinit_complex_filters(struct MPContext *mpctx, bool force_uninit) static int reinit_complex_filters(struct MPContext *mpctx, bool force_uninit)
{ {
@ -1042,30 +1052,30 @@ static int reinit_complex_filters(struct MPContext *mpctx, bool force_uninit)
struct mp_pin *pad = mp_filter_get_named_pin(mpctx->lavfi, "vo"); struct mp_pin *pad = mp_filter_get_named_pin(mpctx->lavfi, "vo");
if (pad && mp_pin_get_dir(pad) == MP_PIN_OUT) { if (pad && mp_pin_get_dir(pad) == MP_PIN_OUT) {
if (mpctx->vo_chain) { if (mpctx->vo_chain && mpctx->vo_chain->track)
MP_ERR(mpctx, "Pad vo tries to connect to already used VO.\n"); kill_outputs(mpctx, mpctx->vo_chain->track);
goto done; if (!mpctx->vo_chain) {
} else {
reinit_video_chain_src(mpctx, NULL); reinit_video_chain_src(mpctx, NULL);
if (!mpctx->vo_chain) if (!mpctx->vo_chain)
goto done; goto done;
} }
struct vo_chain *vo_c = mpctx->vo_chain; struct vo_chain *vo_c = mpctx->vo_chain;
assert(!vo_c->track);
vo_c->filter_src = pad; vo_c->filter_src = pad;
mp_pin_connect(vo_c->filter->f->pins[0], vo_c->filter_src); mp_pin_connect(vo_c->filter->f->pins[0], vo_c->filter_src);
} }
pad = mp_filter_get_named_pin(mpctx->lavfi, "ao"); pad = mp_filter_get_named_pin(mpctx->lavfi, "ao");
if (pad && mp_pin_get_dir(pad) == MP_PIN_OUT) { if (pad && mp_pin_get_dir(pad) == MP_PIN_OUT) {
if (mpctx->ao_chain) { if (mpctx->ao_chain && mpctx->ao_chain->track)
MP_ERR(mpctx, "Pad ao tries to connect to already used AO.\n"); kill_outputs(mpctx, mpctx->ao_chain->track);
goto done; if (!mpctx->ao_chain) {
} else {
reinit_audio_chain_src(mpctx, NULL); reinit_audio_chain_src(mpctx, NULL);
if (!mpctx->ao_chain) if (!mpctx->ao_chain)
goto done; goto done;
} }
struct ao_chain *ao_c = mpctx->ao_chain; struct ao_chain *ao_c = mpctx->ao_chain;
assert(!ao_c->track);
ao_c->filter_src = pad; ao_c->filter_src = pad;
mp_pin_connect(ao_c->filter->f->pins[0], ao_c->filter_src); mp_pin_connect(ao_c->filter->f->pins[0], ao_c->filter_src);
} }
@ -1090,19 +1100,18 @@ static int reinit_complex_filters(struct MPContext *mpctx, bool force_uninit)
assert(!mp_pin_is_connected(pad)); assert(!mp_pin_is_connected(pad));
assert(!track->sink); assert(!track->sink);
if (track->vo_c || track->ao_c) {
MP_ERR(mpctx, "Pad %s tries to connect to already selected track.\n", kill_outputs(mpctx, track);
label);
goto done;
}
track->sink = pad; track->sink = pad;
track->selected = true; track->selected = true;
assert(!track->dec);
if (track->type == STREAM_VIDEO && !init_video_decoder(mpctx, track)) if (!track->dec) {
goto done; if (track->type == STREAM_VIDEO && !init_video_decoder(mpctx, track))
if (track->type == STREAM_AUDIO && !init_audio_decoder(mpctx, track)) goto done;
goto done; if (track->type == STREAM_AUDIO && !init_audio_decoder(mpctx, track))
goto done;
}
mp_pin_connect(track->sink, track->dec->f->pins[0]); mp_pin_connect(track->sink, track->dec->f->pins[0]);
} }