virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

lavfi/avf_showspectrum: remove looping on request_frame().

Browse Source
This commit is contained in:
Nicolas George 2015-10-02 16:03:02 +02:00
parent 114f3f526e
commit 9a520c4d52
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavfilter/avf_showspectrum.c
View File

@ -44,7 +44,6 @@ typedef struct {
const AVClass *class; const AVClass *class;
int w, h; int w, h;
AVFrame *outpicref; AVFrame *outpicref;
int req_fullfilled;
int nb_display_channels; int nb_display_channels;
int channel_height; int channel_height;
int sliding; ///< 1 if sliding mode, 0 otherwise int sliding; ///< 1 if sliding mode, 0 otherwise
@ -268,8 +267,7 @@ static int request_frame(AVFilterLink *outlink)
unsigned i; unsigned i;
int ret; int ret;
s->req_fullfilled = 0; /* TODO reindent */
do {
ret = ff_request_frame(inlink); ret = ff_request_frame(inlink);
if (ret == AVERROR_EOF && s->sliding == FULLFRAME && s->xpos > 0 && if (ret == AVERROR_EOF && s->sliding == FULLFRAME && s->xpos > 0 &&
s->outpicref) { s->outpicref) {
@ -280,9 +278,7 @@ static int request_frame(AVFilterLink *outlink)
} }
ret = ff_filter_frame(outlink, s->outpicref); ret = ff_filter_frame(outlink, s->outpicref);
s->outpicref = NULL; s->outpicref = NULL;
s->req_fullfilled = 1;
} }
} while (!s->req_fullfilled && ret >= 0);
return ret; return ret;
} }
@ -468,7 +464,6 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples)
if (s->xpos >= outlink->w) if (s->xpos >= outlink->w)
s->xpos = 0; s->xpos = 0;
if (s->sliding != FULLFRAME || s->xpos == 0) { if (s->sliding != FULLFRAME || s->xpos == 0) {
s->req_fullfilled = 1;
ret = ff_filter_frame(outlink, av_frame_clone(s->outpicref)); ret = ff_filter_frame(outlink, av_frame_clone(s->outpicref));
if (ret < 0) if (ret < 0)
return ret; return ret;