RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-20 14:16:36 +00:00
Code Issues Releases Wiki Activity

audio: fix EOF state with --keep-open

Browse Source 
In paused mode, we never entered the audio EOF state. This shows e.g. in
--keep-open mode, which will not set the eof-reached property correctly.

Regression since commit c06cd1b9. This commit was the wrong fix. We need
to respect the buffer state, and pausing has nothing to do with this.

Fixes #2167.
This commit is contained in:
wm4 2015-07-24 17:27:04 +02:00
parent 3cbf68b470
commit c581804603
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
player/audio.c
View File

@ -609,7 +609,7 @@ void fill_audio_out_buffers(struct MPContext *mpctx, double endpts)
mp_audio_buffer_skip(mpctx->ao_buffer, played); mp_audio_buffer_skip(mpctx->ao_buffer, played);
mpctx->audio_status = STATUS_PLAYING; mpctx->audio_status = STATUS_PLAYING;
if (audio_eof && !mpctx->paused) { if (audio_eof && !mp_audio_buffer_samples(mpctx->ao_buffer)) {
mpctx->audio_status = STATUS_DRAINING; mpctx->audio_status = STATUS_DRAINING;
// Wait until the AO has played all queued data. In the gapless case, // Wait until the AO has played all queued data. In the gapless case,
// we trigger EOF immediately, and let it play asynchronously. // we trigger EOF immediately, and let it play asynchronously.