sys/oss/gstosssrc.*: OK, so people want offset in DEFAULT. This time, actually fix...

Original commit message from CVS:
* sys/oss/gstosssrc.c: (gst_osssrc_get_time), (gst_osssrc_get),
(gst_osssrc_src_query):
* sys/oss/gstosssrc.h:
OK, so people want offset in DEFAULT. This time, actually fix all
cases.
* sys/v4l2/gstv4l2src.c: (gst_v4l2src_getcaps):
Add FPS properly.

diff --git a/ChangeLog b/ChangeLog
index 14574e5..98909da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-10-25  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+       * sys/oss/gstosssrc.c: (gst_osssrc_get_time), (gst_osssrc_get),
+       (gst_osssrc_src_query):
+       * sys/oss/gstosssrc.h:
+         OK, so people want offset in DEFAULT. This time, actually fix all
+         cases.
+       * sys/v4l2/gstv4l2src.c: (gst_v4l2src_getcaps):
+         Add FPS properly.
+
 2004-10-24  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
        * gst/asfdemux/gstasfmux.c:

diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index 40bc0da..af20eeb 100644 (file)
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -768,6 +768,7 @@ gst_v4l2src_getcaps (GstPad * pad)
   int min_w, max_w, min_h, max_h;
   GSList *walk;
   GstStructure *structure;
+  gdouble fps;
 
   if (!GST_V4L2_IS_OPEN (GST_V4L2ELEMENT (v4l2src))) {
     return gst_caps_copy (gst_pad_get_pad_template_caps (pad));
@@ -776,6 +777,7 @@ gst_v4l2src_getcaps (GstPad * pad)
   /* build our own capslist */
   caps = gst_caps_new_empty ();
   walk = v4l2src->formats;
+  fps = gst_v4l2src_get_fps (v4l2src);
   while (walk) {
     format = (struct v4l2_fmtdesc *) walk->data;
     walk = g_slist_next (walk);
@@ -793,7 +795,7 @@ gst_v4l2src_getcaps (GstPad * pad)
       gst_structure_set (structure,
           "width", GST_TYPE_INT_RANGE, min_w, max_w,
           "height", GST_TYPE_INT_RANGE, min_h, max_h,
-          "framerate", GST_TYPE_DOUBLE_RANGE, (double) 0, G_MAXDOUBLE, NULL);
+          "framerate", G_TYPE_DOUBLE, fps, NULL);
 
       gst_caps_append_structure (caps, structure);
     }