summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2012-04-28 00:16:20 +0200
committerNicolas George <nicolas.george@normalesup.org>2012-05-03 19:55:28 +0200
commitf8d58c594d23433fd59ba40b6f76091adbca9a88 (patch)
tree2df584e81e5d15334ecd5f8d1e194ea7e516b32f
parentbe8edff8d10104207062a332bb50973271e5fd00 (diff)
downloadffmpeg-streaming-f8d58c594d23433fd59ba40b6f76091adbca9a88.zip
ffmpeg-streaming-f8d58c594d23433fd59ba40b6f76091adbca9a88.tar.gz
src_buffer: merge av_asrc_buffer_add_audio_buffer_ref.
Implement it using av_buffersrc_add_ref.
-rw-r--r--libavfilter/src_buffer.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/libavfilter/src_buffer.c b/libavfilter/src_buffer.c
index 4c994c8..70af9c3 100644
--- a/libavfilter/src_buffer.c
+++ b/libavfilter/src_buffer.c
@@ -570,27 +570,7 @@ int av_asrc_buffer_add_audio_buffer_ref(AVFilterContext *ctx,
AVFilterBufferRef *samplesref,
int av_unused flags)
{
- BufferSourceContext *abuffer = ctx->priv;
- int ret;
-
- if (av_fifo_space(abuffer->fifo) < sizeof(samplesref)) {
- av_log(ctx, AV_LOG_ERROR,
- "Buffering limit reached. Please consume some available frames "
- "before adding new ones.\n");
- return AVERROR(EINVAL);
- }
-
- ret = check_format_change(ctx, samplesref);
- if (ret < 0)
- return ret;
-
- if (sizeof(samplesref) != av_fifo_generic_write(abuffer->fifo, &samplesref,
- sizeof(samplesref), NULL)) {
- av_log(ctx, AV_LOG_ERROR, "Error while writing to FIFO\n");
- return AVERROR(EINVAL);
- }
-
- return 0;
+ return av_buffersrc_add_ref(ctx, samplesref, AV_BUFFERSRC_FLAG_NO_COPY);
}
int av_asrc_buffer_add_samples(AVFilterContext *ctx,
OpenPOWER on IntegriCloud