diff options
Diffstat (limited to 'libavfilter/af_amerge.c')
| -rw-r--r-- | libavfilter/af_amerge.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index 2d68ea6126..b26141d14f 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -219,14 +219,14 @@ static inline void copy_samples(int nb_inputs, struct amerge_input in[], } } -static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *insamples) +static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) { AVFilterContext *ctx = inlink->dst; AMergeContext *am = ctx->priv; AVFilterLink *const outlink = ctx->outputs[0]; int input_number; int nb_samples, ns, i; - AVFilterBufferRef *outbuf, *inbuf[SWR_CH_MAX]; + AVFrame *outbuf, *inbuf[SWR_CH_MAX]; uint8_t *ins[SWR_CH_MAX], *outs; for (input_number = 0; input_number < am->nb_inputs; input_number++) @@ -235,39 +235,40 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *insamples) av_assert1(input_number < am->nb_inputs); if (ff_bufqueue_is_full(&am->in[input_number].queue)) { av_log(ctx, AV_LOG_ERROR, "Buffer queue overflow\n"); - avfilter_unref_buffer(insamples); + av_frame_free(&insamples); return AVERROR(ENOMEM); } - ff_bufqueue_add(ctx, &am->in[input_number].queue, insamples); - am->in[input_number].nb_samples += insamples->audio->nb_samples; + ff_bufqueue_add(ctx, &am->in[input_number].queue, av_frame_clone(insamples)); + am->in[input_number].nb_samples += insamples->nb_samples; + av_frame_free(&insamples); nb_samples = am->in[0].nb_samples; for (i = 1; i < am->nb_inputs; i++) nb_samples = FFMIN(nb_samples, am->in[i].nb_samples); if (!nb_samples) return 0; - outbuf = ff_get_audio_buffer(ctx->outputs[0], AV_PERM_WRITE, nb_samples); + outbuf = ff_get_audio_buffer(ctx->outputs[0], nb_samples); outs = outbuf->data[0]; for (i = 0; i < am->nb_inputs; i++) { inbuf[i] = ff_bufqueue_peek(&am->in[i].queue, 0); ins[i] = inbuf[i]->data[0] + am->in[i].pos * am->in[i].nb_ch * am->bps; } - avfilter_copy_buffer_ref_props(outbuf, inbuf[0]); + av_frame_copy_props(outbuf, inbuf[0]); outbuf->pts = inbuf[0]->pts == AV_NOPTS_VALUE ? AV_NOPTS_VALUE : inbuf[0]->pts + av_rescale_q(am->in[0].pos, (AVRational){ 1, ctx->inputs[0]->sample_rate }, ctx->outputs[0]->time_base); - outbuf->audio->nb_samples = nb_samples; - outbuf->audio->channel_layout = outlink->channel_layout; - outbuf->audio->channels = outlink->channels; + outbuf->nb_samples = nb_samples; + outbuf->channel_layout = outlink->channel_layout; + outbuf->channels = outlink->channels; while (nb_samples) { ns = nb_samples; for (i = 0; i < am->nb_inputs; i++) - ns = FFMIN(ns, inbuf[i]->audio->nb_samples - am->in[i].pos); + ns = FFMIN(ns, inbuf[i]->nb_samples - am->in[i].pos); /* Unroll the most common sample formats: speed +~350% for the loop, +~13% overall (including two common decoders) */ switch (am->bps) { @@ -289,9 +290,9 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *insamples) for (i = 0; i < am->nb_inputs; i++) { am->in[i].nb_samples -= ns; am->in[i].pos += ns; - if (am->in[i].pos == inbuf[i]->audio->nb_samples) { + if (am->in[i].pos == inbuf[i]->nb_samples) { am->in[i].pos = 0; - avfilter_unref_buffer(inbuf[i]); + av_frame_free(&inbuf[i]); ff_bufqueue_get(&am->in[i].queue); inbuf[i] = ff_bufqueue_peek(&am->in[i].queue, 0); ins[i] = inbuf[i] ? inbuf[i]->data[0] : NULL; @@ -322,7 +323,6 @@ static av_cold int init(AVFilterContext *ctx, const char *args) .name = name, .type = AVMEDIA_TYPE_AUDIO, .filter_frame = filter_frame, - .min_perms = AV_PERM_READ | AV_PERM_PRESERVE, }; if (!name) return AVERROR(ENOMEM); |