Browse Source

avfilter/af_headphone: add missing error check

Signed-off-by: Paul B Mahol <onemda@gmail.com>
tags/n4.0
Paul B Mahol 8 years ago
parent
commit
4073046089
1 changed files with 14 additions and 7 deletions
  1. +14
    -7
      libavfilter/af_headphone.c

+ 14
- 7
libavfilter/af_headphone.c View File

@@ -324,16 +324,19 @@ static int read_ir(AVFilterLink *inlink, AVFrame *frame)
{
AVFilterContext *ctx = inlink->dst;
HeadphoneContext *s = ctx->priv;
int ir_len, max_ir_len, input_number;
int ir_len, max_ir_len, input_number, ret;

for (input_number = 0; input_number < s->nb_inputs; input_number++)
if (inlink == ctx->inputs[input_number])
break;

av_audio_fifo_write(s->in[input_number].fifo, (void **)frame->extended_data,
frame->nb_samples);
ret = av_audio_fifo_write(s->in[input_number].fifo, (void **)frame->extended_data,
frame->nb_samples);
av_frame_free(&frame);

if (ret < 0)
return ret;

ir_len = av_audio_fifo_size(s->in[input_number].fifo);
max_ir_len = 65536;
if (ir_len > max_ir_len) {
@@ -572,13 +575,16 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
AVFilterLink *outlink = ctx->outputs[0];
int ret = 0;

av_audio_fifo_write(s->in[0].fifo, (void **)in->extended_data,
in->nb_samples);
ret = av_audio_fifo_write(s->in[0].fifo, (void **)in->extended_data,
in->nb_samples);
if (s->pts == AV_NOPTS_VALUE)
s->pts = in->pts;

av_frame_free(&in);

if (ret < 0)
return ret;

if (!s->have_hrirs && s->eof_hrirs) {
ret = convert_coeffs(ctx, inlink);
if (ret < 0)
@@ -589,10 +595,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
while (av_audio_fifo_size(s->in[0].fifo) >= s->size) {
ret = headphone_frame(s, outlink);
if (ret < 0)
break;
return ret;
}
}
return ret;

return 0;
}

static int query_formats(AVFilterContext *ctx)


Loading…
Cancel
Save