From d1ad0815fe2406504ac5cc5a498ae5d8143c1d98 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 28 Oct 2015 23:50:59 +0100 Subject: player: simplify display-adrop mode safeguard It's not needed, because the additional data is not appended, but is the total size of the audio buffer. The maximum size is the static audio drop size (or twice, if the audio is duplicated). --- player/audio.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'player/audio.c') diff --git a/player/audio.c b/player/audio.c index 9207986892..5e19f118d0 100644 --- a/player/audio.c +++ b/player/audio.c @@ -562,14 +562,7 @@ void fill_audio_out_buffers(struct MPContext *mpctx, double endpts) skip_duplicate = mpctx->last_av_difference >= 0 ? -samples : samples; - // safeguard against excessively growing audio buffer sizes - if (skip_duplicate < 0 && mp_audio_buffer_seconds(mpctx->ao_buffer) > 5) { - skip_duplicate = 0; - samples = 0; - } - - if (playsize < samples) - playsize = samples; + playsize = MPMAX(playsize, samples); } int status = AD_OK; -- cgit v1.2.3