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

avfilter/af_headphone: Check for the existence of samples

Browse Source 
Not providing any samples makes no sense at all. And if no samples
were provided for one of the HRIR streams, one would either run into
an av_assert1 in ff_inlink_consume_samples() or into a segfault in
take_samples() in avfilter.c.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit dfd46e2d160afcb7e453d0e2394a6978cb447712)
This commit is contained in:
Andreas Rheinhardt 2020-08-28 10:37:46 +02:00
parent 33f78e278b
commit 66e8328d04
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/af_headphone.c
View File

@ -631,8 +631,14 @@ static int activate(AVFilterContext *ctx)
if ((ret = check_ir(ctx->inputs[i], i)) < 0)
return ret;
if (ff_outlink_get_status(ctx->inputs[i]) == AVERROR_EOF)
if (ff_outlink_get_status(ctx->inputs[i]) == AVERROR_EOF) {
if (!ff_inlink_queued_samples(ctx->inputs[i])) {
av_log(ctx, AV_LOG_ERROR, "No samples provided for "
"HRIR stream %d.\n", i - 1);
return AVERROR_INVALIDDATA;
}
s->in[i].eof = 1;
}
}
for (i = 1; i < s->nb_inputs; i++) {