vsrc_buffer: allow using a NULL buffer to signal EOF.

Anton Khirnov committed 14 years ago

Commit 7ae7c411 parent 9206ac82 files · +20 −1Browse files

Unified · Split

2 files

@@ -32,6 +32,7 @@ · 31 unmodified lines
32	*	32	*
33	* @param buf buffer containing frame data to be passed down the filtergraph.	33	* @param buf buffer containing frame data to be passed down the filtergraph.
34	* This function will take ownership of buf, the user must not free it.	34	* This function will take ownership of buf, the user must not free it.
		35	* A NULL buf signals EOF -- i.e. no more frames will be sent to this filter.
35	*/	36	*/
36	int av_buffersrc_buffer(AVFilterContext s, AVFilterBufferRef buf);	37	int av_buffersrc_buffer(AVFilterContext s, AVFilterBufferRef buf);
37		38

     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)\
     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)
     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)
     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);
 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 = {

Keyboard shortcuts