diff options
| author | wm4 <wm4@nowhere> | 2014-09-04 23:35:11 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-09-05 01:53:10 +0200 |
| commit | 7ab228629e8184a43782606e9fb0319110c8eee8 (patch) | |
| tree | 08771606da96c97d4c125171ccfecbdbd9da3ffb /player/loadfile.c | |
| parent | 787839e8ec54cae08e9a590d962e6b4235fd8ce2 (diff) | |
| download | mpv-7ab228629e8184a43782606e9fb0319110c8eee8.tar.bz2 mpv-7ab228629e8184a43782606e9fb0319110c8eee8.tar.xz | |
audio: fix obscure audio resync failure with timelines
Somehow, there was a larger misunderstanding in the code: ao_buffer
does not need to be preserved over audio reinit for proper support of
gapless audio. The actual AO internal buffer takes care of this.
In fact, preserving ao_buffer just breaks audio resync. In the ordered
chapter case, end_pts is used, which means not all audio data in the
buffer is played, thus some data is left over when audio decoding
resumes on the next segment. This triggers some code that aborts resync
if there's "audio decoded" (ao_buffer contains something), but no PTS
is known (nothing was actually decoded yet).
Simplify, and always bind the output buffer to the decoder.
CC: @mpv-player/stable (maybe)
Diffstat (limited to 'player/loadfile.c')
| -rw-r--r-- | player/loadfile.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/player/loadfile.c b/player/loadfile.c index 00a10aa34f..c136cc3a19 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -84,8 +84,11 @@ void uninit_player(struct MPContext *mpctx, unsigned int mask) mixer_uninit_audio(mpctx->mixer); audio_uninit(mpctx->d_audio); mpctx->d_audio = NULL; + talloc_free(mpctx->ao_buffer); mpctx->audio_status = STATUS_EOF; reselect_demux_streams(mpctx); + if (mpctx->ao_buffer) + mp_audio_buffer_clear(mpctx->ao_buffer); } if (mask & INITIALIZED_SUB) { |