aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/af_surround.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2018-03-16 12:30:17 +0100
committerPaul B Mahol <onemda@gmail.com>2018-03-16 12:31:56 +0100
commit5941179e28b996b9ddfc18bf4981af14d621dc83 (patch)
tree562884614b04c5c6e42d99218bcf7795019c101c /libavfilter/af_surround.c
parent1296a718dc62728b6601f694539a1c5ad8ad260c (diff)
downloadffmpeg-5941179e28b996b9ddfc18bf4981af14d621dc83.tar.gz
avfilter/af_surround: drain input at EOF
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavfilter/af_surround.c')
-rw-r--r--libavfilter/af_surround.c28
1 files changed, 25 insertions, 3 deletions
diff --git a/libavfilter/af_surround.c b/libavfilter/af_surround.c
index 460e18cd5a..f29afecbfb 100644
--- a/libavfilter/af_surround.c
+++ b/libavfilter/af_surround.c
@@ -1390,6 +1390,27 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
return 0;
}
+static int request_frame(AVFilterLink *outlink)
+{
+ AVFilterContext *ctx = outlink->src;
+ AudioSurroundContext *s = ctx->priv;
+ int ret = 0;
+
+ ret = ff_request_frame(ctx->inputs[0]);
+
+ if (ret == AVERROR_EOF && av_audio_fifo_size(s->fifo) > 0 && av_audio_fifo_size(s->fifo) < s->buf_size) {
+ AVFrame *in;
+
+ in = ff_get_audio_buffer(outlink, s->buf_size - av_audio_fifo_size(s->fifo));
+ if (!in)
+ return AVERROR(ENOMEM);
+ ret = filter_frame(ctx->inputs[0], in);
+ av_audio_fifo_drain(s->fifo, s->buf_size);
+ }
+
+ return ret;
+}
+
static av_cold void uninit(AVFilterContext *ctx)
{
AudioSurroundContext *s = ctx->priv;
@@ -1445,9 +1466,10 @@ static const AVFilterPad inputs[] = {
static const AVFilterPad outputs[] = {
{
- .name = "default",
- .type = AVMEDIA_TYPE_AUDIO,
- .config_props = config_output,
+ .name = "default",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .request_frame = request_frame,
+ .config_props = config_output,
},
{ NULL }
};