RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavfi: switch ff_default_get_audio_buffer() to av_frame_get_buffer() 

This simplifies the code and avoids using libavcodec-specific
avcodec_fill_audio_frame().
This commit is contained in:
Anton Khirnov 2013-05-29 21:03:20 +02:00
parent cd0faeee62
commit c9c7bc4493
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libavfilter/audio.c
View File

@ -32,40 +32,26 @@ AVFrame *ff_default_get_audio_buffer(AVFilterLink *link, int nb_samples)
{ {
AVFrame *frame = av_frame_alloc(); AVFrame *frame = av_frame_alloc();
int channels = av_get_channel_layout_nb_channels(link->channel_layout); int channels = av_get_channel_layout_nb_channels(link->channel_layout);
int buf_size, ret; int ret;
if (!frame) if (!frame)
return NULL; return NULL;
buf_size = av_samples_get_buffer_size(NULL, channels, nb_samples,
link->format, 0);
if (buf_size < 0)
goto fail;
frame->buf[0] = av_buffer_alloc(buf_size);
if (!frame->buf[0])
goto fail;
frame->nb_samples = nb_samples;
ret = avcodec_fill_audio_frame(frame, channels, link->format,
frame->buf[0]->data, buf_size, 0);
if (ret < 0)
goto fail;
av_samples_set_silence(frame->extended_data, 0, nb_samples, channels,
link->format);
frame->nb_samples = nb_samples; frame->nb_samples = nb_samples;
frame->format = link->format; frame->format = link->format;
frame->channel_layout = link->channel_layout; frame->channel_layout = link->channel_layout;
frame->sample_rate = link->sample_rate; frame->sample_rate = link->sample_rate;
ret = av_frame_get_buffer(frame, 0);
return frame; if (ret < 0) {
fail:
av_buffer_unref(&frame->buf[0]);
av_frame_free(&frame); av_frame_free(&frame);
return NULL; return NULL;
}
av_samples_set_silence(frame->extended_data, 0, nb_samples, channels,
link->format);
return frame;
} }
AVFrame *ff_get_audio_buffer(AVFilterLink *link, int nb_samples) AVFrame *ff_get_audio_buffer(AVFilterLink *link, int nb_samples)