|
 |
802e20 |
diff --cc libcheese/cheese-camera-device.c
|
|
|
802e20 |
index e994c5f5,8f1e13af..00000000
|
|
|
802e20 |
--- a/libcheese/cheese-camera-device.c
|
|
|
802e20 |
+++ b/libcheese/cheese-camera-device.c
|
|
|
802e20 |
@@@ -181,18 -219,8 +181,19 @@@ cheese_camera_device_filter_caps (Chees
|
|
|
802e20 |
{
|
|
|
802e20 |
GstCaps *filter;
|
|
|
802e20 |
GstCaps *allowed;
|
|
|
802e20 |
+ gsize i;
|
|
|
802e20 |
+
|
|
|
802e20 |
+ filter = gst_caps_new_empty ();
|
|
|
802e20 |
|
|
|
802e20 |
- filter = format_caps (formats);
|
|
|
802e20 |
+ for (i = 0; formats[i] != NULL; i++)
|
|
|
802e20 |
+ {
|
|
|
802e20 |
+ gst_caps_append (filter,
|
|
|
802e20 |
+ gst_caps_new_simple (formats[i],
|
|
|
802e20 |
+ "framerate", GST_TYPE_FRACTION_RANGE,
|
|
|
802e20 |
+ 0, 1, CHEESE_MAXIMUM_RATE, 1,
|
|
|
802e20 |
++ "format", G_TYPE_STRING, "YUY2",
|
|
|
802e20 |
+ NULL));
|
|
|
802e20 |
+ }
|
|
|
802e20 |
|
|
|
802e20 |
allowed = gst_caps_intersect (caps, filter);
|
|
|
802e20 |
|
|
|
802e20 |
diff --git a/libcheese/cheese-camera-device-monitor.c b/libcheese/cheese-camera-device-monitor.c
|
|
|
802e20 |
index 5b4b43b5..a15733bd 100644
|
|
|
802e20 |
--- a/libcheese/cheese-camera-device-monitor.c
|
|
|
802e20 |
+++ b/libcheese/cheese-camera-device-monitor.c
|
|
|
802e20 |
@@ -294,7 +294,7 @@ initable_init (GInitable *initable,
|
|
|
802e20 |
gst_bus_add_watch (bus, cheese_camera_device_monitor_bus_func, monitor);
|
|
|
802e20 |
gst_object_unref (bus);
|
|
|
802e20 |
|
|
|
802e20 |
- caps = gst_caps_new_empty_simple ("video/x-raw");
|
|
|
802e20 |
+ caps = gst_caps_new_simple ("video/x-raw", "format", G_TYPE_STRING, "YUY2", NULL);
|
|
|
802e20 |
gst_device_monitor_add_filter (priv->monitor, "Video/Source", caps);
|
|
|
802e20 |
gst_caps_unref (caps);
|
|
|
802e20 |
|