virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avfilter/af_surround: drain input at EOF

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2018-03-16 12:30:17 +01:00
parent 1296a718dc
commit 5941179e28
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavfilter/af_surround.c
View File

@ -1390,6 +1390,27 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
return 0; 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) static av_cold void uninit(AVFilterContext *ctx)
{ {
AudioSurroundContext *s = ctx->priv; AudioSurroundContext *s = ctx->priv;
@ -1445,9 +1466,10 @@ static const AVFilterPad inputs[] = {
static const AVFilterPad outputs[] = { static const AVFilterPad outputs[] = {
{ {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.config_props = config_output, .request_frame = request_frame,
.config_props = config_output,
}, },
{ NULL } { NULL }
}; };