Merge lp:~laney/ubiquity/webcam-gst-1.0 into lp:ubiquity

[Iain Lane]

Apparently I forgot to raise an MP for this when I originally did the work!

This branch switches Ubiquity to using GStreamer 1.0 for the webcam page.

I'm afraid I wasn't (yet) able to test this, due to hardware failures. Help on that front would be appreciated. :-)

[Dimitri John Ledkov (xnox)]

/usr/lib/python3/dist-packages/gi/types.py:113: Warning: g_object_set_valist: object class `GstVideoTestSrc' has no property named `peer-alloc'
  return info.invoke(*args, **kwargs)

But could be harmless.

[Iain Lane (laney)]

On Mon, Jan 14, 2013 at 05:23:20PM -0000, Dmitrijs Ledkovs wrote:
> /usr/lib/python3/dist-packages/gi/types.py:113: Warning: g_object_set_valist: object class `GstVideoTestSrc' has no property named `peer-alloc'
> return info.invoke(*args, **kwargs)
>
> But could be harmless.

Cheers - I think you can remove this now as pad-alloc has gone away.

  http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=8722bdc694d70cb92fb69a969cf95a568439a234
  http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=290605451abfe083505032cbe0a9b48a308dc2e4

But it's still in the documentation. That's probably a bug.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[lp:~laney/ubiquity/webcam-gst-1.0]

5775. By Iain Lane on 2013-01-16

webcam.c: Don't set peer-alloc any more; it doesn't exist.

=== modified file 'configure.ac'
--- configure.ac	2012-10-19 14:27:05 +0000
+++ configure.ac	2013-01-16 13:46:22 +0000
@@ -29,8 +29,8 @@
 if test "x$UBIQUITY_NO_GTK" = x; then
   PKG_CHECK_MODULES(WEBCAM, [gtk+-3.0 >= $GTK3_REQUIRED
 			  gio-2.0 >= $GIO_REQUIRED
-			  gstreamer-0.10
-			  gstreamer-interfaces-0.10
+			  gstreamer-1.0
+			  gstreamer-video-1.0
 			  gudev-1.0])
   AC_SUBST(WEBCAM_CFLAGS)
   AC_SUBST(WEBCAM_LIBS)

=== modified file 'd-i/update-control'
--- d-i/update-control	2012-12-05 13:28:32 +0000
+++ d-i/update-control	2013-01-16 13:46:22 +0000
@@ -45,7 +45,8 @@
     'keymapper (>= 0.5.3-7)',
     'libgirepository1.0-dev',
     'libglib2.0-dev',
-    'libgstreamer-plugins-base0.10-dev (>= 0.10.23)',
+    'libgstreamer1.0-dev',
+    'libgstreamer-plugins-base1.0-dev',
     'libgtk-3-dev',
     'libgudev-1.0-dev',
     'libindicator3-dev',

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-12 00:47:22 +0000
+++ debian/changelog	2013-01-16 13:46:22 +0000
@@ -1,5 +1,6 @@
 ubiquity (2.13.10) UNRELEASED; urgency=low
 
+  [ Colin Watson ]
   * Only force mirror/country to the value of debian-installer/country if it
     is empty or has not been preseeded (LP: #732221).
   * For automatic installs, set debian-installer/country to a country
@@ -9,6 +10,9 @@
     on first boot (LP: #1098299).
   * Update translations from Launchpad (LP: #1096923).
 
+  [ Iain Lane ]
+  * Port the webcam support to GStreamer 1.0.
+
  -- Colin Watson <[e-mail]>  Fri, 11 Jan 2013 17:17:27 +0000
 
 ubiquity (2.13.9) raring; urgency=low
@@ -89,9 +93,9 @@
 
   [ Dmitrijs Ledkovs ]
   * Clear "Read release notes or update the installer" if neither action
-    are possible. (LP: #1066302)
-  * If there is only one disk & use_device recipe is used, change next step
-    button to "Install Now". (LP: #1050044)
+  * Automatic update of included source packages: base-installer
+    1.122ubuntu14, debian-installer-utils 1.91ubuntu6, flash-kernel
+    3.0~rc.4ubuntu28.
   * When auto-partitioning is not possible, allow to manually partition
     the same drive installation medium is on. (LP: #1053030)
   * Fix the question_dialog height-for-width (LP: #862270)

=== modified file 'debian/control'
--- debian/control	2012-12-05 13:28:32 +0000
+++ debian/control	2013-01-16 13:46:22 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Installer Team <[e-mail]>
 Uploaders: Colin Watson <[e-mail]>, Evan Dandrea <[e-mail]>
-Build-Depends: apt, autopoint, bf-utf-source, dctrl-tools, debconf (>= 1.5.43), debconf-utils, debhelper (>= 9), devio, dh-autoreconf, dh-di (>= 3), dpkg-dev (>= 1.15.7), gir1.2-soup-2.4, gir1.2-timezonemap-1.0, gir1.2-xkl-1.0, gnome-icon-theme, gobject-introspection, intltool (>= 0.40.0), intltool-debian (>= 0.30+20040212), iso-codes, isoquery, keymapper (>= 0.5.3-7), libbogl-dev, libcairo2-dev, libdebconfclient0-dev (>= 0.68), libdebian-installer4-dev (>= 0.76), libgirepository1.0-dev, libglib2.0-dev, libgstreamer-plugins-base0.10-dev (>= 0.10.23), libgtk-3-dev, libgudev-1.0-dev, libindicator3-dev, libiw-dev (>= 27+28pre9), liblocale-gettext-perl, libparted-dev, libparted0-dev (>= 2.2), locales, pep8, pkg-config, po-debconf (>= 1.0), pyflakes, python-gi-dev, python-scour, python3-all (>= 3.1), python3-apt (>= 0.7.100.3~), python3-cairo, python3-dbus, python3-gi, python3-gi-cairo, python3-mock (>= 0.7.0), python3-pyicu (>= 1.0), tzdata, ubuntu-artwork, udev, wget, xkb-data (>= 0.9), xkb-data-i18n, xvfb
+Build-Depends: apt, autopoint, bf-utf-source, dctrl-tools, debconf (>= 1.5.43), debconf-utils, debhelper (>= 9), devio, dh-autoreconf, dh-di (>= 3), dpkg-dev (>= 1.15.7), gir1.2-soup-2.4, gir1.2-timezonemap-1.0, gir1.2-xkl-1.0, gnome-icon-theme, gobject-introspection, intltool (>= 0.40.0), intltool-debian (>= 0.30+20040212), iso-codes, isoquery, keymapper (>= 0.5.3-7), libbogl-dev, libcairo2-dev, libdebconfclient0-dev (>= 0.68), libdebian-installer4-dev (>= 0.76), libgirepository1.0-dev, libglib2.0-dev, libgstreamer-plugins-base1.0-dev, libgstreamer1.0-dev, libgtk-3-dev, libgudev-1.0-dev, libindicator3-dev, libiw-dev (>= 27+28pre9), liblocale-gettext-perl, libparted-dev, libparted0-dev (>= 2.2), locales, pep8, pkg-config, po-debconf (>= 1.0), pyflakes, python-gi-dev, python-scour, python3-all (>= 3.1), python3-apt (>= 0.7.100.3~), python3-cairo, python3-dbus, python3-gi, python3-gi-cairo, python3-mock (>= 0.7.0), python3-pyicu (>= 1.0), tzdata, ubuntu-artwork, udev, wget, xkb-data (>= 0.9), xkb-data-i18n, xvfb
 Standards-Version: 3.6.2.1
 X-Python3-Version: >= 3.1
 XS-Testsuite: autopkgtest
@@ -45,7 +45,7 @@
 Package: ubiquity-frontend-gtk
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, ubiquity (= ${binary:Version}), python3-dbus, gir1.2-gtk-3.0, gir1.2-gdkpixbuf-2.0, gir1.2-gstreamer-0.10, gir1.2-soup-2.4, gir1.2-vte-2.90, gir1.2-webkit-3.0, iso-codes, metacity | xfwm4 | matchbox-window-manager | lubuntu-default-settings | openbox | compiz, gksu, gir1.2-xkl-1.0, gir1.2-timezonemap-1.0, python3-gi, python3-cairo, python3-gi-cairo, gir1.2-appindicator3-0.1, gstreamer0.10-plugins-good, busybox-static | busybox
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, ubiquity (= ${binary:Version}), python3-dbus, gir1.2-gtk-3.0, gir1.2-gdkpixbuf-2.0, gir1.2-gstreamer-1.0, gir1.2-soup-2.4, gir1.2-vte-2.90, gir1.2-webkit-3.0, iso-codes, metacity | xfwm4 | matchbox-window-manager | lubuntu-default-settings | openbox | compiz, gksu, gir1.2-xkl-1.0, gir1.2-timezonemap-1.0, python3-gi, python3-cairo, python3-gi-cairo, gir1.2-appindicator3-0.1, gstreamer1.0-plugins-good, busybox-static | busybox
 Suggests: gnome-control-center
 Conflicts: ubuntu-express-frontend-gtk, espresso-frontend-gtk, ubiquity (<< 2.4.3)
 Replaces: ubuntu-express-frontend-gtk, espresso-frontend-gtk, ubiquity (<< 2.4.3)

=== modified file 'src/webcam/Makefile.am'
--- src/webcam/Makefile.am	2011-08-22 10:35:58 +0000
+++ src/webcam/Makefile.am	2013-01-16 13:46:22 +0000
@@ -21,7 +21,7 @@
 introspection_sources = $(libubiwebcam_la_SOURCES)
 
 UbiquityWebcam-1.0.gir: libubiwebcam.la
-UbiquityWebcam_1_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 Gst-0.10
+UbiquityWebcam_1_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 Gst-1.0
 UbiquityWebcam_1_0_gir_CFLAGS = $(INCLUDES) --identifier-prefix=Ubiquity
 UbiquityWebcam_1_0_gir_LIBS = libubiwebcam.la
 UbiquityWebcam_1_0_gir_FILES = $(introspection_sources)

=== modified file 'src/webcam/Makefile.in'
--- src/webcam/Makefile.in	2012-09-27 15:48:52 +0000
+++ src/webcam/Makefile.in	2013-01-16 13:46:22 +0000
@@ -312,7 +312,7 @@
 @HAVE_INTROSPECTION_TRUE@INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 @HAVE_INTROSPECTION_TRUE@INTROSPECTION_GIRS = UbiquityWebcam-1.0.gir
 @HAVE_INTROSPECTION_TRUE@introspection_sources = $(libubiwebcam_la_SOURCES)
-@HAVE_INTROSPECTION_TRUE@UbiquityWebcam_1_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 Gst-0.10
+@HAVE_INTROSPECTION_TRUE@UbiquityWebcam_1_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 Gst-1.0
 @HAVE_INTROSPECTION_TRUE@UbiquityWebcam_1_0_gir_CFLAGS = $(INCLUDES) --identifier-prefix=Ubiquity
 @HAVE_INTROSPECTION_TRUE@UbiquityWebcam_1_0_gir_LIBS = libubiwebcam.la
 @HAVE_INTROSPECTION_TRUE@UbiquityWebcam_1_0_gir_FILES = $(introspection_sources)

=== modified file 'src/webcam/webcam.c'
--- src/webcam/webcam.c	2012-03-28 10:41:17 +0000
+++ src/webcam/webcam.c	2013-01-16 13:46:22 +0000
@@ -131,8 +131,8 @@
 	gtk_box_pack_start (GTK_BOX (self), priv->drawing_area, TRUE, TRUE, 0);
 	gtk_box_pack_start (GTK_BOX (self), priv->button, FALSE, FALSE, 0);
 
-	priv->camerabin = gst_element_factory_make ("camerabin2" , "cam");
-	priv->viewfinder_caps = gst_caps_new_simple ("video/x-raw-rgb",
+	priv->camerabin = gst_element_factory_make ("camerabin" , "cam");
+	priv->viewfinder_caps = gst_caps_new_simple ("video/x-raw",
 		"width", G_TYPE_INT, 640,
 		"height", G_TYPE_INT, 480, NULL);
 	g_object_set (G_OBJECT (priv->camerabin),
@@ -156,7 +156,7 @@
 	priv->bus = gst_element_get_bus (priv->camerabin);
 	gst_bus_add_signal_watch (priv->bus);
 	g_signal_connect (priv->bus, "message", G_CALLBACK (message_cb), self);
-	gst_bus_set_sync_handler (priv->bus, (GstBusSyncHandler) window_id_cb, NULL);
+	gst_bus_set_sync_handler (priv->bus, (GstBusSyncHandler) window_id_cb, NULL, NULL);
 	gst_object_ref (priv->bus);
 	gst_object_ref (priv->camerabin);
 }
@@ -170,8 +170,7 @@
 		return;
 	priv->src = gst_element_factory_make ("wrappercamerabinsrc", NULL);
 	priv->testsrc = gst_element_factory_make ("videotestsrc", NULL);
-	g_object_set (G_OBJECT (priv->testsrc), "is-live", TRUE,
-		"peer-alloc", FALSE, NULL);
+	g_object_set (G_OBJECT (priv->testsrc), "is-live", TRUE, NULL);
 	g_object_set (G_OBJECT (priv->src), "video-source", priv->testsrc, NULL);
 	g_object_set (G_OBJECT (priv->camerabin), "camera-source", priv->src, NULL);
 	ubiquity_webcam_stop (webcam);
@@ -278,12 +277,12 @@
 	if (GST_MESSAGE_TYPE (msg) != GST_MESSAGE_ELEMENT)
 		return GST_BUS_PASS;
 
-	if (!gst_structure_has_name (msg->structure, "prepare-xwindow-id"))
+	if (!gst_is_video_overlay_prepare_window_handle_message(msg))
 		return GST_BUS_PASS;
 
 	g_object_set(G_OBJECT(msg->src), "force-aspect-ratio", TRUE, NULL);
 
-	gst_x_overlay_set_xwindow_id (GST_X_OVERLAY (GST_MESSAGE_SRC(msg)),
+	gst_video_overlay_set_window_handle (GST_VIDEO_OVERLAY (GST_MESSAGE_SRC(msg)),
 								video_window_xid);
 	gst_message_unref (msg);
 	return GST_BUS_DROP;

=== modified file 'src/webcam/webcam.h'
--- src/webcam/webcam.h	2012-02-12 02:35:58 +0000
+++ src/webcam/webcam.h	2013-01-16 13:46:22 +0000
@@ -29,7 +29,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <gst/gst.h>
-#include <gst/interfaces/xoverlay.h>
+#include <gst/video/videooverlay.h>
 
 
 G_BEGIN_DECLS