From 2d2802aa8d3810508b00adcad4a886390a90745d Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Tue, 17 Oct 2006 11:28:50 +0000 Subject: sys/v4l2/: Numerator is numerator and denominator is denominator. Say that aloud 5 times and retry after next beer. Original commit message from CVS: * sys/v4l2/v4l2_calls.c: (gst_v4l2_fill_lists): * sys/v4l2/v4l2src_calls.c: (gst_v4l2src_set_fps), (gst_v4l2src_get_fps): Numerator is numerator and denominator is denominator. Say that aloud 5 times and retry after next beer. --- sys/v4l2/v4l2src_calls.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'sys/v4l2/v4l2src_calls.c') diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c index 64a1acac..303e674d 100644 --- a/sys/v4l2/v4l2src_calls.c +++ b/sys/v4l2/v4l2src_calls.c @@ -728,7 +728,7 @@ gst_v4l2src_set_fps (GstV4l2Src * v4l2src, guint * fps_n, guint * fps_d) GstV4l2Object *v4l2object = v4l2src->v4l2object; struct v4l2_streamparm stream; - GST_LOG_OBJECT (v4l2src, "setting fps %d, %d", *fps_n, *fps_d); + GST_LOG_OBJECT (v4l2src, "setting fps %d / %d", *fps_n, *fps_d); memset (&stream, 0x00, sizeof (struct v4l2_streamparm)); stream.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; @@ -738,16 +738,16 @@ gst_v4l2src_set_fps (GstV4l2Src * v4l2src, guint * fps_n, guint * fps_d) if (!(stream.parm.capture.capability & V4L2_CAP_TIMEPERFRAME)) goto no_timeperframe; - stream.parm.capture.timeperframe.denominator = *fps_n; - stream.parm.capture.timeperframe.numerator = *fps_d; + stream.parm.capture.timeperframe.numerator = *fps_n; + stream.parm.capture.timeperframe.denominator = *fps_d; if (ioctl (v4l2object->video_fd, VIDIOC_S_PARM, &stream) < 0) goto sparm_failed; - *fps_n = stream.parm.capture.timeperframe.denominator; - *fps_d = stream.parm.capture.timeperframe.numerator; + *fps_n = stream.parm.capture.timeperframe.numerator; + *fps_d = stream.parm.capture.timeperframe.denominator; - GST_LOG_OBJECT (v4l2src, "fps set to %d, %d", *fps_n, *fps_d); + GST_LOG_OBJECT (v4l2src, "fps set to %d / %d", *fps_n, *fps_d); return TRUE; @@ -796,8 +796,8 @@ gst_v4l2src_get_fps (GstV4l2Src * v4l2src, guint * fps_n, guint * fps_d) } /* Note: V4L2 gives us the frame interval, we need the frame rate */ - *fps_n = stream.parm.capture.timeperframe.denominator; - *fps_d = stream.parm.capture.timeperframe.numerator; + *fps_n = stream.parm.capture.timeperframe.numerator; + *fps_d = stream.parm.capture.timeperframe.denominator; GST_DEBUG_OBJECT (v4l2src, "frame rate returned by G_PARM: %d/%d fps", *fps_n, *fps_d); -- cgit