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

lavfi/avf_showwaves: remove looping on request_frame().

Browse Source
This commit is contained in:
Nicolas George
2015-10-02 16:04:47 +02:00
parent 9a520c4d52
commit 8a2e2fc34a
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/avf_showwaves.c
View File

@@ -53,7 +53,6 @@ typedef struct {
int buf_idx; int buf_idx;
int16_t *buf_idy; /* y coordinate of previous sample for each channel */ int16_t *buf_idy; /* y coordinate of previous sample for each channel */
AVFrame *outpicref; AVFrame *outpicref;
int req_fullfilled;
int n; int n;
int sample_count_mod; int sample_count_mod;
int mode; ///< ShowWavesMode int mode; ///< ShowWavesMode
@@ -179,8 +178,7 @@ inline static int push_frame(AVFilterLink *outlink)
int nb_channels = inlink->channels; int nb_channels = inlink->channels;
int ret, i; int ret, i;
if ((ret = ff_filter_frame(outlink, showwaves->outpicref)) >= 0) ret = ff_filter_frame(outlink, showwaves->outpicref);
showwaves->req_fullfilled = 1;
showwaves->outpicref = NULL; showwaves->outpicref = NULL;
showwaves->buf_idx = 0; showwaves->buf_idx = 0;
for (i = 0; i < nb_channels; i++) for (i = 0; i < nb_channels; i++)
@@ -248,11 +246,7 @@ static int request_frame(AVFilterLink *outlink)
AVFilterLink *inlink = outlink->src->inputs[0]; AVFilterLink *inlink = outlink->src->inputs[0];
int ret; int ret;
showwaves->req_fullfilled = 0;
do {
ret = ff_request_frame(inlink); ret = ff_request_frame(inlink);
} while (!showwaves->req_fullfilled && ret >= 0);
if (ret == AVERROR_EOF && showwaves->outpicref) { if (ret == AVERROR_EOF && showwaves->outpicref) {
if (showwaves->single_pic) if (showwaves->single_pic)
push_single_pic(outlink); push_single_pic(outlink);