Merge remote-tracking branch 'upstream/speaker-tracking'

hyades · Oct 15, 2013 · 7e7e751 · 7e7e751
2 parents 47ec618 + 2009f02
commit 7e7e751
Show file tree

Hide file tree

Showing 2 changed files with 179 additions and 77 deletions.
diff --git a/tools/gstswitchcapture.c b/tools/gstswitchcapture.c
@@ -71,6 +71,8 @@ G_DEFINE_TYPE (GstSwitchCaptureWorker, gst_switch_capture_worker,
 gboolean verbose = FALSE;
 const char *device = "/dev/ttyUSB0";
 const char *protocol = "visca";
+const char **srcsegments = NULL;
+int srcsegmentc = 0;
 
 static GOptionEntry options[] = {
   {"verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Be verbose", NULL},
@@ -119,7 +121,15 @@ gst_switch_capture_pipeline (GstWorker * worker, GstSwitchCapture * capture)
         "filesrc location=\"/home/duzy/Downloads/locked-mode-7010.dv\" ");
     g_string_append_printf (desc, "! dvdemux ! dvdec ");
   } else {
-    g_string_append_printf (desc, "v4l2src ! tee name=video ");
+    if (0 < srcsegmentc && srcsegments) {
+      int n = 0;
+      for (; n < srcsegmentc; ++n) {
+        g_string_append_printf (desc, "%s ", srcsegments[n]);
+      }
+    } else {
+      g_string_append_printf (desc, "v4l2src ");
+    }
+    g_string_append_printf (desc, "! tee name=video ");
   }
 
   g_string_append_printf (desc, "video. ! queue2 ");
@@ -459,6 +469,11 @@ main (int argc, char **argv)
   gst_switch_capture_parse_args (&argc, &argv);
   gst_init (&argc, &argv);
 
+  if (1 < argc) {
+    srcsegments = (const char **) (argv + 1);
+    srcsegmentc = argc - 1;
+  }
+
   capture = GST_SWITCH_CAPTURE (g_object_new (GST_TYPE_SWITCH_CAPTURE, NULL));
 
   gst_switch_capture_run (capture);