RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/af_amultiply: make use of ff_inlink_queued_samples()

This commit is contained in:
Paul B Mahol 2018-11-03 18:05:41 +01:00
parent 639694eaa5
commit decc008929
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavfilter/af_amultiply.c
View File

@ -24,9 +24,6 @@
#include "libavutil/float_dsp.h" #include "libavutil/float_dsp.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#define FF_INTERNAL_FIELDS 1
#include "framequeue.h"
#include "audio.h" #include "audio.h"
#include "avfilter.h" #include "avfilter.h"
#include "formats.h" #include "formats.h"
@ -85,8 +82,8 @@ static int activate(AVFilterContext *ctx)
FF_FILTER_FORWARD_STATUS_BACK_ALL(ctx->outputs[0], ctx); FF_FILTER_FORWARD_STATUS_BACK_ALL(ctx->outputs[0], ctx);
nb_samples = FFMIN(ff_framequeue_queued_samples(&ctx->inputs[0]->fifo), nb_samples = FFMIN(ff_inlink_queued_samples(ctx->inputs[0]),
ff_framequeue_queued_samples(&ctx->inputs[1]->fifo)); ff_inlink_queued_samples(ctx->inputs[1]));
for (i = 0; i < ctx->nb_inputs && nb_samples > 0; i++) { for (i = 0; i < ctx->nb_inputs && nb_samples > 0; i++) {
if (s->frames[i]) if (s->frames[i])
continue; continue;
@ -150,7 +147,7 @@ static int activate(AVFilterContext *ctx)
if (ff_outlink_frame_wanted(ctx->outputs[0])) { if (ff_outlink_frame_wanted(ctx->outputs[0])) {
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
if (ff_framequeue_queued_samples(&ctx->inputs[i]->fifo) > 0) if (ff_inlink_queued_samples(ctx->inputs[i]) > 0)
continue; continue;
ff_inlink_request_frame(ctx->inputs[i]); ff_inlink_request_frame(ctx->inputs[i]);
return 0; return 0;