summaryrefslogtreecommitdiff
path: root/libavfilter/audio.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-11-27 07:49:45 +0100
committerAnton Khirnov <anton@khirnov.net>2012-11-28 08:50:19 +0100
commit565e4993c63f797e2d50ad2f1e8f62fdbe299666 (patch)
treebae5282b2ee875de4b01467f3cfaab54b0ab6ec0 /libavfilter/audio.c
parentbb6c67bb36b136de10256f0999128df4a42f9ffc (diff)
lavfi: merge start_frame/draw_slice/end_frame
Any alleged performance benefits gained from the split are purely mythological and do not justify added code complexity.
Diffstat (limited to 'libavfilter/audio.c')
-rw-r--r--libavfilter/audio.c47
1 files changed, 0 insertions, 47 deletions
diff --git a/libavfilter/audio.c b/libavfilter/audio.c
index 48e038b842..bbe12b211b 100644
--- a/libavfilter/audio.c
+++ b/libavfilter/audio.c
@@ -146,50 +146,3 @@ fail:
av_freep(&samples);
return NULL;
}
-
-static int default_filter_samples(AVFilterLink *link,
- AVFilterBufferRef *samplesref)
-{
- return ff_filter_samples(link->dst->outputs[0], samplesref);
-}
-
-int ff_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref)
-{
- int (*filter_samples)(AVFilterLink *, AVFilterBufferRef *);
- AVFilterPad *dst = link->dstpad;
- AVFilterBufferRef *buf_out;
-
- FF_DPRINTF_START(NULL, filter_samples); ff_dlog_link(NULL, link, 1);
-
- if (!(filter_samples = dst->filter_samples))
- filter_samples = default_filter_samples;
-
- /* prepare to copy the samples if the buffer has insufficient permissions */
- if ((dst->min_perms & samplesref->perms) != dst->min_perms ||
- dst->rej_perms & samplesref->perms) {
- av_log(link->dst, AV_LOG_DEBUG,
- "Copying audio data in avfilter (have perms %x, need %x, reject %x)\n",
- samplesref->perms, link->dstpad->min_perms, link->dstpad->rej_perms);
-
- buf_out = ff_default_get_audio_buffer(link, dst->min_perms,
- samplesref->audio->nb_samples);
- if (!buf_out) {
- avfilter_unref_buffer(samplesref);
- return AVERROR(ENOMEM);
- }
- buf_out->pts = samplesref->pts;
- buf_out->audio->sample_rate = samplesref->audio->sample_rate;
-
- /* Copy actual data into new samples buffer */
- av_samples_copy(buf_out->extended_data, samplesref->extended_data,
- 0, 0, samplesref->audio->nb_samples,
- av_get_channel_layout_nb_channels(link->channel_layout),
- link->format);
-
- avfilter_unref_buffer(samplesref);
- } else
- buf_out = samplesref;
-
- return filter_samples(link, buf_out);
-}
-