Revert "v4l2: free kernel buffers before allocating new ones"
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 26 Jun 2012 11:02:13 +0000 (13:02 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 26 Jun 2012 11:02:13 +0000 (13:02 +0200)
This reverts commit 1b09bc609a578e731f0dbc8f6e698e25d8f4c5f8.

Seems to make libv4l2 complain, maybe because we call REQBUFS with 0 buffers
before we allocated buffers.

sys/v4l2/gstv4l2bufferpool.c

index 65d1a5c..0679ea3 100644 (file)
@@ -305,17 +305,6 @@ gst_v4l2_buffer_pool_set_config (GstBufferPool * bpool, GstStructure * config)
       else
         num_buffers = max_buffers;
 
-      /* Free the buffers from the kernel */
-      GST_DEBUG_OBJECT (pool, "Freeing the buffers from the kernel");
-
-      memset (&breq, 0, sizeof (struct v4l2_requestbuffers));
-      breq.type = obj->type;
-      breq.count = 0;
-      breq.memory = V4L2_MEMORY_MMAP;
-
-      if (v4l2_ioctl (pool->video_fd, VIDIOC_REQBUFS, &breq) < 0)
-        goto reqbufs_failed;
-
       /* first, lets request buffers, and see how many we can get: */
       GST_DEBUG_OBJECT (pool, "starting, requesting %d MMAP buffers",
           num_buffers);