diff options
Diffstat (limited to 'libavfilter/audio.c')
-rw-r--r-- | libavfilter/audio.c | 65 |
1 files changed, 47 insertions, 18 deletions
diff --git a/libavfilter/audio.c b/libavfilter/audio.c index 5fe9da95c3..5996f607b2 100644 --- a/libavfilter/audio.c +++ b/libavfilter/audio.c @@ -1,21 +1,25 @@ /* - * This file is part of Libav. + * Copyright (c) Stefano Sabatini | stefasab at gmail.com + * Copyright (c) S.N. Hemanth Meenakshisundaram | smeenaks at ucsd.edu * - * Libav is free software; you can redistribute it and/or + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" @@ -23,6 +27,9 @@ #include "avfilter.h" #include "internal.h" +#define BUFFER_ALIGN 0 + + AVFrame *ff_null_get_audio_buffer(AVFilterLink *link, int nb_samples) { return ff_get_audio_buffer(link->dst->outputs[0], nb_samples); @@ -30,26 +37,48 @@ AVFrame *ff_null_get_audio_buffer(AVFilterLink *link, int nb_samples) AVFrame *ff_default_get_audio_buffer(AVFilterLink *link, int nb_samples) { - AVFrame *frame = av_frame_alloc(); - int channels = av_get_channel_layout_nb_channels(link->channel_layout); - int ret; + AVFrame *frame = NULL; + int channels = link->channels; + + av_assert0(channels == av_get_channel_layout_nb_channels(link->channel_layout) || !av_get_channel_layout_nb_channels(link->channel_layout)); + + if (!link->frame_pool) { + link->frame_pool = ff_frame_pool_audio_init(av_buffer_allocz, channels, + nb_samples, link->format, BUFFER_ALIGN); + if (!link->frame_pool) + return NULL; + } else { + int pool_channels = 0; + int pool_nb_samples = 0; + int pool_align = 0; + enum AVSampleFormat pool_format = AV_SAMPLE_FMT_NONE; + + if (ff_frame_pool_get_audio_config(link->frame_pool, + &pool_channels, &pool_nb_samples, + &pool_format, &pool_align) < 0) { + return NULL; + } + if (pool_channels != channels || pool_nb_samples < nb_samples || + pool_format != link->format || pool_align != BUFFER_ALIGN) { + + ff_frame_pool_uninit((FFFramePool **)&link->frame_pool); + link->frame_pool = ff_frame_pool_audio_init(av_buffer_allocz, channels, + nb_samples, link->format, BUFFER_ALIGN); + if (!link->frame_pool) + return NULL; + } + } + + frame = ff_frame_pool_get(link->frame_pool); if (!frame) return NULL; - frame->nb_samples = nb_samples; - frame->format = link->format; + frame->nb_samples = nb_samples; frame->channel_layout = link->channel_layout; - frame->sample_rate = link->sample_rate; - ret = av_frame_get_buffer(frame, 0); - if (ret < 0) { - av_frame_free(&frame); - return NULL; - } - - av_samples_set_silence(frame->extended_data, 0, nb_samples, channels, - link->format); + frame->sample_rate = link->sample_rate; + av_samples_set_silence(frame->extended_data, 0, nb_samples, channels, link->format); return frame; } |