From 7ae7c41413beb601714a06b4fd18cdb4610b2eda Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 1 Apr 2012 18:53:58 +0200 Subject: vsrc_buffer: allow using a NULL buffer to signal EOF. --- libavfilter/vsrc_buffer.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'libavfilter/vsrc_buffer.c') diff --git a/libavfilter/vsrc_buffer.c b/libavfilter/vsrc_buffer.c index dfe5bf5..46a18df 100644 --- a/libavfilter/vsrc_buffer.c +++ b/libavfilter/vsrc_buffer.c @@ -35,6 +35,7 @@ typedef struct { enum PixelFormat pix_fmt; AVRational time_base; ///< time_base to set in the output link AVRational pixel_aspect; + int eof; } BufferSourceContext; #define CHECK_PARAM_CHANGE(s, c, width, height, format)\ @@ -50,6 +51,12 @@ int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, AVFilterBufferRef *buf; int ret; + if (!buf) { + c->eof = 1; + return 0; + } else if (c->eof) + return AVERROR(EINVAL); + if (!av_fifo_space(c->fifo) && (ret = av_fifo_realloc2(c->fifo, av_fifo_size(c->fifo) + sizeof(buf))) < 0) @@ -79,6 +86,12 @@ int av_buffersrc_buffer(AVFilterContext *s, AVFilterBufferRef *buf) BufferSourceContext *c = s->priv; int ret; + if (!buf) { + c->eof = 1; + return 0; + } else if (c->eof) + return AVERROR(EINVAL); + if (!av_fifo_space(c->fifo) && (ret = av_fifo_realloc2(c->fifo, av_fifo_size(c->fifo) + sizeof(buf))) < 0) @@ -160,6 +173,8 @@ static int request_frame(AVFilterLink *link) AVFilterBufferRef *buf; if (!av_fifo_size(c->fifo)) { + if (c->eof) + return AVERROR_EOF; av_log(link->src, AV_LOG_ERROR, "request_frame() called with no available frame!\n"); return AVERROR(EINVAL); @@ -177,7 +192,10 @@ static int request_frame(AVFilterLink *link) static int poll_frame(AVFilterLink *link) { BufferSourceContext *c = link->src->priv; - return !!av_fifo_size(c->fifo); + int size = av_fifo_size(c->fifo); + if (!size && c->eof) + return AVERROR_EOF; + return size/sizeof(AVFilterBufferRef*); } AVFilter avfilter_vsrc_buffer = { -- cgit v1.1