Merge lp:~ballogy/gloobus-preview/gstreamer-1.0 into lp:gloobus-preview

[Balló György]

This is the port of gloobus-preview to GStreamer 1.0.

[lp:~ballogy/gloobus-preview/gstreamer-1.0]

292. By Balló György on 2014-12-22

Fix album cover rendering for audio files

293. By Balló György on 2014-12-23

Fix info handling

=== modified file 'configure.ac'
--- configure.ac	2012-05-13 19:48:02 +0000
+++ configure.ac	2014-12-23 10:10:06 +0000
@@ -44,10 +44,9 @@
 PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-3.0)
 PKG_CHECK_MODULES(GCONF2, gconf-2.0)
 PKG_CHECK_MODULES(CAIRO, cairo)
-PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10)
-PKG_CHECK_MODULES(GSTREAMER_PLUGINS, gstreamer-plugins-base-0.10)
-PKG_CHECK_MODULES(GSTREAMER_INTERFACES, gstreamer-interfaces-0.10)
-PKG_CHECK_MODULES(GSTREAMER_VIDEO, gstreamer-video-0.10)
+PKG_CHECK_MODULES(GSTREAMER, gstreamer-1.0)
+PKG_CHECK_MODULES(GSTREAMER_PLUGINS, gstreamer-plugins-base-1.0)
+PKG_CHECK_MODULES(GSTREAMER_VIDEO, gstreamer-video-1.0)
 PKG_CHECK_MODULES(POPPLER, poppler-glib)
 PKG_CHECK_MODULES(SPECTRE, libspectre >= 0.2.2)
 PKG_CHECK_MODULES(DJVU, ddjvuapi)

=== modified file 'src/plugin-gstreamer-audio/plugin-gstreamer-audio.cpp'
--- src/plugin-gstreamer-audio/plugin-gstreamer-audio.cpp	2012-04-06 10:42:24 +0000
+++ src/plugin-gstreamer-audio/plugin-gstreamer-audio.cpp	2014-12-23 10:10:06 +0000
@@ -145,7 +145,7 @@
 	GstFormat format = GST_FORMAT_TIME;
     gint64 pos;
     gboolean result;
-    result = gst_element_query_position (pipeline, &format, &pos);
+    result = gst_element_query_position (pipeline, format, &pos);
     if (!result || format != GST_FORMAT_TIME)
         return 0;
 	return pos/GST_SECOND;
@@ -156,7 +156,7 @@
 	GstFormat format = GST_FORMAT_TIME;
 	gint64 len;
 	gboolean result;
-	result = gst_element_query_duration (pipeline, &format, &len);
+	result = gst_element_query_duration (pipeline, format, &len);
 	if( !result || format != GST_FORMAT_TIME ) 
 		return 0;
 	return len/GST_SECOND;
@@ -222,7 +222,8 @@
 	GdkPixbufLoader * loader = gdk_pixbuf_loader_new();
 	gdk_pixbuf_loader_write(loader,(guchar*)data,size,NULL);
 	gdk_pixbuf_loader_close(loader,NULL);
-	GdkPixbuf * pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
+	GdkPixbuf *pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
+	g_object_ref(pixbuf);
 	g_object_unref(loader);
 	return pixbuf;
 }
@@ -276,11 +277,15 @@
 	gchar *title, *artist, *album, *info;
 	
 	if( !gst_tag_list_get_string_index (tags, GST_TAG_TITLE, 0, &title) )
-		title = g_strdup(" ");
+		title = g_strdup("");
 	if( !gst_tag_list_get_string_index (tags, GST_TAG_ARTIST, 0, &artist) )
-		artist = g_strdup(" ");
+		artist = g_strdup("");
 	if( !gst_tag_list_get_string_index (tags, GST_TAG_ALBUM, 0, &album) )
-		album = g_strdup(" ");
+		album = g_strdup("");
+
+	this->title = title;
+	this->artist = artist;
+	this->album = album;
 
 	info = g_strdup_printf("%s\n\n%s\n\n%s", title, artist, album);
 	gtk_label_set_text(GTK_LABEL(info_label), info);
@@ -290,20 +295,28 @@
 	g_free(album);
 	g_free(info);
 
-	if( !cover_found ) {
-		GstBuffer *buff;
-		if( gst_tag_list_get_buffer_index (tags, GST_TAG_IMAGE, 0, &buff) ) {
+	GstSample *sample;
+	GstBuffer *buff;
+	GstMapInfo cover_info;
+
+	if(gst_tag_list_get_sample_index (tags, GST_TAG_IMAGE, 0, &sample)) {
+		buff = gst_sample_get_buffer (sample);
+		if(gst_buffer_map (buff, &cover_info, GST_MAP_READ)) {
 			g_debug("Cover?");
 			GdkPixbuf *pixbuf = NULL;
-
-			guchar * data = GST_BUFFER_DATA(buff);
-			gsize size = GST_BUFFER_SIZE(buff);
+			guchar * data = NULL;
+			gsize size;
 			GError *error = NULL;
 
+			data = cover_info.data;
+			size = cover_info.size;
+			gst_buffer_unmap (buff, &cover_info);
+
 			GdkPixbufLoader *loader = gdk_pixbuf_loader_new();
 			if(gdk_pixbuf_loader_write(loader, data, size, &error)) {
 				if(gdk_pixbuf_loader_close(loader, NULL)) {
 					pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
+					g_object_ref(pixbuf);
 				} else {
 					g_warning("Error: %s", error->message);
 					g_error_free(error);
@@ -323,9 +336,10 @@
 
 				gtk_image_set_from_pixbuf(GTK_IMAGE(cover), pix_cover);
 				gtk_image_set_from_pixbuf(GTK_IMAGE(reflection), pix_reflection);
+				g_object_unref(pixbuf);
 			}
-			gst_buffer_unref(buff);
 		}
+		gst_sample_unref(sample);
 	}
 }
 

=== modified file 'src/plugin-gstreamer-video/plugin-gstreamer-video.cpp'
--- src/plugin-gstreamer-video/plugin-gstreamer-video.cpp	2011-10-29 10:09:05 +0000
+++ src/plugin-gstreamer-video/plugin-gstreamer-video.cpp	2014-12-23 10:10:06 +0000
@@ -16,7 +16,7 @@
     :bus(0)
     ,playbin(0)
     ,audio_capsfilter(0)
-    ,xoverlay(0)
+    ,video_overlay(0)
     ,bus_msg_id(0)
     ,bus_msg_id_sync(0)
     ,interface_update_id(0)
@@ -54,7 +54,7 @@
     gst_init (NULL, NULL);
     //gst_pb_utils_init ();
 
-    playbin = gst_element_factory_make ("playbin2", "playbin");
+    playbin = gst_element_factory_make ("playbin", "playbin");
     if( !playbin ) {
         m_error = g_error_new(g_quark_from_string ("iVideo"), 1601,
             _("Error initializing video interface"));
@@ -65,32 +65,18 @@
     gst_bus_add_signal_watch (bus);
     bus_msg_id = g_signal_connect( bus, "message", G_CALLBACK (bus_message_cb), this);
 
-    audio_sink = gst_element_factory_make ("gconfaudiosink", "audio-sink");
+    audio_sink = gst_element_factory_make ("autoaudiosink", "audio-sink");
     if( !audio_sink ) {
-        g_warning ("Could not create element 'gconfaudiosink'");
-        audio_sink = gst_element_factory_make ("autoaudiosink", "audio-sink");
-        if( !audio_sink ) {
-            m_error = g_error_new(g_quark_from_string ("iVideo"), 1602,
-                _("Failed to open audio output"));
-            return false;
-        }
-    } else {
-        /* set the profile property on the gconfaudiosink to "music and movies" */
-        if (g_object_class_find_property (G_OBJECT_GET_CLASS (audio_sink), "profile"))
-            g_object_set (G_OBJECT (audio_sink), "profile", 1, NULL);
-    }
-
-
-    video_sink = gst_element_factory_make ("gconfvideosink", "video-sink");
+        m_error = g_error_new(g_quark_from_string ("iVideo"), 1602,
+            _("Failed to open audio output"));
+        return false;
+     }
+
+    video_sink = gst_element_factory_make ("autovideosink", "video-sink");
     if( !video_sink ) {
-        g_warning ("Could not create element 'gconfvideosink'");
-        /* Try to fallback on ximagesink */
-        video_sink = gst_element_factory_make ("ximagesink", "video-sink");
-        if( !video_sink ) {
-            m_error = g_error_new(g_quark_from_string ("iVideo"), 1602,
-                _("Failed to open video output"));
-            return false;
-        }
+        m_error = g_error_new(g_quark_from_string ("iVideo"), 1602,
+            _("Failed to open video output"));
+        return false;
     }
 
     GstStateChangeReturn ret;
@@ -141,21 +127,21 @@
         G_CALLBACK (video_tags_changed_cb), this);
 
     GstElement *element = gst_bin_get_by_interface (GST_BIN (video_sink),
-                                        GST_TYPE_X_OVERLAY);
-    if (GST_IS_X_OVERLAY (element)) {
-        g_debug("Found xoverlay: %s", GST_OBJECT_NAME (element));
-        xoverlay = GST_X_OVERLAY (element);
+                                        GST_TYPE_VIDEO_OVERLAY);
+    if (GST_IS_VIDEO_OVERLAY (element)) {
+        g_debug("Found video overlay: %s", GST_OBJECT_NAME (element));
+        video_overlay = GST_VIDEO_OVERLAY (element);
     } else {
-        g_debug("No xoverlay found");
+        g_debug("No video overlay found");
         if (element)
             gst_object_unref (element);
-        xoverlay = NULL;
+        video_overlay = NULL;
     }
 
     //g_signal_connect (video_sink, "element-added",
     //  G_CALLBACK (got_new_video_sink_bin_element), this);
 
-    gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, this);
+    gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, this, NULL);
     bus_msg_id_sync = g_signal_connect( bus, "sync-message::element",
         G_CALLBACK (bus_message_sync_cb), this);
 
@@ -289,7 +275,7 @@
     GstFormat format = GST_FORMAT_TIME;
     gint64 pos;
     gboolean result;
-    result = gst_element_query_position (playbin, &format, &pos);
+    result = gst_element_query_position (playbin, format, &pos);
     if (!result || format != GST_FORMAT_TIME)
         return 0;
     return pos/GST_SECOND;
@@ -300,7 +286,7 @@
     GstFormat format = GST_FORMAT_TIME;
     gint64 len;
     gboolean result;
-    result = gst_element_query_duration (playbin, &format, &len);
+    result = gst_element_query_duration (playbin, format, &len);
     if( !result || format != GST_FORMAT_TIME )
         return 0;
     return len/GST_SECOND;
@@ -381,27 +367,24 @@
 
     g_assert (msg->type == GST_MESSAGE_ELEMENT);
 
-    if (msg->structure == NULL)
-        return;
-
-    if (gst_structure_has_name (msg->structure, "prepare-xwindow-id")) {
+    if (gst_is_video_overlay_prepare_window_handle_message (msg)) {
         gulong xid;
 
         g_debug("Handling sync prepare-xwindow-id message");
 
         g_mutex_lock (video->lock);
         video->update_interface();
-        if (video->xoverlay == NULL) {
+        if (video->video_overlay == NULL) {
             GstObject *sender = GST_MESSAGE_SRC (msg);
-            if (sender && GST_IS_X_OVERLAY (sender))
-                video->xoverlay = GST_X_OVERLAY (gst_object_ref (sender));
+            if (sender && GST_IS_VIDEO_OVERLAY (sender))
+                video->video_overlay = GST_VIDEO_OVERLAY (gst_object_ref (sender));
         }
         g_mutex_unlock (video->lock);
 
-        g_return_if_fail (video->xoverlay != NULL);
+        g_return_if_fail (video->video_overlay != NULL);
 
         xid = GDK_WINDOW_XID (gtk_widget_get_window(video->video_box));
-        gst_x_overlay_set_xwindow_id (video->xoverlay, xid);
+        gst_video_overlay_set_window_handle (video->video_overlay, xid);
     }
 //g_debug("BUS_MESSAGE_SYNC_CB END");
 }
@@ -409,13 +392,13 @@
 /* Must be called with lock held */
 void iVideo::update_interface( void )
 {
-    GstXOverlay *old_xoverlay = xoverlay;
+    GstVideoOverlay *old_video_overlay = video_overlay;
     GstElement *video_sink, *element, *play;
 
     if (g_thread_self() != gui_thread) {
-        if (xoverlay)
-            gst_object_unref (xoverlay);
-            xoverlay = NULL;
+        if (video_overlay)
+            gst_object_unref (video_overlay);
+            video_overlay = NULL;
     if (interface_update_id)
         g_source_remove (interface_update_id);
         interface_update_id = g_idle_add( &update_interfaces_delayed, this);
@@ -433,24 +416,24 @@
 
     /* We try to get an element supporting XOverlay interface */
     if (GST_IS_BIN (video_sink)) {
-        g_debug ("Retrieving xoverlay from bin ...");
-        element = gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_X_OVERLAY);
+        g_debug ("Retrieving video overlay from bin ...");
+        element = gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_VIDEO_OVERLAY);
     } else {
         element = (GstElement*)gst_object_ref(video_sink);
     }
 
-    if (GST_IS_X_OVERLAY (element)) {
-        g_debug ("Found xoverlay: %s", GST_OBJECT_NAME (element));
-        xoverlay = GST_X_OVERLAY (element);
+    if (GST_IS_VIDEO_OVERLAY (element)) {
+        g_debug ("Found video overlay: %s", GST_OBJECT_NAME (element));
+        video_overlay = GST_VIDEO_OVERLAY (element);
     } else {
-        GST_DEBUG ("No xoverlay found");
+        GST_DEBUG ("No video overlay found");
         if (element)
             gst_object_unref (element);
-        xoverlay = NULL;
+        video_overlay = NULL;
     }
 
-    if (old_xoverlay)
-        gst_object_unref (GST_OBJECT (old_xoverlay));
+    if (old_video_overlay)
+        gst_object_unref (GST_OBJECT (old_video_overlay));
 
     gst_object_unref (video_sink);
 }
@@ -477,8 +460,8 @@
 {
 //g_debug("CONFIGURE_CB START");
     iVideo *video = (iVideo*)data;
-    if (video->xoverlay != NULL && GST_IS_X_OVERLAY (video->xoverlay)) {
-        gst_x_overlay_expose (video->xoverlay);
+    if (video->video_overlay != NULL && GST_IS_VIDEO_OVERLAY (video->video_overlay)) {
+        gst_video_overlay_expose (video->video_overlay);
     }
 //g_debug("CONFIGURE_CB end");
     return false;
@@ -529,13 +512,15 @@
 void iVideo::handle_application_message( GstMessage *msg )
 {
     const gchar *msg_name;
+    const GstStructure *structure;
     //GdkWindow *window;
     //GtkAllocation allocation;
 
-    msg_name = gst_structure_get_name (msg->structure);
+    structure = gst_message_get_structure (msg);
+    msg_name = gst_structure_get_name (structure);
     g_return_if_fail (msg_name != NULL);
 
-    g_debug("Handling application message: %" GST_PTR_FORMAT, msg->structure);
+    g_debug("Handling application message: %" GST_PTR_FORMAT, structure);
 
     if( !g_strcmp0( msg_name, "stream-changed" ) ) {
         update_stream_info();
@@ -568,7 +553,7 @@
     if (videopad) {
         GstCaps *caps;
 
-        if( (caps = gst_pad_get_negotiated_caps( videopad ) ) ) {
+        if( (caps = gst_pad_get_current_caps( videopad ) ) ) {
             caps_set_cb( G_OBJECT( videopad ), NULL, this );
             gst_caps_unref (caps);
         }
@@ -586,7 +571,7 @@
     GstStructure *s;
     GstCaps *caps;
 
-    if( !(caps = gst_pad_get_negotiated_caps(pad) ) )
+    if( !(caps = gst_pad_get_current_caps(pad) ) )
         return;
 
     /* Get video decoder caps */
@@ -769,7 +754,7 @@
 
     GstTagList *tags;
 
-    g_debug("Tags: %" GST_PTR_FORMAT, pack->tags);
+    //g_debug("Tags: %" GST_PTR_FORMAT, pack->tags);
     tags = gst_tag_list_merge (pack->video->tags, pack->tags, GST_TAG_MERGE_REPLACE);
     if( pack->video->tags )
         gst_tag_list_free ( pack->video->tags );

=== modified file 'src/plugin-gstreamer-video/plugin-gstreamer-video.h'
--- src/plugin-gstreamer-video/plugin-gstreamer-video.h	2011-10-31 16:27:21 +0000
+++ src/plugin-gstreamer-video/plugin-gstreamer-video.h	2014-12-23 10:10:06 +0000
@@ -4,10 +4,10 @@
 #ifndef PLUGIN_LOADER
 
 #include <gst/gst.h>
-#include <gst/interfaces/xoverlay.h>
+#include <gst/video/videooverlay.h>
 #include <gst/video/gstvideosink.h>
 #include <gst/video/video.h>
-#include <gst/audio/gstbaseaudiosink.h>
+#include <gst/audio/gstaudiobasesink.h>
 #include <gst/tag/tag.h>
 #include <string.h>
 
@@ -21,7 +21,7 @@
         GstBus      *   bus;
         GstElement  *   playbin;
         GstElement  *   audio_capsfilter;
-        GstXOverlay *   xoverlay;
+        GstVideoOverlay * video_overlay;
 
         gulong          bus_msg_id;
         gulong          bus_msg_id_sync;