[FFmpeg-cvslog] lavfi: switch to _alt functions
Michael Niedermayer
git at videolan.org
Tue May 15 18:58:19 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 15 18:55:17 2012 +0200| [47aae2bc2e4a9b3eacc5e563c1184be58b999d61] | committer: Michael Niedermayer
lavfi: switch to _alt functions
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47aae2bc2e4a9b3eacc5e563c1184be58b999d61
---
libavfilter/audio.c | 78 +--------------------------------------------
libavfilter/avcodec.c | 5 +--
libavfilter/avfilter.h | 21 +------------
libavfilter/src_buffer.c | 4 +-
4 files changed, 7 insertions(+), 101 deletions(-)
diff --git a/libavfilter/audio.c b/libavfilter/audio.c
index 31f6796..a3ab0f6 100644
--- a/libavfilter/audio.c
+++ b/libavfilter/audio.c
@@ -33,38 +33,6 @@ AVFilterBufferRef *ff_null_get_audio_buffer(AVFilterLink *link, int perms,
}
AVFilterBufferRef *ff_default_get_audio_buffer(AVFilterLink *link, int perms,
- int nb_samples)
-{
- AVFilterBufferRef *samplesref = NULL;
- int linesize[8] = {0};
- uint8_t *data[8] = {0};
- int ch, nb_channels = av_get_channel_layout_nb_channels(link->channel_layout);
-
- /* right now we don't support more than 8 channels */
- av_assert0(nb_channels <= 8);
-
- /* Calculate total buffer size, round to multiple of 16 to be SIMD friendly */
- if (av_samples_alloc(data, linesize,
- nb_channels, nb_samples,
- av_get_alt_sample_fmt(link->format, link->planar),
- 16) < 0)
- return NULL;
-
- for (ch = 1; link->planar && ch < nb_channels; ch++)
- linesize[ch] = linesize[0];
- samplesref =
- avfilter_get_audio_buffer_ref_from_arrays(data, linesize, perms,
- nb_samples, link->format,
- link->channel_layout, link->planar);
- if (!samplesref) {
- av_free(data[0]);
- return NULL;
- }
-
- return samplesref;
-}
-
-static AVFilterBufferRef *ff_default_get_audio_buffer_alt(AVFilterLink *link, int perms,
int nb_samples)
{
AVFilterBufferRef *samplesref = NULL;
@@ -80,7 +48,7 @@ static AVFilterBufferRef *ff_default_get_audio_buffer_alt(AVFilterLink *link, in
if (av_samples_alloc(data, &linesize, nb_channels, nb_samples, link->format, 0) < 0)
goto fail;
- samplesref = avfilter_get_audio_buffer_ref_from_arrays_alt(data, linesize, perms,
+ samplesref = avfilter_get_audio_buffer_ref_from_arrays(data, linesize, perms,
nb_samples, link->format,
link->channel_layout);
if (!samplesref)
@@ -112,49 +80,7 @@ AVFilterBufferRef *ff_get_audio_buffer(AVFilterLink *link, int perms,
return ret;
}
-AVFilterBufferRef *
-avfilter_get_audio_buffer_ref_from_arrays(uint8_t *data[8], int linesize[8], int perms,
- int nb_samples, enum AVSampleFormat sample_fmt,
- uint64_t channel_layout, int planar)
-{
- AVFilterBuffer *samples = av_mallocz(sizeof(AVFilterBuffer));
- AVFilterBufferRef *samplesref = av_mallocz(sizeof(AVFilterBufferRef));
-
- if (!samples || !samplesref)
- goto fail;
-
- samplesref->buf = samples;
- samplesref->buf->free = ff_avfilter_default_free_buffer;
- if (!(samplesref->audio = av_mallocz(sizeof(AVFilterBufferRefAudioProps))))
- goto fail;
-
- samplesref->audio->nb_samples = nb_samples;
- samplesref->audio->channel_layout = channel_layout;
- samplesref->audio->planar = planar;
-
- /* make sure the buffer gets read permission or it's useless for output */
- samplesref->perms = perms | AV_PERM_READ;
-
- samples->refcount = 1;
- samplesref->type = AVMEDIA_TYPE_AUDIO;
- samplesref->format = sample_fmt;
-
- memcpy(samples->data, data, sizeof(samples->data));
- memcpy(samples->linesize, linesize, sizeof(samples->linesize));
- memcpy(samplesref->data, data, sizeof(samplesref->data));
- memcpy(samplesref->linesize, linesize, sizeof(samplesref->linesize));
-
- return samplesref;
-
-fail:
- if (samplesref && samplesref->audio)
- av_freep(&samplesref->audio);
- av_freep(&samplesref);
- av_freep(&samples);
- return NULL;
-}
-
-AVFilterBufferRef* avfilter_get_audio_buffer_ref_from_arrays_alt(uint8_t **data,
+AVFilterBufferRef* avfilter_get_audio_buffer_ref_from_arrays(uint8_t **data,
int linesize,int perms,
int nb_samples,
enum AVSampleFormat sample_fmt,
diff --git a/libavfilter/avcodec.c b/libavfilter/avcodec.c
index b71cf97..d4c92f9 100644
--- a/libavfilter/avcodec.c
+++ b/libavfilter/avcodec.c
@@ -112,10 +112,9 @@ AVFilterBufferRef *avfilter_get_audio_buffer_ref_from_frame(const AVFrame *frame
int perms)
{
AVFilterBufferRef *picref =
- avfilter_get_audio_buffer_ref_from_arrays((uint8_t **)frame->data, (int *)frame->linesize, perms,
+ avfilter_get_audio_buffer_ref_from_arrays((uint8_t **)frame->data, frame->linesize[0], perms,
frame->nb_samples, frame->format,
- av_frame_get_channel_layout(frame),
- av_sample_fmt_is_planar(frame->format));
+ av_frame_get_channel_layout(frame));
if (!picref)
return NULL;
avfilter_copy_frame_props(picref, frame);
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 97e457f..06146cf 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -790,27 +790,8 @@ avfilter_get_video_buffer_ref_from_arrays(uint8_t * const data[4], const int lin
* @param nb_samples number of samples per channel
* @param sample_fmt the format of each sample in the buffer to allocate
* @param channel_layout the channel layout of the buffer
- * @param planar audio data layout - planar or packed
*/
-AVFilterBufferRef *avfilter_get_audio_buffer_ref_from_arrays(uint8_t *data[8],
- int linesize[8],
- int perms,
- int nb_samples,
- enum AVSampleFormat sample_fmt,
- uint64_t channel_layout,
- int planar);
-/**
- * Create an audio buffer reference wrapped around an already
- * allocated samples buffer.
- *
- * @param data pointers to the samples plane buffers
- * @param linesize linesize for the samples plane buffers
- * @param perms the required access permissions
- * @param nb_samples number of samples per channel
- * @param sample_fmt the format of each sample in the buffer to allocate
- * @param channel_layout the channel layout of the buffer
- */
-AVFilterBufferRef *avfilter_get_audio_buffer_ref_from_arrays_alt(uint8_t **data,
+AVFilterBufferRef *avfilter_get_audio_buffer_ref_from_arrays(uint8_t **data,
int linesize,
int perms,
int nb_samples,
diff --git a/libavfilter/src_buffer.c b/libavfilter/src_buffer.c
index 6355cce..f8d572d 100644
--- a/libavfilter/src_buffer.c
+++ b/libavfilter/src_buffer.c
@@ -597,9 +597,9 @@ int av_asrc_buffer_add_samples(AVFilterContext *ctx,
AVFilterBufferRef *samplesref;
samplesref = avfilter_get_audio_buffer_ref_from_arrays(
- data, linesize, AV_PERM_WRITE,
+ data, linesize[0], AV_PERM_WRITE,
nb_samples,
- sample_fmt, channel_layout, planar);
+ sample_fmt, channel_layout);
if (!samplesref)
return AVERROR(ENOMEM);
More information about the ffmpeg-cvslog
mailing list