[FFmpeg-cvslog] avfilter/af_headphone: fix flushing
Paul B Mahol
git at videolan.org
Sat Apr 14 18:52:23 EEST 2018
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sat Apr 14 17:49:54 2018 +0200| [01170e9db0715123ada6114a8189858a43f81caf] | committer: Paul B Mahol
avfilter/af_headphone: fix flushing
Signed-off-by: Paul B Mahol <onemda at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01170e9db0715123ada6114a8189858a43f81caf
---
libavfilter/af_headphone.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/libavfilter/af_headphone.c b/libavfilter/af_headphone.c
index 974445e15c..57cca1a4f6 100644
--- a/libavfilter/af_headphone.c
+++ b/libavfilter/af_headphone.c
@@ -742,7 +742,20 @@ static int request_frame(AVFilterLink *outlink)
s->eof_hrirs = 1;
}
}
- return ff_request_frame(ctx->inputs[0]);
+
+ ret = ff_request_frame(ctx->inputs[0]);
+ if (ret == AVERROR_EOF && av_audio_fifo_size(s->in[0].fifo) > 0 && s->have_hrirs) {
+ AVFrame *in = ff_get_audio_buffer(outlink, s->size);
+
+ ret = av_audio_fifo_write(s->in[0].fifo, (void **)in->extended_data,
+ in->nb_samples);
+ if (ret < 0)
+ return ret;
+ ret = headphone_frame(s, outlink);
+ av_audio_fifo_drain(s->in[0].fifo, av_audio_fifo_size(s->in[0].fifo));
+ }
+
+ return ret;
}
static av_cold void uninit(AVFilterContext *ctx)
More information about the ffmpeg-cvslog
mailing list