From: <bi...@ke...> - 2008-08-13 08:34:04
|
CVS Root: /cvs/gstreamer Module: gst-plugins-good Changes by: bilboed Date: Wed Aug 13 2008 08:34:11 UTC Log message: * sys/v4l2/gstv4l2src.c: (gst_v4l2src_query): Properly set the maximum latency value, in the same way it is done in v4lsrc. * sys/v4l2/v4l2src_calls.c: Simplify fraction equality check, no need to use GValues for this. Modified files: . : ChangeLog sys/v4l2 : gstv4l2src.c v4l2src_calls.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.3667&r2=1.3668 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/sys/v4l2/gstv4l2src.c.diff?r1=1.97&r2=1.98 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/sys/v4l2/v4l2src_calls.c.diff?r1=1.86&r2=1.87 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v retrieving revision 1.3667 retrieving revision 1.3668 diff -u -d -r1.3667 -r1.3668 --- ChangeLog 12 Aug 2008 12:04:22 -0000 1.3667 +++ ChangeLog 13 Aug 2008 08:33:55 -0000 1.3668 @@ -1,3 +1,11 @@ +2008-08-13 Edward Hervey <edw...@co...> + + * sys/v4l2/gstv4l2src.c: (gst_v4l2src_query): + Properly set the maximum latency value, in the same way it is done in + v4lsrc. + * sys/v4l2/v4l2src_calls.c: + Simplify fraction equality check, no need to use GValues for this. 2008-08-12 Edward Hervey <edw...@co...> * sys/v4l2/gstv4l2src.c: (gst_v4l2src_query): Index: gstv4l2src.c RCS file: /cvs/gstreamer/gst-plugins-good/sys/v4l2/gstv4l2src.c,v retrieving revision 1.97 retrieving revision 1.98 diff -u -d -r1.97 -r1.98 --- gstv4l2src.c 12 Aug 2008 12:04:24 -0000 1.97 +++ gstv4l2src.c 13 Aug 2008 08:33:57 -0000 1.98 @@ -1089,8 +1089,7 @@ gst_util_uint64_scale_int (GST_SECOND, src->fps_d, src->fps_n); /* max latency is total duration of the frame buffer */ - /* FIXME: what to use here? */ - max_latency = 1 * min_latency; + max_latency = src->num_buffers * min_latency; GST_DEBUG_OBJECT (bsrc, "report latency min %" GST_TIME_FORMAT " max %" GST_TIME_FORMAT, Index: v4l2src_calls.c RCS file: /cvs/gstreamer/gst-plugins-good/sys/v4l2/v4l2src_calls.c,v retrieving revision 1.86 retrieving revision 1.87 diff -u -d -r1.86 -r1.87 --- v4l2src_calls.c 12 Aug 2008 12:04:24 -0000 1.86 +++ v4l2src_calls.c 13 Aug 2008 08:33:57 -0000 1.87 @@ -1132,19 +1132,10 @@ */ } -static gboolean -fractions_are_equal (gint num1, gint den1, gint num2, gint den2) -{ - GValue fraction1 = { 0, }, fraction2 = { - 0,}; - - g_value_init (&fraction1, GST_TYPE_FRACTION); - g_value_init (&fraction2, GST_TYPE_FRACTION); - gst_value_set_fraction (&fraction1, num1, den1); - gst_value_set_fraction (&fraction2, num2, den2); - /* we know we don't have to unset the values in this case */ - return (gst_value_compare (&fraction1, &fraction2) == GST_VALUE_EQUAL); -} +/* Note about fraction simplification + * n1/d1 == n2/d2 is also written as n1 == ( n2 * d1 ) / d2 + */ +#define fractions_are_equal(n1,d1,n2,d2) ((n1) == gst_util_uint64_scale_int((n2), (d1), (d2))) /****************************************************** * gst_v4l2src_set_capture(): |