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

avfilter/af_afade: Remove impossible branch

Browse Source 
Also don't call ff_inlink_queued_samples() unnecessarily often.

Fixes Coverity issue 1427665.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2021-09-27 03:55:43 +02:00
parent 797fefa2e5
commit 1f387ae4cb
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavfilter/af_afade.c
View File

@@ -483,20 +483,18 @@ static int activate(AVFilterContext *ctx)
} }
} }
if (ff_inlink_queued_samples(ctx->inputs[0]) > s->nb_samples) { nb_samples = ff_inlink_queued_samples(ctx->inputs[0]);
nb_samples = ff_inlink_queued_samples(ctx->inputs[0]) - s->nb_samples; if (nb_samples > s->nb_samples) {
if (nb_samples > 0) { nb_samples -= s->nb_samples;
ret = ff_inlink_consume_samples(ctx->inputs[0], nb_samples, nb_samples, &in); ret = ff_inlink_consume_samples(ctx->inputs[0], nb_samples, nb_samples, &in);
if (ret < 0) { if (ret < 0)
return ret; return ret;
}
}
in->pts = s->pts; in->pts = s->pts;
s->pts += av_rescale_q(in->nb_samples, s->pts += av_rescale_q(in->nb_samples,
(AVRational){ 1, outlink->sample_rate }, outlink->time_base); (AVRational){ 1, outlink->sample_rate }, outlink->time_base);
return ff_filter_frame(outlink, in); return ff_filter_frame(outlink, in);
} else if (ff_inlink_queued_samples(ctx->inputs[0]) >= s->nb_samples && } else if (s->cf0_eof && nb_samples >= s->nb_samples &&
ff_inlink_queued_samples(ctx->inputs[1]) >= s->nb_samples && s->cf0_eof) { ff_inlink_queued_samples(ctx->inputs[1]) >= s->nb_samples) {
if (s->overlap) { if (s->overlap) {
out = ff_get_audio_buffer(outlink, s->nb_samples); out = ff_get_audio_buffer(outlink, s->nb_samples);
if (!out) if (!out)