]> git.sesse.net Git - ffmpeg/commitdiff
Allow to set the frame rate in v4l2 devices
authorJosé Miguel Gonçalves <jose.goncalves@inov.pt>
Thu, 23 Sep 2010 09:16:05 +0000 (09:16 +0000)
committerLuca Abeni <lucabe72@email.it>
Thu, 23 Sep 2010 09:16:05 +0000 (09:16 +0000)
Patch by José Miguel Gonçalves (jose DOT goncalves AT inov DOT pt)

Originally committed as revision 25159 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavdevice/v4l2.c

index 6b85cf0594b0184d291fe8a9363437d316c02b05..035e41633d04d93b8463e5f57b736e95f12ed52b 100644 (file)
@@ -489,6 +489,33 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap)
         }
     }
 
+    if (ap->time_base.num && ap->time_base.den) {
+        struct v4l2_streamparm streamparm = { 0 };
+        struct v4l2_fract *tpf = &streamparm.parm.capture.timeperframe;
+
+        av_log(s1, AV_LOG_DEBUG, "Setting time per frame to %d/%d\n",
+               ap->time_base.num, ap->time_base.den);
+        streamparm.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        tpf->numerator = ap->time_base.num;
+        tpf->denominator = ap->time_base.den;
+        if (ioctl(s->fd, VIDIOC_S_PARM, &streamparm) != 0) {
+            av_log(s1, AV_LOG_ERROR,
+                   "ioctl set time per frame(%d/%d) failed\n",
+                   ap->time_base.num, ap->time_base.den);
+            return AVERROR(EIO);
+        }
+
+        if (ap->time_base.den != tpf->denominator ||
+            ap->time_base.num != tpf->numerator) {
+            av_log(s1, AV_LOG_INFO,
+                   "The driver changed the time per frame from %d/%d to %d/%d\n",
+                   ap->time_base.num, ap->time_base.den,
+                   tpf->numerator, tpf->denominator);
+            ap->time_base.num = tpf->numerator;
+            ap->time_base.den = tpf->denominator;
+        }
+    }
+
     return 0;
 }