[gst-cvs] gst-plugins-base: examples: don' t hard-code xvimagesink for Gtk+ GstXOverlay example
Tim Mueller
tpm at kemper.freedesktop.org
Fri Feb 19 04:09:54 PST 2010
Module: gst-plugins-base
Branch: master
Commit: 590bc917a2d0224586b55c5e1e3d28bf62cf1527
URL: http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=590bc917a2d0224586b55c5e1e3d28bf62cf1527
Author: Tim-Philipp Müller <tim.muller at collabora.co.uk>
Date: Thu Feb 18 23:47:35 2010 +0000
examples: don't hard-code xvimagesink for Gtk+ GstXOverlay example
Try to find a working videosink, don't hardcode xvimagesink. Also
add some borders to window and give it a title so that it's clear
that this is really a Gtk+ window and not a window created by the
videosink.
---
tests/examples/overlay/gtk-xoverlay.c | 52 ++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/tests/examples/overlay/gtk-xoverlay.c b/tests/examples/overlay/gtk-xoverlay.c
index 84718ef..2bde191 100644
--- a/tests/examples/overlay/gtk-xoverlay.c
+++ b/tests/examples/overlay/gtk-xoverlay.c
@@ -30,6 +30,8 @@
#include <gst/gst.h>
#include <gst/interfaces/xoverlay.h>
+#include <string.h>
+
static void
window_closed (GtkWidget * widget, GdkEvent * event, gpointer user_data)
{
@@ -40,6 +42,48 @@ window_closed (GtkWidget * widget, GdkEvent * event, gpointer user_data)
gtk_main_quit ();
}
+/* slightly convoluted way to find a working video sink that's not a bin */
+static GstElement *
+find_video_sink (void)
+{
+ GstStateChangeReturn sret;
+ GstElement *sink;
+
+ sink = gst_element_factory_make ("xvimagesink", NULL);
+ sret = gst_element_set_state (sink, GST_STATE_READY);
+ if (sret == GST_STATE_CHANGE_SUCCESS)
+ return sink;
+
+ gst_element_set_state (sink, GST_STATE_NULL);
+ gst_object_unref (sink);
+
+ sink = gst_element_factory_make ("ximagesink", NULL);
+ sret = gst_element_set_state (sink, GST_STATE_READY);
+ if (sret == GST_STATE_CHANGE_SUCCESS)
+ return sink;
+
+ gst_element_set_state (sink, GST_STATE_NULL);
+ gst_object_unref (sink);
+
+ if (strcmp (DEFAULT_VIDEOSINK, "xvimagesink") == 0 ||
+ strcmp (DEFAULT_VIDEOSINK, "ximagesink") == 0)
+ return NULL;
+
+ sink = gst_element_factory_make (DEFAULT_VIDEOSINK, NULL);
+ if (GST_IS_BIN (sink)) {
+ gst_object_unref (sink);
+ return NULL;
+ }
+
+ sret = gst_element_set_state (sink, GST_STATE_READY);
+ if (sret == GST_STATE_CHANGE_SUCCESS)
+ return sink;
+
+ gst_element_set_state (sink, GST_STATE_NULL);
+ gst_object_unref (sink);
+ return NULL;
+}
+
int
main (int argc, char **argv)
{
@@ -58,7 +102,11 @@ main (int argc, char **argv)
pipeline = gst_pipeline_new ("xvoverlay");
src = gst_element_factory_make ("videotestsrc", NULL);
- sink = gst_element_factory_make ("xvimagesink", NULL);
+ sink = find_video_sink ();
+
+ if (sink == NULL)
+ g_error ("Couldn't find a working video sink.");
+
gst_bin_add_many (GST_BIN (pipeline), src, sink, NULL);
gst_element_link (src, sink);
@@ -68,10 +116,12 @@ main (int argc, char **argv)
g_signal_connect (G_OBJECT (window), "delete-event",
G_CALLBACK (window_closed), (gpointer) pipeline);
gtk_window_set_default_size (GTK_WINDOW (window), 320, 240);
+ gtk_window_set_title (GTK_WINDOW (window), "GstXOverlay Gtk+ demo");
video_window = gtk_drawing_area_new ();
gtk_widget_set_double_buffered (video_window, FALSE);
gtk_container_add (GTK_CONTAINER (window), video_window);
+ gtk_container_set_border_width (GTK_CONTAINER (window), 16);
gtk_widget_show_all (window);
gtk_widget_realize (window);
More information about the Gstreamer-commits
mailing list