From: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
Date: Fri, 11 Jul 2014 17:35:10 +0000 (-0400)
Subject: v4l2bufferpool: Fix copy threshold implementation
X-Git-Tag: 1.19.3~509^2~4286
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7876e55970be79854988133c5d44ff40f962a8b;p=platform%2Fupstream%2Fgstreamer.git

v4l2bufferpool: Fix copy threshold implementation

We cannot allocate new buffer in acquire, otherwise the base class
is not aware and get confused. Instead, copy in _process(). This leads
to crash on finalize.

Fixes regression, see https://bugzilla.gnome.org/show_bug.cgi?id=732912
---

diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
index 488ade7..c63f738 100644
--- a/sys/v4l2/gstv4l2bufferpool.c
+++ b/sys/v4l2/gstv4l2bufferpool.c
@@ -1171,27 +1171,6 @@ gst_v4l2_buffer_pool_acquire_buffer (GstBufferPool * bpool, GstBuffer ** buffer,
           ret = gst_v4l2_buffer_pool_dqbuf (pool, buffer);
           if (G_UNLIKELY (ret != GST_FLOW_OK))
             goto done;
-
-          /* start copying buffers when we are running low on buffers */
-          if (g_atomic_int_get (&pool->num_queued) < pool->copy_threshold) {
-            GstBuffer *copy;
-
-            if (GST_V4L2_ALLOCATOR_CAN_ALLOCATE (pool->vallocator, MMAP)) {
-              if (pclass->acquire_buffer (bpool, &copy, params) == GST_FLOW_OK) {
-                gst_v4l2_buffer_pool_release_buffer (bpool, copy);
-                break;
-              }
-            }
-
-            /* copy the buffer */
-            copy = gst_buffer_copy_region (*buffer,
-                GST_BUFFER_COPY_ALL | GST_BUFFER_COPY_DEEP, 0, -1);
-            GST_LOG_OBJECT (pool, "copy buffer %p->%p", *buffer, copy);
-
-            /* and requeue so that we can continue capturing */
-            gst_v4l2_buffer_pool_release_buffer (bpool, *buffer);
-            *buffer = copy;
-          }
           break;
         }
         case GST_V4L2_IO_USERPTR:
@@ -1580,9 +1559,32 @@ gst_v4l2_buffer_pool_process (GstV4l2BufferPool * pool, GstBuffer ** buf)
           if ((*buf)->pool == bpool) {
             if (gst_buffer_get_size (*buf) == 0)
               goto eos;
-            else
-              /* nothing, data was inside the buffer when we did _acquire() */
-              goto done;
+
+            /* start copying buffers when we are running low on buffers */
+            if (g_atomic_int_get (&pool->num_queued) < pool->copy_threshold) {
+              GstBuffer *copy;
+
+              if (GST_V4L2_ALLOCATOR_CAN_ALLOCATE (pool->vallocator, MMAP)) {
+
+                if (gst_buffer_pool_acquire_buffer (bpool, &copy,
+                        NULL) == GST_FLOW_OK) {
+                  gst_v4l2_buffer_pool_release_buffer (bpool, copy);
+                  goto done;
+                }
+              }
+
+              /* copy the buffer */
+              copy = gst_buffer_copy_region (*buf,
+                  GST_BUFFER_COPY_ALL | GST_BUFFER_COPY_DEEP, 0, -1);
+              GST_LOG_OBJECT (pool, "copy buffer %p->%p", *buf, copy);
+
+              /* and requeue so that we can continue capturing */
+              gst_buffer_unref (*buf);
+              *buf = copy;
+            }
+
+            /* nothing, data was inside the buffer when we did _acquire() */
+            goto done;
           }
 
           /* buffer not from our pool, grab a frame and copy it into the target */