From 39716c02a7bc0c8f0c19cd606b671b70d610caae Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Mon, 18 Jul 2011 10:52:23 +0200
Subject: [PATCH] v4l2: add IO method enum

---
 sys/v4l2/gstv4l2object.c | 72 +++++++++++++++++++++++++++---------------------
 sys/v4l2/gstv4l2object.h |  8 +++++-
 2 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c
index 43b387e..65cbcd3 100644
--- a/sys/v4l2/gstv4l2object.c
+++ b/sys/v4l2/gstv4l2object.c
@@ -2062,16 +2062,17 @@ gst_v4l2_object_setup_pool (GstV4l2Object * v4l2object, GstCaps * caps)
     if (!(v4l2object->pool = gst_v4l2_buffer_pool_new (v4l2object)))
       goto buffer_pool_new_failed;
 
-    GST_INFO_OBJECT (v4l2object->element, "capturing buffers via mmap()");
-    v4l2object->use_mmap = TRUE;
+    GST_INFO_OBJECT (v4l2object->element, "accessing buffers via mmap()");
+    v4l2object->mode = GST_V4L2_IO_MMAP;
 
     config = gst_buffer_pool_get_config (v4l2object->pool);
     gst_buffer_pool_config_set (config, caps, v4l2object->info.size,
         num_buffers, num_buffers, 0, 0);
     gst_buffer_pool_set_config (v4l2object->pool, config);
   } else if (v4l2object->vcap.capabilities & V4L2_CAP_READWRITE) {
-    GST_INFO_OBJECT (v4l2object->element, "capturing buffers via read()");
-    v4l2object->use_mmap = FALSE;
+    GST_INFO_OBJECT (v4l2object->element,
+        "accessing buffers via read()/write()");
+    v4l2object->mode = GST_V4L2_IO_RW;
     v4l2object->pool = NULL;
   } else {
     goto no_supported_capture_method;
@@ -2344,23 +2345,22 @@ gst_v4l2_object_start (GstV4l2Object * v4l2object)
     if (!gst_buffer_pool_set_active (v4l2object->pool, TRUE))
       goto activate_failed;
 
-  if (v4l2object->use_mmap) {
-    switch (v4l2object->type) {
-      case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-        break;
-      case V4L2_BUF_TYPE_VIDEO_OUTPUT:
-        /* for output, we assume we already queued a buffer */
-        break;
-      default:
-        break;
-    }
-    if (!v4l2object->streaming) {
-      GST_DEBUG_OBJECT (v4l2object->element, "STREAMON");
-      if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_STREAMON,
-              &(v4l2object->type)) < 0)
-        goto start_failed;
-      v4l2object->streaming = TRUE;
-    }
+  switch (v4l2object->mode) {
+    case GST_V4L2_IO_RW:
+      break;
+    case GST_V4L2_IO_MMAP:
+    case GST_V4L2_IO_USERPTR:
+      if (!v4l2object->streaming) {
+        GST_DEBUG_OBJECT (v4l2object->element, "STREAMON");
+        if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_STREAMON,
+                &(v4l2object->type)) < 0)
+          goto start_failed;
+        v4l2object->streaming = TRUE;
+      }
+      break;
+    default:
+      g_assert_not_reached ();
+      break;
   }
   return TRUE;
 
@@ -2390,17 +2390,25 @@ gst_v4l2_object_stop (GstV4l2Object * v4l2object)
   if (!GST_V4L2_IS_ACTIVE (v4l2object))
     goto done;
 
-  if (v4l2object->use_mmap) {
-    if (v4l2object->streaming) {
-      /* we actually need to sync on all queued buffers but not
-       * on the non-queued ones */
-      GST_DEBUG_OBJECT (v4l2object->element, "STREAMOFF");
-      if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_STREAMOFF,
-              &(v4l2object->type)) < 0)
-        goto stop_failed;
+  switch (v4l2object->mode) {
+    case GST_V4L2_IO_RW:
+      break;
+    case GST_V4L2_IO_MMAP:
+    case GST_V4L2_IO_USERPTR:
+      if (v4l2object->streaming) {
+        /* we actually need to sync on all queued buffers but not
+         * on the non-queued ones */
+        GST_DEBUG_OBJECT (v4l2object->element, "STREAMOFF");
+        if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_STREAMOFF,
+                &(v4l2object->type)) < 0)
+          goto stop_failed;
 
-      v4l2object->streaming = FALSE;
-    }
+        v4l2object->streaming = FALSE;
+      }
+      break;
+    default:
+      g_assert_not_reached ();
+      break;
   }
 
   if (v4l2object->pool) {
@@ -2639,7 +2647,7 @@ gst_v4l2_object_get_buffer (GstV4l2Object * v4l2object, GstBuffer ** buf)
 
   switch (v4l2object->type) {
     case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-      if (v4l2object->use_mmap) {
+      if (v4l2object->mode == GST_V4L2_IO_MMAP) {
         ret = gst_v4l2_object_get_mmap (v4l2object, buf);
       } else {
         ret = gst_v4l2_object_get_read (v4l2object, buf);
diff --git a/sys/v4l2/gstv4l2object.h b/sys/v4l2/gstv4l2object.h
index b24990d..03e8382 100644
--- a/sys/v4l2/gstv4l2object.h
+++ b/sys/v4l2/gstv4l2object.h
@@ -71,6 +71,12 @@ G_BEGIN_DECLS
 
 #define GST_V4L2_OBJECT(obj) (GstV4l2Object *)(obj)
 
+typedef enum {
+  GST_V4L2_IO_NONE    = 0,
+  GST_V4L2_IO_RW      = 1,
+  GST_V4L2_IO_MMAP    = 2,
+  GST_V4L2_IO_USERPTR = 3
+} GstV4l2IOMode;
 
 typedef gboolean  (*GstV4l2GetInOutFunction)  (GstV4l2Object * v4l2object, gint * input);
 typedef gboolean  (*GstV4l2SetInOutFunction)  (GstV4l2Object * v4l2object, gint input);
@@ -100,6 +106,7 @@ struct _GstV4l2Object {
 
   /* the video-device's file descriptor */
   gint video_fd;
+  GstV4l2IOMode mode;
   GstPoll * poll;
   gboolean can_poll_device;
 
@@ -118,7 +125,6 @@ struct _GstV4l2Object {
   guint32 num_buffers;
   guint32 min_queued_bufs;
   gboolean always_copy;
-  gboolean use_mmap;
   GstBufferPool *pool;
 
   /* the video device's capabilities */
-- 
2.7.4