generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

af_resample: fix request_frame() behavior.

Browse Source 
Make sure that an output frame has really been produced before returning
0.
This commit is contained in:
Anton Khirnov 2012-07-04 16:46:17 +02:00
parent 6f834293d3
commit 1ffb645662
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavfilter/af_resample.c
View File

@ -38,6 +38,9 @@ typedef struct ResampleContext {
AVAudioResampleContext *avr; AVAudioResampleContext *avr;
int64_t next_pts; int64_t next_pts;
/* set by filter_samples() to signal an output frame to request_frame() */
int got_output;
} ResampleContext; } ResampleContext;
static av_cold void uninit(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx)
@ -124,7 +127,11 @@ static int request_frame(AVFilterLink *outlink)
{ {
AVFilterContext *ctx = outlink->src; AVFilterContext *ctx = outlink->src;
ResampleContext *s = ctx->priv; ResampleContext *s = ctx->priv;
int ret = ff_request_frame(ctx->inputs[0]); int ret = 0;
s->got_output = 0;
while (ret >= 0 && !s->got_output)
ret = ff_request_frame(ctx->inputs[0]);
/* flush the lavr delay buffer */ /* flush the lavr delay buffer */
if (ret == AVERROR_EOF && s->avr) { if (ret == AVERROR_EOF && s->avr) {
@ -203,10 +210,13 @@ static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *buf)
s->next_pts = buf_out->pts + buf_out->audio->nb_samples; s->next_pts = buf_out->pts + buf_out->audio->nb_samples;
ff_filter_samples(outlink, buf_out); ff_filter_samples(outlink, buf_out);
s->got_output = 1;
} }
avfilter_unref_buffer(buf); avfilter_unref_buffer(buf);
} else } else {
ff_filter_samples(outlink, buf); ff_filter_samples(outlink, buf);
s->got_output = 1;
}
} }
AVFilter avfilter_af_resample = { AVFilter avfilter_af_resample = {