[maemo-commits] [maemo-commits] r16675 - in projects/haf/trunk/hildon-thumbnail: . daemon/plugins

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2008-11-14 11:21:43 +0200 (Fri, 14 Nov 2008)
New Revision: 16675

Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c
Log:
2008-11-14  Mikael Ottela    <mikael.ottela at ixonos.com>

	* daemon/plugins/gstreamer-video-plugin.c: Fixed some bugs in 
	the video thumbnailer



Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-11-13 23:59:05 UTC (rev 16674)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-11-14 09:21:43 UTC (rev 16675)
@@ -1,3 +1,8 @@
+2008-11-14  Mikael Ottela    <mikael.ottela at ixonos.com>
+
+	* daemon/plugins/gstreamer-video-plugin.c: Fixed some bugs in the 
+	video thumbnailer
+
 2008-11-13  Philip Van Hoof  <philip at codeminded.be>
 
 	* daemon/plugins/gdkpixbuf-plugin.c

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c	2008-11-13 23:59:05 UTC (rev 16674)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c	2008-11-14 09:21:43 UTC (rev 16675)
@@ -72,6 +72,8 @@
 	gint		video_fps_d;
 	gint		audio_channels;
 	gint		audio_samplerate;
+
+	gboolean        bugged;
 } VideoThumbnailer;
 
 
@@ -92,7 +94,7 @@
 					    width,
 					    height,
 					    width*3,
-					    bpp,
+					    bpp/3,
 					    target,
 					    mtime, 
 					    uri, 
@@ -175,6 +177,7 @@
 		if (error)
 			g_error_free (error);
 		g_free(message_str);
+		thumber->bugged = TRUE;
 		g_main_loop_quit (thumber->loop);
 		break;
 	
@@ -188,6 +191,7 @@
 		break;
 
 	case GST_MESSAGE_EOS:
+		thumber->bugged = TRUE;
 		g_main_loop_quit (thumber->loop);
 		break;
 
@@ -226,7 +230,6 @@
 	case GST_MESSAGE_APPLICATION:
 	case GST_MESSAGE_TAG:
 	default:
-		g_main_loop_quit (thumber->loop);
 		/* unhandled message */
 		break;
 	}
@@ -242,6 +245,8 @@
 	GstCaps           *caps;
 
 	/* Resetting */
+	thumber->bugged       = FALSE;
+
 	thumber->loop         = NULL;
 	thumber->source       = NULL;
 	thumber->decodebin    = NULL;
@@ -336,7 +341,8 @@
 	gst_element_set_state (thumber->pipeline, GST_STATE_PAUSED);
 
 	// g_timeout_add_seconds (10, g_main_loop_quit, thumber->loop);
-	g_main_loop_run (thumber->loop);
+	if (!(thumber->bugged)) 
+		g_main_loop_run (thumber->loop);
 
 	cleanup: