cheese r402 - in trunk: . src

[dgsiegel svn gnome org]

Author: dgsiegel
Date: Mon Jan 14 22:53:30 2008
New Revision: 402
URL: http://svn.gnome.org/viewvc/cheese?rev=402&view=rev

Log:
remove the queue-size=2, this should fix bug #507416 - iSight camera does not work in gstreamer


Modified:
   trunk/ChangeLog
   trunk/src/cheese-webcam.c

Modified: trunk/src/cheese-webcam.c
==============================================================================
--- trunk/src/cheese-webcam.c	(original)
+++ trunk/src/cheese-webcam.c	Mon Jan 14 22:53:30 2008
@@ -478,19 +478,9 @@
   i = 0;
   while (!pipeline_works && (i < G_N_ELEMENTS (GSTREAMER_VIDEO_SOURCES)))
   {
-    /* NOTE queue-size=2 can be removed as soon as gst-plugins-good 0.10.7 comes out */
-    if (strcmp (GSTREAMER_VIDEO_SOURCES[i], "v4l2src") == 0)
-    {
-      pipeline_desc = g_strdup_printf ("%s name=source device=%s queue-size=2 ! fakesink", 
-                                       GSTREAMER_VIDEO_SOURCES[i],
-                                       webcam_device->video_device);
-    }
-    else
-    {
-      pipeline_desc = g_strdup_printf ("%s name=source device=%s ! fakesink", 
-                                       GSTREAMER_VIDEO_SOURCES[i],
-                                       webcam_device->video_device);
-    }
+    pipeline_desc = g_strdup_printf ("%s name=source device=%s ! fakesink", 
+                                     GSTREAMER_VIDEO_SOURCES[i],
+                                     webcam_device->video_device);
     err = NULL;
     pipeline = gst_parse_launch (pipeline_desc, &err);
     if ((pipeline != NULL) && (err == NULL))
@@ -620,29 +610,14 @@
       }
     }
 
-    /* NOTE queue-size=2 can be removed as soon as gst-plugins-good 0.10.7 comes out */
-    if (strcmp (selected_webcam->gstreamer_src, "v4l2src") == 0)
-    {
-      webcam_input = g_strdup_printf ("%s name=video_source device=%s queue-size=2 ! %s,width=%d,height=%d,framerate=%d/%d ! identity",
-                                      selected_webcam->gstreamer_src,
-                                      selected_webcam->video_device,
-                                      format->mimetype,
-                                      format->width,
-                                      format->height,
-                                      framerate_numerator,
-                                      framerate_denominator);
-    }
-    else
-    {
-      webcam_input = g_strdup_printf ("%s name=video_source device=%s ! %s,width=%d,height=%d,framerate=%d/%d ! identity",
-                                      selected_webcam->gstreamer_src,
-                                      selected_webcam->video_device,
-                                      format->mimetype,
-                                      format->width,
-                                      format->height,
-                                      framerate_numerator,
-                                      framerate_denominator);
-    }
+    webcam_input = g_strdup_printf ("%s name=video_source device=%s ! %s,width=%d,height=%d,framerate=%d/%d ! identity",
+                                    selected_webcam->gstreamer_src,
+                                    selected_webcam->video_device,
+                                    format->mimetype,
+                                    format->width,
+                                    format->height,
+                                    framerate_numerator,
+                                    framerate_denominator);
     g_print ("%s\n", webcam_input);
 
     priv->webcam_source_bin = gst_parse_bin_from_description (webcam_input,