diff options
Diffstat (limited to 'player/audio.c')
| -rw-r--r-- | player/audio.c | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/player/audio.c b/player/audio.c index 50c0faaf09..0c9d878496 100644 --- a/player/audio.c +++ b/player/audio.c @@ -314,6 +314,7 @@ static void ao_chain_set_ao(struct ao_chain *ao_c, struct ao *ao) mp_async_queue_set_notifier(ao_c->queue_filter, ao_c->ao_filter); // Make sure filtering never stops with frames stuck in access filter. mp_filter_set_high_priority(ao_c->queue_filter, true); + audio_update_volume(ao_c->mpctx); } if (ao_c->filter->ao_needs_update) @@ -322,7 +323,7 @@ static void ao_chain_set_ao(struct ao_chain *ao_c, struct ao *ao) mp_filter_wakeup(ao_c->ao_filter); } -static void reinit_audio_filters_and_output(struct MPContext *mpctx) +static int reinit_audio_filters_and_output(struct MPContext *mpctx) { struct MPOpts *opts = mpctx->opts; struct ao_chain *ao_c = mpctx->ao_chain; @@ -359,13 +360,13 @@ static void reinit_audio_filters_and_output(struct MPContext *mpctx) { ao_chain_set_ao(ao_c, mpctx->ao); talloc_free(out_fmt); - return; + return 0; } // Wait until all played. if (mpctx->ao && ao_is_playing(mpctx->ao)) { talloc_free(out_fmt); - return; + return 0; } // Format change during syncing. Force playback start early, then wait. if (ao_c->ao_queue && mp_async_queue_get_frames(ao_c->ao_queue) && @@ -374,11 +375,11 @@ static void reinit_audio_filters_and_output(struct MPContext *mpctx) mpctx->audio_status = STATUS_READY; mp_wakeup_core(mpctx); talloc_free(out_fmt); - return; + return 0; } if (mpctx->audio_status == STATUS_READY) { talloc_free(out_fmt); - return; + return 0; } uninit_audio_out(mpctx); @@ -446,7 +447,7 @@ static void reinit_audio_filters_and_output(struct MPContext *mpctx) reset_audio_state(mpctx); mp_output_chain_reset_harder(ao_c->filter); mp_wakeup_core(mpctx); // reinit with new format next time - return; + return 0; } MP_ERR(mpctx, "Could not open/initialize audio device -> no sound.\n"); @@ -477,12 +478,13 @@ static void reinit_audio_filters_and_output(struct MPContext *mpctx) mp_wakeup_core(mpctx); mp_notify(mpctx, MPV_EVENT_AUDIO_RECONFIG, NULL); - return; + return 0; init_error: uninit_audio_chain(mpctx); uninit_audio_out(mpctx); error_on_track(mpctx, track); + return -1; } int init_audio_decoder(struct MPContext *mpctx, struct track *track) @@ -516,7 +518,8 @@ void reinit_audio_chain(struct MPContext *mpctx) struct track *track = NULL; track = mpctx->current_track[0][STREAM_AUDIO]; if (!track || !track->stream) { - uninit_audio_out(mpctx); + if (!mpctx->encode_lavc_ctx) + uninit_audio_out(mpctx); error_on_track(mpctx, track); return; } @@ -634,7 +637,7 @@ static void ao_process(struct mp_filter *f) return; } - // Due to mp_async_queue_set_notifier() thhis function is called when the + // Due to mp_async_queue_set_notifier() this function is called when the // queue becomes full. This affects state changes in the normal playloop, // so wake it up. But avoid redundant wakeups during normal playback. if (mpctx->audio_status != STATUS_PLAYING && @@ -820,8 +823,10 @@ void audio_start_ao(struct MPContext *mpctx) MP_VERBOSE(mpctx, "starting audio playback\n"); ao_start(ao_c->ao); mpctx->audio_status = STATUS_PLAYING; - if (ao_c->out_eof) + if (ao_c->out_eof) { mpctx->audio_status = STATUS_DRAINING; + MP_VERBOSE(mpctx, "audio draining\n"); + } ao_c->underrun = false; mpctx->logged_async_diff = -1; mp_wakeup_core(mpctx); @@ -849,8 +854,10 @@ void fill_audio_out_buffers(struct MPContext *mpctx) return; } - if (ao_c->filter->ao_needs_update) - reinit_audio_filters_and_output(mpctx); + if (ao_c->filter->ao_needs_update) { + if (reinit_audio_filters_and_output(mpctx) < 0) + return; + } if (mpctx->vo_chain && ao_c->track && ao_c->track->dec && mp_decoder_wrapper_get_pts_reset(ao_c->track->dec)) @@ -870,8 +877,10 @@ void fill_audio_out_buffers(struct MPContext *mpctx) // until the old audio is fully played. // (Buggy if AO underruns.) if (mpctx->ao && ao_is_playing(mpctx->ao) && - mpctx->video_status != STATUS_EOF) + mpctx->video_status != STATUS_EOF) { + MP_VERBOSE(mpctx, "blocked, waiting for old audio to play\n"); ok = false; + } if (ao_c->start_pts_known != ok || ao_c->start_pts != pts) { ao_c->start_pts_known = ok; |