v4l: open/close device in ready.

Simillar change like in v4l2src. This allows probing feature in paused, where
streaming is noit yet started.

diff --git a/sys/v4l/gstv4lelement.c b/sys/v4l/gstv4lelement.c
index 1bacb6433d7000828f82c4a45be1f490cb64a030..f536aaaabf4ea87957b90952f5a989411736e79e 100644 (file)
--- a/sys/v4l/gstv4lelement.c
+++ b/sys/v4l/gstv4lelement.c
@@ -54,15 +54,15 @@ static void gst_v4lelement_init_interfaces (GType type);
 GST_BOILERPLATE_FULL (GstV4lElement, gst_v4lelement, GstPushSrc,
     GST_TYPE_PUSH_SRC, gst_v4lelement_init_interfaces);
 
-
 static void gst_v4lelement_dispose (GObject * object);
 static void gst_v4lelement_set_property (GObject * object,
     guint prop_id, const GValue * value, GParamSpec * pspec);
 static void gst_v4lelement_get_property (GObject * object,
     guint prop_id, GValue * value, GParamSpec * pspec);
-static gboolean gst_v4lelement_start (GstBaseSrc * src);
-static gboolean gst_v4lelement_stop (GstBaseSrc * src);
 
+/* element methods */
+static GstStateChangeReturn gst_v4lelement_change_state (GstElement * element,
+    GstStateChange transition);
 
 static gboolean
 gst_v4l_iface_supported (GstImplementsInterface * iface, GType iface_type)
@@ -325,13 +325,16 @@ static void
 gst_v4lelement_class_init (GstV4lElementClass * klass)
 {
   GObjectClass *gobject_class;
-  GstBaseSrcClass *basesrc_class;
+  GstElementClass *element_class;
 
   gobject_class = (GObjectClass *) klass;
-  basesrc_class = (GstBaseSrcClass *) klass;
+  element_class = GST_ELEMENT_CLASS (klass);
 
   gobject_class->set_property = gst_v4lelement_set_property;
   gobject_class->get_property = gst_v4lelement_get_property;
+  gobject_class->dispose = gst_v4lelement_dispose;
+
+  element_class->change_state = gst_v4lelement_change_state;
 
   g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_DEVICE,
       g_param_spec_string ("device", "Device", "Device location",
@@ -344,10 +347,6 @@ gst_v4lelement_class_init (GstV4lElementClass * klass)
           GST_TYPE_V4L_DEVICE_FLAGS, 0,
           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
-  basesrc_class->start = gst_v4lelement_start;
-  basesrc_class->stop = gst_v4lelement_stop;
-
-  gobject_class->dispose = gst_v4lelement_dispose;
 }
 
 
@@ -440,32 +439,39 @@ gst_v4lelement_get_property (GObject * object,
   }
 }
 
-static gboolean
-gst_v4lelement_start (GstBaseSrc * src)
+static GstStateChangeReturn
+gst_v4lelement_change_state (GstElement * element, GstStateChange transition)
 {
-  GstV4lElement *v4lelement = GST_V4LELEMENT (src);
-
-  if (!gst_v4l_open (v4lelement))
-    return FALSE;
-
+  GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS;
+  GstV4lElement *v4lelement = GST_V4LELEMENT (element);
+
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
+      /* open the device */
+      if (!gst_v4l_open (v4lelement))
+        return GST_STATE_CHANGE_FAILURE;
 #ifdef HAVE_XVIDEO
-  gst_v4l_xoverlay_start (v4lelement);
+      gst_v4l_xoverlay_start (v4lelement);
 #endif
+      break;
+    default:
+      break;
+  }
 
-  return TRUE;
-}
-
-static gboolean
-gst_v4lelement_stop (GstBaseSrc * src)
-{
-  GstV4lElement *v4lelement = GST_V4LELEMENT (src);
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
+  switch (transition) {
+    case GST_STATE_CHANGE_READY_TO_NULL:
+      /* close the device */
 #ifdef HAVE_XVIDEO
-  gst_v4l_xoverlay_stop (v4lelement);
+      gst_v4l_xoverlay_stop (v4lelement);
 #endif
+      if (!gst_v4l_close (v4lelement))
+        return GST_STATE_CHANGE_FAILURE;
+      break;
+    default:
+      break;
+  }
 
-  if (!gst_v4l_close (v4lelement))
-    return FALSE;
-
-  return TRUE;
+  return ret;
 }

diff --git a/sys/v4l/gstv4lsrc.c b/sys/v4l/gstv4lsrc.c
index 0bba38bb57d5ecf39c3fab5e1fe0a995628006b8..8ca34c41c12dcafa54b832c0107f240f9858c7ea 100644 (file)
--- a/sys/v4l/gstv4lsrc.c
+++ b/sys/v4l/gstv4lsrc.c
@@ -676,9 +676,6 @@ gst_v4lsrc_start (GstBaseSrc * src)
 {
   GstV4lSrc *v4lsrc = GST_V4LSRC (src);
 
-  if (!GST_BASE_SRC_CLASS (parent_class)->start (src))
-    return FALSE;
-
   v4lsrc->offset = 0;
 
   return TRUE;
@@ -697,9 +694,6 @@ gst_v4lsrc_stop (GstBaseSrc * src)
       return FALSE;
   }
 
-  if (!GST_BASE_SRC_CLASS (parent_class)->stop (src))
-    return FALSE;
-
   g_list_free (v4lsrc->colorspaces);
   v4lsrc->colorspaces = NULL;