Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

af_lavrresample: fix draining

Browse Source 
configure_lavrr() clears s->pending, so we have to assign it after that
call.
This commit is contained in:
wm4
2015-04-18 13:39:40 +02:00
parent b0bd0a6e6b
commit d8dd4b6c39
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
audio/filter/af_lavrresample.c
View File

@@ -318,17 +318,17 @@ static int control(struct af_instance *af, int cmd, void *arg)
if (new_rate != s->ctx.in_rate && s->avrctx_ok && af->fmt_out.format) {
// Before reconfiguring, drain the audio that is still buffered
// in the resampler.
talloc_free(s->pending);
s->pending = talloc_zero(NULL, struct mp_audio);
mp_audio_copy_config(s->pending, &af->fmt_out);
s->pending->samples = get_drain_samples(s);
if (s->pending->samples > 0) {
mp_audio_realloc_min(s->pending, s->pending->samples);
int r = resample_frame(s->avrctx, s->pending, NULL);
s->pending->samples = MPMAX(r, 0);
struct mp_audio *pending = talloc_zero(NULL, struct mp_audio);
mp_audio_copy_config(pending, &af->fmt_out);
pending->samples = get_drain_samples(s);
if (pending->samples > 0) {
mp_audio_realloc_min(pending, pending->samples);
int r = resample_frame(s->avrctx, pending, NULL);
pending->samples = MPMAX(r, 0);
}
// Reinitialize resampler.
configure_lavrr(af, &af->fmt_in, &af->fmt_out);
s->pending = pending;
}
return AF_OK;
}