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

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2008-11-19 16:54:26 +0200 (Wed, 19 Nov 2008)
New Revision: 16745

Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/config.h.in
   projects/haf/trunk/hildon-thumbnail/configure.ac
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c
Log:
2008-11-19  Philip Van Hoof  <philip at codeminded.be>

	* config.h.in
	* daemon/plugins/gstreamer-video-plugin.c
	* configure.ac: Support for the same thing but detecting we are on
	a desktop or not. And then using the pipeline for a desktop.



Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-11-19 13:48:16 UTC (rev 16744)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-11-19 14:54:26 UTC (rev 16745)
@@ -1,5 +1,12 @@
 2008-11-19  Philip Van Hoof  <philip at codeminded.be>
 
+	* config.h.in
+	* daemon/plugins/gstreamer-video-plugin.c
+	* configure.ac: Support for the same thing but detecting we are on
+	a desktop or not. And then using the pipeline for a desktop.
+
+2008-11-19  Philip Van Hoof  <philip at codeminded.be>
+
 	* daemon/plugins/gstreamer-video-plugin.c: Demo for animated video
 	thumbnails: Make a file like this to enable:
 

Modified: projects/haf/trunk/hildon-thumbnail/config.h.in
===================================================================
--- projects/haf/trunk/hildon-thumbnail/config.h.in	2008-11-19 13:48:16 UTC (rev 16744)
+++ projects/haf/trunk/hildon-thumbnail/config.h.in	2008-11-19 14:54:26 UTC (rev 16745)
@@ -9,6 +9,9 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* OMXIL */
+#undef HAVE_OMXIL
+
 /* SQLite3 */
 #undef HAVE_SQLITE3
 

Modified: projects/haf/trunk/hildon-thumbnail/configure.ac
===================================================================
--- projects/haf/trunk/hildon-thumbnail/configure.ac	2008-11-19 13:48:16 UTC (rev 16744)
+++ projects/haf/trunk/hildon-thumbnail/configure.ac	2008-11-19 14:54:26 UTC (rev 16745)
@@ -92,6 +92,19 @@
 
 AM_CONDITIONAL(HAVE_GSTREAMER, test "$have_gstreamer" = "yes")
 
+AC_CHECK_LIB(omxil, OMX_Init, 
+	[have_omxil=yes], [have_omxil=no])
+
+if test $have_omxil = "no"; then
+ AC_CHECK_LIB(omxil-bellagio, OMX_Init,
+        [have_omxil=yes], [have_omxil=no])
+fi
+
+if test "$have_omxil" = "yes"; then
+  AC_DEFINE(HAVE_OMXIL, [], [OMXIL])
+fi
+
+
 PKG_CHECK_MODULES(PNG,[libpng >= 1.2],
 		      [have_png=yes],
 		      [have_png=no])

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-19 13:48:16 UTC (rev 16744)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c	2008-11-19 14:54:26 UTC (rev 16745)
@@ -436,9 +436,11 @@
 	g_free (ascii_digest);
 }
 
-#define PIPELINE "/usr/bin/gst-launch avimux name=mux ! filesink location=\"%s\"  d. !  " \
-	"queue ! videorate ! videoscale ! \"video/x-raw-yuv, width=160, height=96, framerate=(fraction)10/1\"" \
-	" ! omx_mpeg4enc ! queue ! mux.video_0 filesrc location=\"%s\" ! decodebin2 name=d"
+#ifdef HAVE_OMXIL
+#define PIPELINE "/usr/bin/gst-launch avimux name=mux ! filesink location=\"%s\"  d. !  queue ! videorate ! videoscale ! \"video/x-raw-yuv, width=160, height=96, framerate=(fraction)10/1\" ! omx_mpeg4enc ! queue | mux.video_0 filesrc location=\"%s\" ! decodebin2 name=d"
+#else
+#define PIPELINE "/usr/bin/gst-launch avimux name=mux ! filesink location=\"%s\"  d. !  queue ! videorate ! videoscale ! \"video/x-raw-yuv, width=160, height=96, framerate=(fraction)10/1\" ! ffenc_mpeg4 ! queue | mux.video_0 filesrc location=\"%s\" ! decodebin2 name=d"
+#endif
 
 static void
 animated_thumbnail_create (VideoThumbnailer *thumber, GError **error)