From 085f87d85f83659b86e4ab880e389fa934f03962 Mon Sep 17 00:00:00 2001
From: Elaine Xiong <Elaine.Xiong@Sun.COM>
Date: Fri, 17 Jul 2009 13:22:57 +0100
Subject: [PATCH] v4l2: Fix v4l2src on OpenSolaris

The v4l2 driver for USB webcams on OpenSolaris does not support select()
calls. Detect when select() fails, and skip polling the device afterward,
which restores the pre 0.10.14 behaviour on OpenSolaris.

Signed-off-by: Jan Schmidt <thaytan@noraisin.net>
---
 sys/v4l2/gstv4l2object.h |  1 +
 sys/v4l2/gstv4l2src.c    | 10 ++++++++--
 sys/v4l2/v4l2_calls.c    |  2 ++
 sys/v4l2/v4l2src_calls.c | 20 ++++++++++++++------
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/sys/v4l2/gstv4l2object.h b/sys/v4l2/gstv4l2object.h
index c5bc3cb77d5..88d4eeeb6e1 100644
--- a/sys/v4l2/gstv4l2object.h
+++ b/sys/v4l2/gstv4l2object.h
@@ -72,6 +72,7 @@ struct _GstV4l2Object {
   /* the video-device's file descriptor */
   gint video_fd;
   GstPoll * poll;
+  gboolean can_poll_device;
 
   /* the video buffer (mmap()'ed) */
   guint8 **buffer;
diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index 9ebe101fb5e..329ced5a225 100644
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -1248,8 +1248,14 @@ gst_v4l2src_get_read (GstV4l2Src * v4l2src, GstBuffer ** buf)
     if (G_UNLIKELY (ret < 0)) {
       if (errno == EBUSY)
         goto stopped;
-      if (errno != EAGAIN && errno != EINTR)
-        goto select_error;
+      if (errno == ENXIO) {
+        GST_DEBUG_OBJECT (v4l2src,
+            "v4l2 device doesn't support polling. Disabling");
+        v4l2src->v4l2object->can_poll_device = FALSE;
+      } else {
+        if (errno != EAGAIN && errno != EINTR)
+          goto select_error;
+      }
     }
     amount =
         v4l2_read (v4l2src->v4l2object->video_fd, GST_BUFFER_DATA (*buf),
diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c
index f8a7d295549..4fb1fad86ee 100644
--- a/sys/v4l2/v4l2_calls.c
+++ b/sys/v4l2/v4l2_calls.c
@@ -442,6 +442,8 @@ gst_v4l2_open (GstV4l2Object * v4l2object)
   if (libv4l2_fd != -1)
     v4l2object->video_fd = libv4l2_fd;
 
+  v4l2object->can_poll_device = TRUE;
+
   /* get capabilities, error will be posted */
   if (!gst_v4l2_get_capabilities (v4l2object))
     goto error;
diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c
index 30556af4d64..3dd6e0e65cd 100644
--- a/sys/v4l2/v4l2src_calls.c
+++ b/sys/v4l2/v4l2src_calls.c
@@ -999,12 +999,20 @@ gst_v4l2src_grab_frame (GstV4l2Src * v4l2src, GstBuffer ** buf)
   buffer.memory = V4L2_MEMORY_MMAP;
 
   for (;;) {
-    ret = gst_poll_wait (v4l2src->v4l2object->poll, GST_CLOCK_TIME_NONE);
-    if (G_UNLIKELY (ret < 0)) {
-      if (errno == EBUSY)
-        goto stopped;
-      if (errno != EAGAIN && errno != EINTR)
-        goto select_error;
+    if (v4l2src->v4l2object->can_poll_device) {
+      ret = gst_poll_wait (v4l2src->v4l2object->poll, GST_CLOCK_TIME_NONE);
+      if (G_UNLIKELY (ret < 0)) {
+        if (errno == EBUSY)
+          goto stopped;
+        if (errno == ENXIO) {
+          GST_DEBUG_OBJECT (v4l2src,
+              "v4l2 device doesn't support polling. Disabling");
+          v4l2src->v4l2object->can_poll_device = FALSE;
+        } else {
+          if (errno != EAGAIN && errno != EINTR)
+            goto select_error;
+        }
+      }
     }
 
     if (v4l2_ioctl (v4l2src->v4l2object->video_fd, VIDIOC_DQBUF, &buffer) >= 0)