Merge pull request #60 from tiagocoutinho/video-fix

tiagocoutinho · web-flow · commit ce749c707886 · 2025-05-06T17:17:49.000+02:00
Video fix
diff --git a/examples/video/basic_async.py b/examples/video/basic_async.py
@@ -31,7 +31,7 @@ async def run(device):
             if new - last_update > 0.1:
                 elapsed = new - start
                 print(
-                    f"frame {frame.frame_nb:04d} {len(frame)/1000:.1f} Kb at {fps:.1f} fps ; "
+                    f"frame {frame.frame_nb:04d} {len(frame) / 1000:.1f} Kb at {fps:.1f} fps ; "
                     f" data={data[0]}; {elapsed=:.2f} s;",
                     end="\r",
                 )
diff --git a/examples/video/basic_gevent.py b/examples/video/basic_gevent.py
@@ -33,7 +33,7 @@ def run(device):
             if new - last_update > 0.1:
                 elapsed = new - start
                 print(
-                    f"frame {frame.frame_nb:04d} {len(frame)/1000:.1f} Kb at {fps:.1f} fps ; "
+                    f"frame {frame.frame_nb:04d} {len(frame) / 1000:.1f} Kb at {fps:.1f} fps ; "
                     f"data={data[0]}; {elapsed=:.2f} s;",
                     end="\r",
                 )
diff --git a/examples/video/basic_sync.py b/examples/video/basic_sync.py
@@ -22,7 +22,7 @@ def run(args):
             if new - last_update > 0.1:
                 elapsed = new - start
                 print(
-                    f"frame {frame.frame_nb:04d} {len(frame)/1000:.1f} Kb at {fps:.1f} fps; {elapsed=:.2f} s;",
+                    f"frame {frame.frame_nb:04d} {len(frame) / 1000:.1f} Kb at {fps:.1f} fps; {elapsed=:.2f} s;",
                     end="\r",
                 )
                 last_update = new
diff --git a/examples/video/qt/grid.py b/examples/video/qt/grid.py
@@ -31,9 +31,6 @@ def close():
         logging.info("Stopping all cameras...")
         for qcamera in qcameras:
             qcamera.stop()
-        logging.info("waiting for cameras to stop...")
-        for qcamera in qcameras:
-            qcamera.wait()
         logging.info("Done!")
 
     app = QtWidgets.QApplication([])
diff --git a/examples/video/video_output.py b/examples/video/video_output.py
@@ -51,7 +51,7 @@ def run(args):
                         n = frame_n - last_n
                         rate = n / elapsed
                         print(
-                            f"Frame: {i:>8} | Elapsed: {now-start:>8.1f} s | Rate: {rate:>8.1f} fps | Skipped: {skipped:>8}",
+                            f"Frame: {i:>8} | Elapsed: {now - start:>8.1f} s | Rate: {rate:>8.1f} fps | Skipped: {skipped:>8}",
                             end="\r",
                         )
                         last = now
diff --git a/examples/video/video_output_multi.py b/examples/video/video_output_multi.py
@@ -64,7 +64,7 @@ def run(device_config):
                     n = frame_n - last_n
                     rate = n / elapsed
                     print(
-                        f"Frame: {i:>8} | Elapsed: {now-start:>8.1f} s | Rate: {rate:>8.1f} fps | Skipped: {skipped:>8}"
+                        f"Frame: {i:>8} | Elapsed: {now - start:>8.1f} s | Rate: {rate:>8.1f} fps | Skipped: {skipped:>8}"
                     )
                     last = now
                     last_n = frame_n
diff --git a/linuxpy/usb/ids/hid_usage.py b/linuxpy/usb/ids/hid_usage.py
@@ -266,7 +266,7 @@
             47: {"name": "[ and { (Bracket and Braces Left)"},
             48: {"name": "] and } (Bracket and Braces Right)"},
             49: {"name": "\\ and | (Backslash and Bar)"},
-            50: {"name": "# and ~ (Hash and Tilde, Non-US Keyboard near " "right shift)"},
+            50: {"name": "# and ~ (Hash and Tilde, Non-US Keyboard near right shift)"},
             51: {"name": "; and : (Semicolon and Colon)"},
             52: {"name": '´ and " (Accent Acute and Double Quotes)'},
             53: {"name": "` and ~ (Accent Grace and Tilde)"},
@@ -315,8 +315,8 @@
             97: {"name": "Keypad 8 and Up Arrow"},
             98: {"name": "Keypad 8 and Page Up"},
             99: {"name": "Keypad . (decimal delimiter) and Delete"},
-            100: {"name": "\\ and | (Backslash and Bar, UK and Non-US " "Keyboard near left shift)"},
-            101: {"name": "Keyboard Application (Windows Key for Win95 " "or Compose)"},
+            100: {"name": "\\ and | (Backslash and Bar, UK and Non-US Keyboard near left shift)"},
+            101: {"name": "Keyboard Application (Windows Key for Win95 or Compose)"},
             102: {"name": "Power (not a key)"},
             103: {"name": "Keypad = (Equal Sign)"},
             104: {"name": "F13"},
@@ -356,7 +356,7 @@
             138: {"name": "International 4 (PC98)"},
             139: {"name": "International 5 (PC98)"},
             140: {"name": "International 6 (PC98)"},
-            141: {"name": "International 7 (Toggle Single/Double Byte " "Mode)"},
+            141: {"name": "International 7 (Toggle Single/Double Byte Mode)"},
             142: {"name": "International 8"},
             143: {"name": "International 9"},
             144: {"name": "LANG 1 (Hangul/English Toggle, Korea)"},
diff --git a/linuxpy/usb/ids/klass.py b/linuxpy/usb/ids/klass.py
@@ -23,12 +23,12 @@
                     0: {"name": "None"},
                     1: {"name": "AT-commands (v.25ter)"},
                     2: {"name": "AT-commands (PCCA101)"},
-                    3: {"name": "AT-commands (PCCA101 + " "wakeup)"},
+                    3: {"name": "AT-commands (PCCA101 + wakeup)"},
                     4: {"name": "AT-commands (GSM)"},
                     5: {"name": "AT-commands (3G)"},
                     6: {"name": "AT-commands (CDMA)"},
-                    254: {"name": "Defined by command set " "descriptor"},
-                    255: {"name": "Vendor Specific (MSFT " "RNDIS?)"},
+                    254: {"name": "Defined by command set descriptor"},
+                    255: {"name": "Vendor Specific (MSFT RNDIS?)"},
                 },
                 "name": "Abstract (modem)",
             },
@@ -61,7 +61,7 @@
     5: {"name": "Physical Interface Device"},
     6: {
         "children": {
-            1: {"children": {1: {"name": "Picture Transfer Protocol " "(PIMA 15470)"}}, "name": "Still Image Capture"}
+            1: {"children": {1: {"name": "Picture Transfer Protocol (PIMA 15470)"}}, "name": "Still Image Capture"}
         },
         "name": "Imaging",
     },
@@ -72,7 +72,7 @@
                     0: {"name": "Reserved/Undefined"},
                     1: {"name": "Unidirectional"},
                     2: {"name": "Bidirectional"},
-                    3: {"name": "IEEE 1284.4 compatible " "bidirectional"},
+                    3: {"name": "IEEE 1284.4 compatible bidirectional"},
                     255: {"name": "Vendor Specific"},
                 },
                 "name": "Printer",
@@ -189,16 +189,16 @@
             1: {
                 "children": {
                     1: {"name": "Bluetooth"},
-                    2: {"name": "Ultra WideBand Radio " "Control"},
+                    2: {"name": "Ultra WideBand Radio Control"},
                     3: {"name": "RNDIS"},
                 },
                 "name": "Radio Frequency",
             },
             2: {
                 "children": {
-                    1: {"name": "Host Wire Adapter " "Control/Data Streaming"},
-                    2: {"name": "Device Wire Adapter " "Control/Data Streaming"},
-                    3: {"name": "Device Wire Adapter " "Isochronous Streaming"},
+                    1: {"name": "Host Wire Adapter Control/Data Streaming"},
+                    2: {"name": "Device Wire Adapter Control/Data Streaming"},
+                    3: {"name": "Device Wire Adapter Isochronous Streaming"},
                 },
                 "name": "Wireless USB Wire Adapter",
             },
@@ -211,7 +211,7 @@
             2: {
                 "children": {
                     1: {"name": "Interface Association"},
-                    2: {"name": "Wire Adapter Multifunction " "Peripheral"},
+                    2: {"name": "Wire Adapter Multifunction Peripheral"},
                 },
                 "name": "?",
             },
@@ -230,7 +230,7 @@
     },
     255: {
         "children": {
-            255: {"children": {255: {"name": "Vendor Specific " "Protocol"}}, "name": "Vendor Specific Subclass"}
+            255: {"children": {255: {"name": "Vendor Specific Protocol"}}, "name": "Vendor Specific Subclass"}
         },
         "name": "Vendor Specific Class",
     },
diff --git a/linuxpy/usb/ids/vendor.py b/linuxpy/usb/ids/vendor.py
diff --git a/linuxpy/video/device.py b/linuxpy/video/device.py
diff --git a/linuxpy/video/qt.py b/linuxpy/video/qt.py

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ async def run(device):`
`31`	`31`	`if new - last_update > 0.1:`
`32`	`32`	`elapsed = new - start`
`33`	`33`	`print(`
`34`		`- f"frame {frame.frame_nb:04d} {len(frame)/1000:.1f} Kb at {fps:.1f} fps ; "`
	`34`	`+ f"frame {frame.frame_nb:04d} {len(frame) / 1000:.1f} Kb at {fps:.1f} fps ; "`
`35`	`35`	`f" data={data[0]}; {elapsed=:.2f} s;",`
`36`	`36`	`end="\r",`
`37`	`37`	`)`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ def run(device):`
`33`	`33`	`if new - last_update > 0.1:`
`34`	`34`	`elapsed = new - start`
`35`	`35`	`print(`
`36`		`- f"frame {frame.frame_nb:04d} {len(frame)/1000:.1f} Kb at {fps:.1f} fps ; "`
	`36`	`+ f"frame {frame.frame_nb:04d} {len(frame) / 1000:.1f} Kb at {fps:.1f} fps ; "`
`37`	`37`	`f"data={data[0]}; {elapsed=:.2f} s;",`
`38`	`38`	`end="\r",`
`39`	`39`	`)`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ def run(args):`
`22`	`22`	`if new - last_update > 0.1:`
`23`	`23`	`elapsed = new - start`
`24`	`24`	`print(`
`25`		`- f"frame {frame.frame_nb:04d} {len(frame)/1000:.1f} Kb at {fps:.1f} fps; {elapsed=:.2f} s;",`
	`25`	`+ f"frame {frame.frame_nb:04d} {len(frame) / 1000:.1f} Kb at {fps:.1f} fps; {elapsed=:.2f} s;",`
`26`	`26`	`end="\r",`
`27`	`27`	`)`
`28`	`28`	`last_update = new`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ def run(args):`
`51`	`51`	`n = frame_n - last_n`
`52`	`52`	`rate = n / elapsed`
`53`	`53`	`print(`
`54`		`- f"Frame: {i:>8} \| Elapsed: {now-start:>8.1f} s \| Rate: {rate:>8.1f} fps \| Skipped: {skipped:>8}",`
	`54`	`+ f"Frame: {i:>8} \| Elapsed: {now - start:>8.1f} s \| Rate: {rate:>8.1f} fps \| Skipped: {skipped:>8}",`
`55`	`55`	`end="\r",`
`56`	`56`	`)`
`57`	`57`	`last = now`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ def run(device_config):`
`64`	`64`	`n = frame_n - last_n`
`65`	`65`	`rate = n / elapsed`
`66`	`66`	`print(`
`67`		`- f"Frame: {i:>8} \| Elapsed: {now-start:>8.1f} s \| Rate: {rate:>8.1f} fps \| Skipped: {skipped:>8}"`
	`67`	`+ f"Frame: {i:>8} \| Elapsed: {now - start:>8.1f} s \| Rate: {rate:>8.1f} fps \| Skipped: {skipped:>8}"`
`68`	`68`	`)`
`69`	`69`	`last = now`
`70`	`70`	`last_n = frame_n`