sys/v4l/gstv4lsrc.c (gst_v4lsrc_fixate): Also fixate the framerate. Need to get a...

Original commit message from CVS:
2005-07-07  Andy Wingo  <wingo@pobox.com>

* sys/v4l/gstv4lsrc.c (gst_v4lsrc_fixate): Also fixate the
framerate. Need to get a handle on when exactly this function is
called, tho.

diff --git a/ChangeLog b/ChangeLog
index 2f9e4d8cf82eb704cf0430276a38c9189e376a01..0d10403b9bd3c626971df31f9d2268776b6ae702 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-07-07  Andy Wingo  <wingo@pobox.com>
 
+       * sys/v4l/gstv4lsrc.c (gst_v4lsrc_fixate): Also fixate the
+       framerate. Need to get a handle on when exactly this function is
+       called, tho.
+
        * sys/v4l/v4lsrc_calls.h:
        * sys/v4l/v4lsrc_calls.c: Remove sync-related stuff.
        (gst_v4lsrc_get_fps_list): Moved here from gstv4lsrc.c.

diff --git a/sys/v4l/gstv4lsrc.c b/sys/v4l/gstv4lsrc.c
index adcffb95ad64b7f75282b21497ae9f1a53a65994..e1071cc3033e5ec0ef977aa811a68d6ceaadd648 100644 (file)
--- a/sys/v4l/gstv4lsrc.c
+++ b/sys/v4l/gstv4lsrc.c
@@ -187,7 +187,8 @@ gst_v4lsrc_get_property (GObject * object,
   }
 }
 
-G_GNUC_UNUSED static void
+/* this function is a bit of a last resort */
+static void
 gst_v4lsrc_fixate (GstPad * pad, GstCaps * caps)
 {
   GstStructure *structure;
@@ -224,6 +225,8 @@ gst_v4lsrc_fixate (GstPad * pad, GstCaps * caps)
         targetwidth);
     gst_caps_structure_fixate_field_nearest_int (structure, "height",
         targetheight);
+    gst_caps_structure_fixate_field_nearest_double (structure, "framerate",
+        7.5);
   }
 }