summaryrefslogtreecommitdiffstats
path: root/testing/ptlib/ptlib-fixcamcrash.patch
blob: 10c6dd79f4cdc899b65e2cfe8a59de15763e0ff1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
--- ptlib-2.10.10/plugins/vidinput_v4l2/vidinput_v4l2.cxx.orig	2013-02-20 02:12:05.000000000 +0000
+++ ptlib-2.10.10/plugins/vidinput_v4l2/vidinput_v4l2.cxx	2013-03-08 00:07:18.812865388 +0000
@@ -30,9 +30,9 @@
  * Contributor(s): Guilhem Tardy (gtardy@salyens.com)
  *  Nicola Orru' <nigu@itadinanta.it>
  *
- * $Revision: 27739 $
- * $Author: rjongbloed $
- * $Date: 2012-05-30 18:49:09 -0500 (Wed, 30 May 2012) $
+ * $Revision: 29220 $
+ * $Author: ededu $
+ * $Date: 2013-03-07 18:22:08 +0000 (Thu, 07 Mar 2013) $
  */
 
 #pragma implementation "vidinput_v4l2.h"
@@ -219,9 +219,11 @@
     canSetFrameRate = videoStreamParm.parm.capture.capability & V4L2_CAP_TIMEPERFRAME;
     if (canSetFrameRate) {
       if (videoStreamParm.parm.capture.timeperframe.numerator == 0) {
-        PTRACE(1,"PVidInDev\tnumerator is zero and denominator is " << videoStreamParm.parm.capture.timeperframe.denominator << ", driver bug??");
-      }
-      PVideoDevice::SetFrameRate (videoStreamParm.parm.capture.timeperframe.denominator / videoStreamParm.parm.capture.timeperframe.numerator);
+        PTRACE(1,"PVidInDev\tDriver/webcam bug: numerator is zero and denominator is " << videoStreamParm.parm.capture.timeperframe.denominator << ", I assume it cannot set frame rate");
+        canSetFrameRate = PFalse;
+      } else
+        PVideoDevice::SetFrameRate (videoStreamParm.parm.capture.timeperframe.denominator / videoStreamParm.parm.capture.timeperframe.numerator);
+
     }
   }