[maemo-commits] [maemo-commits] r18543 - in projects/haf/trunk/hildon-thumbnail: . thumbnailers/gst-video-thumbnailer thumbnailers/gst-video-thumbnailer/reg

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2009-05-29 17:11:51 +0300 (Fri, 29 May 2009)
New Revision: 18543

Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/gst-thumb-pipe.c
   projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/reg/com.nokia.thumbnailer.Gstreamer.service
Log:
2009-05-29  Mikael Ottela <mikael.ottela at ixonos.com>

        * thumbnailers/gst-video-thumbnailer/reg/com.nokia.thumbnailer.Gstreamer.service
        * thumbnailers/gst-video-thumbnailer/gst-thumb-pipe.c:

        Fixed an issue about seeking to the right frame before making a thumb



Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2009-05-29 12:17:09 UTC (rev 18542)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2009-05-29 14:11:51 UTC (rev 18543)
@@ -1,3 +1,10 @@
+2009-05-29  Mikael Ottela <mikael.ottela at ixonos.com>
+
+	* thumbnailers/gst-video-thumbnailer/reg/com.nokia.thumbnailer.Gstreamer.service
+	* thumbnailers/gst-video-thumbnailer/gst-thumb-pipe.c:
+
+	Fixed an issue about seeking to the right frame before making a thumb
+
 2009-05-29  Philip Van Hoof  <philip at codeminded.be>
 
 	* daemon/plugins/epeg-plugin.c: Bugfix for cropped images

Modified: projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/gst-thumb-pipe.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/gst-thumb-pipe.c	2009-05-29 12:17:09 UTC (rev 18542)
+++ projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/gst-thumb-pipe.c	2009-05-29 14:11:51 UTC (rev 18543)
@@ -267,10 +267,6 @@
 
 	g_free (filename);
 
-	gst_element_seek (priv->pipeline, 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH,
-			  GST_SEEK_TYPE_SET, 3 * GST_SECOND,
-			  GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE);
-
 	gst_element_set_state (priv->pipeline, GST_STATE_PAUSED);
 	if (!_thumber_pipe_poll_for_state_change (pipe, GST_STATE_PAUSED, &lerror)) {
 		g_propagate_error (error, lerror);
@@ -278,6 +274,16 @@
 		return FALSE;
 	}
 
+	g_signal_connect (priv->video_sink, "preroll-handoff",
+			  G_CALLBACK(_thumber_pipe_thumbnail_callback), pipe);
+
+
+	gst_element_seek (priv->pipeline, 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH,
+			  GST_SEEK_TYPE_SET, 3 * GST_SECOND,
+			  GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE);
+
+	gst_element_get_state (priv->pipeline, NULL, NULL, 100 * GST_MSECOND);
+
 	success = priv->success;
 
 	if (!success) {
@@ -447,9 +453,6 @@
 	/* Connect signal for new pads */
 	g_signal_connect (priv->decodebin, "new-decoded-pad", 
 			  G_CALLBACK (_thumber_pipe_newpad_callback), pipe);
-	
-	g_signal_connect (priv->video_sink, "preroll-handoff",
-			  G_CALLBACK(_thumber_pipe_thumbnail_callback), pipe);
 
 	return TRUE;
 }

Modified: projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/reg/com.nokia.thumbnailer.Gstreamer.service
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/reg/com.nokia.thumbnailer.Gstreamer.service	2009-05-29 12:17:09 UTC (rev 18542)
+++ projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/reg/com.nokia.thumbnailer.Gstreamer.service	2009-05-29 14:11:51 UTC (rev 18543)
@@ -1,5 +1,5 @@
 [D-BUS Thumbnailer]
 Name=com.nokia.thumbnailer.Gstreamer
-MimeTypes=video/avi;video/mpeg;video/x-msvideo
+MimeTypes=video/3gpp;video/mp4;video/mpeg;video/quicktime;video/x-ms-asf;video/x-msvideo;video/x-ms-wmv;
 Comment=The gstreamer based video thumbnailer
 UriSchemes=file