dual-stream: build framework for second pad of video src

Change-Id: Ib1f7a0f23db96e6fd1e4a65e9ee083a2224a42b4

diff --git a/gst/mfldv4l2cam/gstv4l2camsrc.c b/gst/mfldv4l2cam/gstv4l2camsrc.c
index d4912ac..eff1b2b 100644 (file)
--- a/gst/mfldv4l2cam/gstv4l2camsrc.c
+++ b/gst/mfldv4l2cam/gstv4l2camsrc.c
@@ -130,31 +130,36 @@ typedef enum
   PROP_DRAW_CORNER_MARKERS,
 } GstV4L2CamSrcProperties;
 
-
-static GstStaticPadTemplate gst_v4l2camsrc_template =
-  GST_STATIC_PAD_TEMPLATE ("src",
-  GST_PAD_SRC,
-  GST_PAD_ALWAYS,
-  GST_STATIC_CAPS ("video/x-raw-yuv, "
-    "format = (fourcc) NV12, "
-    "framerate = (fraction) [ 0, 200 ], "
-    "width = (int) [ 1, MAX ], "
-    "height = (int) [ 1, MAX ];"
-    "video/x-raw-yuv, "
-    "format = (fourcc) I420, "
-    "framerate = (fraction) [ 0, 200 ], "
-    "width = (int) [ 1, MAX ], "
-    "height = (int) [ 1, MAX ];"
-    "video/x-raw-bayer, "
-    "format = (fourcc) BA10, "
-    "framerate = (fraction) [ 0, 200 ], "
-    "width = (int) [ 1, MAX ], "
-    "height = (int) [ 1, MAX ];"
-    "video/x-vaapi-sharing, "
-    "type = vaapi, "
-    "width  = (int) [ 1, MAX ], "
-    "height = (int) [ 1, MAX ], "
-    "framerate = (fraction) [ 0, MAX ]"));
+#define GST_V4L2_CAMSRC_PAD_TEMPLATE(padname)    \
+  GST_STATIC_PAD_TEMPLATE (padname,              \
+  GST_PAD_SRC,                                   \
+  GST_PAD_ALWAYS,                                \
+  GST_STATIC_CAPS ("video/x-raw-yuv, "           \
+    "format = (fourcc) NV12, "                   \
+    "framerate = (fraction) [ 0, 200 ], "        \
+    "width = (int) [ 1, MAX ], "                 \
+    "height = (int) [ 1, MAX ];"                 \
+    "video/x-raw-yuv, "                          \
+    "format = (fourcc) I420, "                   \
+    "framerate = (fraction) [ 0, 200 ], "        \
+    "width = (int) [ 1, MAX ], "                 \
+    "height = (int) [ 1, MAX ];"                 \
+    "video/x-raw-bayer, "                        \
+    "format = (fourcc) BA10, "                   \
+    "framerate = (fraction) [ 0, 200 ], "        \
+    "width = (int) [ 1, MAX ], "                 \
+    "height = (int) [ 1, MAX ];"                 \
+    "video/x-vaapi-sharing, "                    \
+    "type = vaapi, "                             \
+    "width  = (int) [ 1, MAX ], "                \
+    "height = (int) [ 1, MAX ], "                \
+    "framerate = (fraction) [ 0, MAX ]"))
+
+static GstStaticPadTemplate gst_v4l2camsrc_src_template =
+    GST_V4L2_CAMSRC_PAD_TEMPLATE("src");
+
+static GstStaticPadTemplate gst_v4l2camsrc_second_template =
+    GST_V4L2_CAMSRC_PAD_TEMPLATE("second");
 
 #define DEFAULT_PROP_DEVICE_NAME  NULL
 #define DEFAULT_PROP_DEVICE       "/dev/video0"
@@ -715,7 +720,9 @@ gst_v4l2camsrc_base_init (gpointer klass)
       "Maemo Multimedia <multimedia@maemo.org>");
 
   gst_element_class_add_pad_template (element_class,
-       gst_static_pad_template_get (&gst_v4l2camsrc_template));
+       gst_static_pad_template_get (&gst_v4l2camsrc_src_template));
+  gst_element_class_add_pad_template (element_class,
+       gst_static_pad_template_get (&gst_v4l2camsrc_second_template));
 }
 
 gboolean gst_v4l2camsrc_set_autofocus (GstCameraSrc * camsrc, gboolean on);
@@ -738,6 +745,13 @@ gst_v4l2camsrc_set_strobe_state (GstCameraSrc *camsrc, gboolean state);
 gboolean 
 gst_v4l2camsrc_set_AeAafwindow (GstCameraSrc * camsrc, GstCameraSrc3a_window window);
 
+static gboolean
+gst_v4l2camsrc_is_second_open(GstCameraSrc *base)
+{
+  GstMFLDV4l2CamSrc *v4l2camsrc = GST_V4L2CAMSRC_CAST (base);
+  return GST_V4L2CAMSRC_IS_SECOND_OPEN(v4l2camsrc);
+}
+
 /*
  * gst_v4l2camsrc_class_init:
  * @klass: #GstMFLDV4l2CamSrcClass.
@@ -968,6 +982,19 @@ gst_v4l2camsrc_class_init (GstMFLDV4l2CamSrcClass * klass)
   camera_class->unlock = GST_DEBUG_FUNCPTR (gst_v4l2camsrc_unlock);
   camera_class->unlock_stop = GST_DEBUG_FUNCPTR (gst_v4l2camsrc_unlock_stop);
 
+  /* second stream */
+  //camera_class->get_second_caps = GST_DEBUG_FUNCPTR(gst_v4l2camsrc_get_second_caps);
+  camera_class->open_second = GST_DEBUG_FUNCPTR(gst_v4l2camsrc_open_second);
+  camera_class->is_second_open = GST_DEBUG_FUNCPTR(gst_v4l2camsrc_is_second_open);
+  camera_class->close_second = GST_DEBUG_FUNCPTR(gst_v4l2camsrc_close_second);
+  camera_class->set_second_capture_mode =
+      GST_DEBUG_FUNCPTR(gst_v4l2camsrc_set_second_capture_mode);
+  camera_class->set_second_capture =
+      GST_DEBUG_FUNCPTR(gst_v4l2camsrc_set_second_capture);
+  camera_class->start_second = GST_DEBUG_FUNCPTR(gst_v4l2camsrc_start_second);
+  camera_class->create_second_buffer =
+      GST_DEBUG_FUNCPTR(gst_v4l2camsrc_create_second_buffer);
+
   camera_class->set_capture_mode =
       GST_DEBUG_FUNCPTR (gst_v4l2camsrc_set_capture_mode);
 //  camera_class->set_vfinder_mode = GST_DEBUG_FUNCPTR(gst_v4l2camsrc_set_viewfinder_mode);
@@ -1125,6 +1152,13 @@ gst_v4l2camsrc_init (GstMFLDV4l2CamSrc * v4l2camsrc,
   v4l2camsrc->af_window.y_top = 0;
   v4l2camsrc->af_window.weight= 0x8000;
 
+  /* second stream */
+  v4l2camsrc->second_video_fd = -1;
+  v4l2camsrc->second_frame_byte_size = 0;
+  v4l2camsrc->second_poll = gst_poll_new (TRUE);
+  v4l2camsrc->second_num_buffers = 4;
+  v4l2camsrc->second_pool = NULL;
+
   libmfld_cam_init (v4l2camsrc->mfldadvci);
 
   GST_DEBUG ("initialized to commit %s", MFLD_V4L2CAMSRC_VERSION);
@@ -1167,6 +1201,10 @@ gst_v4l2camsrc_dispose (GObject * object)
     gst_poll_free (v4l2camsrc->poll);
   }
 
+  if (v4l2camsrc->second_poll) {
+    gst_poll_free (v4l2camsrc->second_poll);
+  }
+
   g_mutex_free (v4l2camsrc->device_mutex);
 
   G_OBJECT_CLASS (parent_class)->dispose (object);

diff --git a/gst/mfldv4l2cam/gstv4l2camsrc.h b/gst/mfldv4l2cam/gstv4l2camsrc.h
index b09f1fa..8144d1a 100644 (file)
--- a/gst/mfldv4l2cam/gstv4l2camsrc.h
+++ b/gst/mfldv4l2cam/gstv4l2camsrc.h
@@ -44,6 +44,8 @@ G_BEGIN_DECLS
 #define GST_IS_V4L2CAMSRC_CLASS(klass) \
 (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_V4L2CAMSRC))
 
+#define GST_V4L2CAMSRC_CAST(obj)  ((GstMFLDV4l2CamSrc*)obj)
+
 #define MAX_RESIZER_FACTOR     10.0
 #define DEFAULT_RESIZER_FACTOR 1.0
 
@@ -207,6 +209,7 @@ struct _GstMFLDV4l2CamSrcBufferPool
   GMutex *lock;
   gboolean running;          /* with lock */
   gint num_live_buffers;     /* number of buffers not with driver */
+  guint frame_byte_size;
   guint buffer_count;
   GstV4l2Buffer **buffers;
 
@@ -309,6 +312,13 @@ struct _GstMFLDV4l2CamSrc {
   gboolean draw_corner_markers;
 
   GSList *caps_cache;
+
+  /* second stream */
+  guint     second_video_fd;
+  guint     second_frame_byte_size;
+  GstPoll  *second_poll;
+  guint32   second_num_buffers;
+  GstMFLDV4l2CamSrcBufferPool *second_pool;
 };