timvideos · Oct 6, 2013 · Oct 8, 2013 · Oct 8, 2013 · Oct 8, 2013 · Oct 10, 2013
Showing with 269 additions and 86 deletions.

+2 −0 autogen.example

+50 −7 configure.ac

+32 −0 m4/gst.m4

+16 −1 tools/gstswitchcapture.c

+169 −78 tools/gstswitchptz.c
diff --git a/autogen.example b/autogen.example
@@ -0,0 +1,2 @@
+export PKG_CONFIG_PATH=/home/duzy/gst/stage/lib/pkgconfig
+./autogen.sh --prefix=/home/duzy/gst/stage
diff --git a/configure.ac b/configure.ac
@@ -33,6 +33,17 @@ AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, [ ], [
   AC_MSG_ERROR([You need to have pkg-config installed!])
 ])
 
+#AG_GST_ARG_WITH_PKG_CONFIG_PATH
+
+#AG_GST_PKG_CONFIG_PATH
+
+#AC_ARG_WITH(pkg-config-path,
+#   AC_HELP_STRING([--with-pkg-config-path], [colon-separated list of pkg-config(1) dirs]),
+#   [
+#     export PKG_CONFIG_PATH=${withval}
+#     AC_MSG_NOTICE(Set PKG_CONFIG_PATH to $PKG_CONFIG_PATH)
+#   ])
+
 PKG_CHECK_MODULES(GIO, [
   gio-2.0 >= 2.25.0
 ], [
@@ -121,13 +132,45 @@ PKG_CHECK_MODULES(GST, [
   AC_SUBST(GST_CFLAGS)
   AC_SUBST(GST_LIBS)
 ], [
-  AC_MSG_ERROR([
-      You need to install or upgrade the GStreamer development
-      packages on your system. On debian-based systems these are
-      libgstreamer1.0-dev and libgstreamer-plugins-base1.0-dev.
-      on RPM-based systems gstreamer1.0-devel, libgstreamer1.0-devel
-      or similar. The minimum version required is $GST_REQUIRED.
-  ])
+   HAS_GSTREAMER=no
+   HAS_GSTREAMER_BASE=no
+   HAS_GSTREAMER_CONTROLLER=no
+   HAS_GSTREAMER_VIDEO=no
+   if $PKG_CONFIG --exists gstreamer-1.0 ; then
+      GST_CFLAGS="$GST_CFLAGS `$PKG_CONFIG --cflags gstreamer-1.0`"
+      GST_LIBS="$GST_LIBS `$PKG_CONFIG --libs gstreamer-1.0`"
+      HAS_GSTREAMER=yes
+   fi
+   if $PKG_CONFIG --exists gstreamer-base-1.0 ; then
+      GST_CFLAGS="$GST_CFLAGS `$PKG_CONFIG --cflags gstreamer-base-1.0`"
+      GST_LIBS="$GST_LIBS `$PKG_CONFIG --libs gstreamer-base-1.0`"
+      HAS_GSTREAMER_BASE=yes
+   fi
+   if $PKG_CONFIG --exists gstreamer-controller-1.0 ; then
+      GST_CFLAGS="$GST_CFLAGS `$PKG_CONFIG --cflags gstreamer-controller-1.0`"
+      GST_LIBS="$GST_LIBS `$PKG_CONFIG --libs gstreamer-controller-1.0`"
+      HAS_GSTREAMER_CONTROLLER=yes
+   fi
+   if $PKG_CONFIG --exists gstreamer-video-1.0 ; then
+      GST_CFLAGS="$GST_CFLAGS `$PKG_CONFIG --cflags gstreamer-video-1.0`"
+      GST_LIBS="$GST_LIBS `$PKG_CONFIG --libs gstreamer-video-1.0`"
+      HAS_GSTREAMER_VIDEO=yes
+   fi
+   echo "GST_CFLAGS: $GST_CFLAGS `$PKG_CONFIG --cflags gstreamer-1.0`"
+   echo "GST_LIBS: $GST_LIBS `$PKG_CONFIG --libs gstreamer-1.0`"
+   if test "x$HAS_GSTREAMER" = "xno" ||\
+      test "x$HAS_GSTREAMER_BASE" = "xno" ||\
+      test "x$HAS_GSTREAMER_CONTROLLER" = "xno" ||\
+      test "x$HAS_GSTREAMER_VIDEO" = "xno" \
+      ; then
+      AC_MSG_ERROR([
+        You need to install or upgrade the GStreamer development
+        packages on your system. On debian-based systems these are
+        libgstreamer1.0-dev and libgstreamer-plugins-base1.0-dev.
+        on RPM-based systems gstreamer1.0-devel, libgstreamer1.0-devel
+        or similar. The minimum version required is $GST_REQUIRED.
+      ])
+   fi
 ])
 
 dnl check if compiler understands -Wall (if yes, add -Wall to GST_CFLAGS)

diff --git a/m4/gst.m4 b/m4/gst.m4
@@ -0,0 +1,32 @@
+dnl AG_GST_PKG_CONFIG_PATH
+dnl
+dnl sets up a GST_PKG_CONFIG_PATH variable for use in Makefile.am
+dnl which contains the path of the in-tree pkgconfig directory first
+dnl and then any paths specified in PKG_CONFIG_PATH.
+dnl
+dnl We do this mostly so we don't have to use unportable shell constructs
+dnl such as ${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH} in Makefile.am to handle
+dnl the case where the environment variable is not set, but also in order
+dnl to avoid a trailing ':' in the PKG_CONFIG_PATH which apparently causes
+dnl problems with pkg-config on windows with msys/mingw.
+AC_DEFUN([AG_GST_PKG_CONFIG_PATH],
+[
+  GST_PKG_CONFIG_PATH="\$(top_builddir)/pkgconfig"
+  if test "x$PKG_CONFIG_PATH" != "x"; then
+    GST_PKG_CONFIG_PATH="$GST_PKG_CONFIG_PATH:$PKG_CONFIG_PATH"
+  fi
+  AC_SUBST([GST_PKG_CONFIG_PATH])
+  AC_MSG_NOTICE([Using GST_PKG_CONFIG_PATH = $GST_PKG_CONFIG_PATH])
+])
+
+AC_DEFUN([AG_GST_ARG_WITH_PKG_CONFIG_PATH],
+[
+  dnl possibly modify pkg-config path
+  AC_ARG_WITH(pkg-config-path,
+     AC_HELP_STRING([--with-pkg-config-path],
+                    [colon-separated list of pkg-config(1) dirs]),
+     [
+       export PKG_CONFIG_PATH=${withval}
+       AC_MSG_NOTICE(Set PKG_CONFIG_PATH to $PKG_CONFIG_PATH)
+     ])
+])
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);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export PKG_CONFIG_PATH=/home/duzy/gst/stage/lib/pkgconfig
		./autogen.sh --prefix=/home/duzy/gst/stage