Merge pull request #759 from jluebbe/macrosilicon-video

driver/usbvideodriver: add basic MacroSilicon USB Video support

Author: jluebbe

labgrid/driver/usbvideodriver.py

@@ -28,6 +28,12 @@ def get_qualities(self):
                 ("mid", "image/jpeg,width=1280,height=720,framerate=15/2"),
                 ("high", "image/jpeg,width=1920,height=1080,framerate=10/1"),
                 ])
+        if match == (0x534d, 0x2109): # MacroSilicon
+            return ("mid", [
+                ("low", "image/jpeg,width=720,height=480,framerate=10/1"),
+                ("mid", "image/jpeg,width=1280,height=720,framerate=10/1"),
+                ("high", "image/jpeg,width=1920,height=1080,framerate=10/1"),
+                ])
         raise InvalidConfigError("Unkown USB video device {:04x}:{:04x}".format(*match))
 
     def select_caps(self, hint=None):
@@ -39,23 +45,37 @@ def select_caps(self, hint=None):
         raise InvalidConfigError("Unkown video format {} for device {:04x}:{:04x}".format(
             variant, self.video.vendor_id, self.video.model_id))
 
-    def get_pipeline(self):
+    def get_pipeline(self, path, caps, controls=None):
         match = (self.video.vendor_id, self.video.model_id)
         if match == (0x046d, 0x082d):
-            return "v4l2src device={} ! {} ! h264parse ! fdsink"
-        if match == (0x046d, 0x0892):
-            return "v4l2src device={} ! {} ! decodebin ! vaapipostproc ! vaapih264enc ! h264parse ! fdsink"  # pylint: disable=line-too-long
-        raise InvalidConfigError("Unkown USB video device {:04x}:{:04x}".format(*match))
+            controls = controls or "focus_auto=1"
+            inner = "h264parse"
+        elif match == (0x046d, 0x0892):
+            controls = controls or "focus_auto=1"
+            inner = None
+        elif match == (0x534d, 0x2109):
+            inner = None  # just forward the jpeg frames
+        else:
+            raise InvalidConfigError("Unkown USB video device {:04x}:{:04x}".format(*match))
+
+        pipeline = f"v4l2src device={path} "
+        if controls:
+            pipeline += f"extra-controls=c,{controls} "
+        pipeline += f"! {caps} "
+        if inner:
+            pipeline += f"! {inner} "
+        pipeline += "! matroskamux streamable=true ! fdsink"
+        return pipeline
 
     @Driver.check_active
-    def stream(self, caps_hint=None):
+    def stream(self, caps_hint=None, controls=None):
         caps = self.select_caps(caps_hint)
-        pipeline = self.get_pipeline()
+        pipeline = self.get_pipeline(self.video.path, caps, controls)
 
         tx_cmd = self.video.command_prefix + ["gst-launch-1.0", "-q"]
-        tx_cmd += pipeline.format(self.video.path, caps).split()
+        tx_cmd += pipeline.split()
         rx_cmd = ["gst-launch-1.0"]
-        rx_cmd += "fdsrc ! h264parse ! avdec_h264 ! glimagesink sync=false".split()
+        rx_cmd += "playbin uri=fd://0".split()
 
         tx = subprocess.Popen(
             tx_cmd,

labgrid/remote/client.py

@@ -1159,6 +1159,7 @@ def telnet(self):
     def video(self):
         place = self.get_acquired_place()
         quality = self.args.quality
+        controls = self.args.controls
         target = self._get_target(place)
         from ..driver.usbvideodriver import USBVideoDriver
         from ..driver.httpvideodriver import HTTPVideoDriver
@@ -1192,7 +1193,7 @@ def video(self):
                 mark = '*' if default == name else ' '
                 print("{} {:<10s} {:s}".format(mark, name, caps))
         else:
-            drv.stream(quality)
+            drv.stream(quality, controls=controls)
 
     def audio(self):
         place = self.get_acquired_place()
@@ -1703,6 +1704,8 @@ def main():
                                       help="start a video stream")
     subparser.add_argument('-q', '--quality', type=str,
                            help="select a video quality (use 'list' to show options)")
+    subparser.add_argument('-c', '--controls', type=str,
+                           help="configure v4l controls (such as 'focus_auto=0,focus_absolute=40')")
     subparser.set_defaults(func=ClientSession.video)
 
     subparser = subparsers.add_parser('audio', help="start a audio stream")