ekiga r7136 - in trunk: . lib/engine/components/gstreamer

[jpuydt svn gnome org]

Author: jpuydt
Date: Wed Oct  1 05:27:12 2008
New Revision: 7136
URL: http://svn.gnome.org/viewvc/ekiga?rev=7136&view=rev

Log:
Fixed framerate code.

Modified:
   trunk/ChangeLog
   trunk/lib/engine/components/gstreamer/gst-videoinput.cpp

Modified: trunk/lib/engine/components/gstreamer/gst-videoinput.cpp
==============================================================================
--- trunk/lib/engine/components/gstreamer/gst-videoinput.cpp	(original)
+++ trunk/lib/engine/components/gstreamer/gst-videoinput.cpp	Wed Oct  1 05:27:12 2008
@@ -99,14 +99,10 @@
   return result;
 }
 
-/* FIXME: in this function, all fps-related code is commented out...
- * and I(Snark) have no clue how to make it work. gstreamer-devel doesn't seem
- * to either since I got no answer to my questions.
- */
 bool
 GST::VideoInputManager::open (unsigned width,
 			      unsigned height,
-			      unsigned /*fps*/)
+			      unsigned fps)
 {
   bool result;
   gchar* command = NULL;
@@ -117,10 +113,10 @@
 			     " caps=video/x-raw-yuv"
 			     ",format=(fourcc)I420"
 			     ",width=%d,height=%d"
-			     //",framerate=%d"
+			     ",framerate=(fraction)%d/1"
 			     " name=ekiga_sink",
 			     devices_by_name[current_state.device.name].c_str (),
-			     width, height);//, fps);
+			     width, height, fps);
   g_print ("Pipeline: %s\n", command);
   pipeline = gst_parse_launch (command, &error);