highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavfi/af_asetnsamples: simplify request_frame loop.

Browse Source
This commit is contained in:
Nicolas George 2013-03-31 19:34:35 +02:00
parent 9566ba91ab
commit b570f24d76
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/af_asetnsamples.c
View File

@ -38,7 +38,6 @@ typedef struct {
int nb_out_samples; ///< how many samples to output int nb_out_samples; ///< how many samples to output
AVAudioFifo *fifo; ///< samples are queued here AVAudioFifo *fifo; ///< samples are queued here
int64_t next_out_pts; int64_t next_out_pts;
int req_fullfilled;
int pad; int pad;
} ASNSContext; } ASNSContext;
@ -86,6 +85,7 @@ static int config_props_output(AVFilterLink *outlink)
asns->fifo = av_audio_fifo_alloc(outlink->format, nb_channels, asns->nb_out_samples); asns->fifo = av_audio_fifo_alloc(outlink->format, nb_channels, asns->nb_out_samples);
if (!asns->fifo) if (!asns->fifo)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
return 0; return 0;
} }
@ -128,7 +128,6 @@ static int push_samples(AVFilterLink *outlink)
ret = ff_filter_frame(outlink, outsamples); ret = ff_filter_frame(outlink, outsamples);
if (ret < 0) if (ret < 0)
return ret; return ret;
asns->req_fullfilled = 1;
return nb_out_samples; return nb_out_samples;
} }
@ -161,15 +160,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
static int request_frame(AVFilterLink *outlink) static int request_frame(AVFilterLink *outlink)
{ {
ASNSContext *asns = outlink->src->priv;
AVFilterLink *inlink = outlink->src->inputs[0]; AVFilterLink *inlink = outlink->src->inputs[0];
int ret; int ret;
asns->req_fullfilled = 0;
do {
ret = ff_request_frame(inlink); ret = ff_request_frame(inlink);
} while (!asns->req_fullfilled && ret >= 0);
if (ret == AVERROR_EOF) { if (ret == AVERROR_EOF) {
ret = push_samples(outlink); ret = push_samples(outlink);
return ret < 0 ? ret : ret > 0 ? 0 : AVERROR_EOF; return ret < 0 ? ret : ret > 0 ? 0 : AVERROR_EOF;