[kamera commit] r81 - trunk/kamera

[codesite...@google.com]

Author: ugur.jnmbk
Date: Sun Mar 1 23:59:40 2009
New Revision: 81

Modified:
trunk/kamera/opencvwidget.py

Log:
assume no webcam has more than 60 fps

Modified: trunk/kamera/opencvwidget.py
==============================================================================
--- trunk/kamera/opencvwidget.py (original)
+++ trunk/kamera/opencvwidget.py Sun Mar 1 23:59:40 2009
@@ -26,8 +26,8 @@
fps = highgui.cvGetCaptureProperty(camera, highgui.CV_CAP_PROP_FPS)
highgui.cvSetCaptureProperty(camera,
highgui.CV_CAP_PROP_FRAME_WIDTH, 640)
highgui.cvSetCaptureProperty(camera,
highgui.CV_CAP_PROP_FRAME_HEIGHT, 480)
- #30 fps if cam gives no value
- if not fps > 0:
+ #30 fps if cam gives no value, assume no webcam has more than 60
fps
+ if not 61 > fps > 0:
timeout = 33
else:
timeout = 1000 / fps