Skip to content

Commit fe0a52b

Browse files
authored
Merge pull request #857 from jluebbe/usbvideo
driver/usbvideodriver: add support for newer C920 Webcam
2 parents 35f534a + bc8efbd commit fe0a52b

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

labgrid/driver/usbvideodriver.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ def get_qualities(self):
2828
("mid", "image/jpeg,width=1280,height=720,framerate=15/2"),
2929
("high", "image/jpeg,width=1920,height=1080,framerate=10/1"),
3030
])
31+
if match == (0x046d, 0x08e5): # Logitech HD Pro Webcam C920
32+
return ("mid", [
33+
("low", "image/jpeg,width=640,height=360,framerate=5/1"),
34+
("mid", "image/jpeg,width=1280,height=720,framerate=15/2"),
35+
("high", "image/jpeg,width=1920,height=1080,framerate=10/1"),
36+
])
3137
if match == (0x534d, 0x2109): # MacroSilicon
3238
return ("mid", [
3339
("low", "image/jpeg,width=720,height=480,framerate=10/1"),
@@ -54,6 +60,9 @@ def get_pipeline(self, path, caps, controls=None):
5460
elif match == (0x046d, 0x0892):
5561
controls = controls or "focus_auto=1"
5662
inner = None
63+
elif match == (0x046d, 0x08e5):
64+
controls = controls or "focus_auto=1"
65+
inner = None
5766
elif match == (0x534d, 0x2109):
5867
inner = None # just forward the jpeg frames
5968
else:

0 commit comments

Comments
 (0)