RGBMatrixEmulator 0.18.0__tar.gz → 0.18.2__tar.gz

{rgbmatrixemulator-0.18.0 → rgbmatrixemulator-0.18.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RGBMatrixEmulator
-Version: 0.18.0
+Version: 0.18.2
 Summary: A PC emulator for Raspberry Pi LED matrices driven by rpi-rgb-led-matrix
 Project-URL: Homepage, https://github.com/ty-porter/RGBMatrixEmulator
 Author-email: Tyler Porter <tyler.b.porter@gmail.com>
@@ -20,7 +20,7 @@ Requires-Python: >=3.10
 Requires-Dist: bdfparser<=2.2.0
 Requires-Dist: numpy>=1.2.0
 Requires-Dist: pillow>=10.0.1
-Requires-Dist: tornado>=6.5.5
+Requires-Dist: tornado>=6.5.7
 Provides-Extra: pygame
 Requires-Dist: pygame<3,>=2.0.1; extra == 'pygame'
 Provides-Extra: sixel

{rgbmatrixemulator-0.18.0 → rgbmatrixemulator-0.18.2}/RGBMatrixEmulator/adapters/browser_adapter/adapter.py

@@ -35,6 +35,8 @@ class BrowserAdapter(BaseAdapter):
                 self.default_image_format.lower()
             )
 
+        self._encode_kwargs = self.__build_encode_kwargs()
+
         # Default icon path is browser adapter assets
         self.default_icon_path = str(
             (Path(__file__).parent / "static" / "assets" / "icon.ico").resolve()
@@ -61,7 +63,7 @@ class BrowserAdapter(BaseAdapter):
                 bytesIO,
                 self.image_format,
                 quality=self.options.browser.quality,
-                optimize=True,
+                **self._encode_kwargs,
             )
             self.image = bytesIO.getvalue()
 
@@ -78,3 +80,10 @@ class BrowserAdapter(BaseAdapter):
             except Exception as e:
                 Logger.exception("Failed to open a browser window")
                 Logger.exception(e)
+
+    def __build_encode_kwargs(self) -> dict:
+        # use libwebp's realtime encoder
+        if self.image_format == "WebP":
+            return {"method": 0}
+
+        return {}

{rgbmatrixemulator-0.18.0 → rgbmatrixemulator-0.18.2}/RGBMatrixEmulator/adapters/browser_adapter/request_handlers/image_web_socket.py

@@ -41,6 +41,14 @@ class ImageWebSocketHandler(tornado.websocket.WebSocketHandler):
         ImageWebSocketHandler.clients.add(self)
         Logger.info("WebSocket opened from: " + self.request.remote_ip)
 
+        # Push the current frame immediately so a newly-connected client sees the
+        # display right away instead of waiting for the next changed frame.
+        if ImageWebSocketHandler.adapter.image:
+            io_loop = tornado.ioloop.IOLoop.current()
+            io_loop.add_callback(
+                self.write_message, ImageWebSocketHandler.adapter.image, binary=True
+            )
+
     def on_message(self, _message):
         if not ImageWebSocketHandler.adapter.image:
             Logger.warning(

{rgbmatrixemulator-0.18.0 → rgbmatrixemulator-0.18.2}/RGBMatrixEmulator/adapters/browser_adapter/static/assets/client.js

@@ -3,7 +3,8 @@
     const FPS_DEFAULT     = 60;   // seconds
     const FPS_UPDATE_RATE = 300;  // milliseconds
 
-    const img       = document.getElementById("liveImg");
+    const canvas    = document.getElementById("liveImg");
+    const ctx       = canvas.getContext("2d", { alpha: false });
     const fpsText   = document.getElementById("fps");
     const fpsTarget = parseInt(document.getElementById("targetFps").value) || FPS_DEFAULT;
 
@@ -50,11 +51,15 @@
         ws.onmessage = function(evt) {
             nFrames++;
 
-            const arrayBuffer = evt.data;
-            const blob = new Blob([new Uint8Array(arrayBuffer)], { type: "image/jpeg" });
-            const old_img = img.src.slice()
-            img.src = window.URL.createObjectURL(blob);
-            window.URL.revokeObjectURL(old_img);
+            const blob = new Blob([evt.data], { type: IMAGE_MIME });
+            createImageBitmap(blob).then((bitmap) => {
+                if (canvas.width !== bitmap.width || canvas.height !== bitmap.height) {
+                    canvas.width  = bitmap.width;
+                    canvas.height = bitmap.height;
+                }
+                ctx.drawImage(bitmap, 0, 0);
+                bitmap.close();
+            }).catch(() => {});
 
             if (fpsText) {
                 const endTime = performance.now();

{rgbmatrixemulator-0.18.0 → rgbmatrixemulator-0.18.2}/RGBMatrixEmulator/adapters/browser_adapter/static/assets/styles.css

@@ -4,11 +4,12 @@ body {
   font-family: monospace;
 }
 
-img#liveImg {
+#liveImg {
   border: 1px solid gray;
+  image-rendering: pixelated;
 }
 
-img#liveImg.no-border {
+#liveImg.no-border {
   border: none;
 }
 

{rgbmatrixemulator-0.18.0 → rgbmatrixemulator-0.18.2}/RGBMatrixEmulator/adapters/browser_adapter/static/index.html

@@ -6,7 +6,7 @@
       <link rel="stylesheet" href="assets/styles.css">
    </head>
    <body>
-      <img id="liveImg" class={{ "" if adapter.options.browser.image_border else "no-border" }} />
+      <canvas id="liveImg" class={{ "" if adapter.options.browser.image_border else "no-border" }}></canvas>
 
       {% if adapter.options.browser.fps_display %}
          <div id="fpsDisplay">
@@ -139,6 +139,7 @@
 
       <input id="targetFps" type="hidden" value={{ adapter.options.browser.target_fps }} />
 
+      <script>const IMAGE_MIME = "image/{{ adapter.image_format.lower() }}";</script>
       <script type="text/javascript" src="assets/client.js"></script>
    </body>
 </html>

{rgbmatrixemulator-0.18.0 → rgbmatrixemulator-0.18.2}/RGBMatrixEmulator/adapters/raw_adapter/__init__.py

@@ -15,7 +15,11 @@ class RawAdapter(BaseAdapter):
     def __init__(self, width, height, options):
         super().__init__(width, height, options)
 
-        self._reset()
+        self.frames = {}
+        self.frame = 0
+
+        self.halt_after = RawAdapter.DEFAULT_MAX_FRAME
+        self.halt_fn = lambda: 1 + 1
 
     def draw_to_screen(self, pixels):
         self.frames[self.frame] = pixels
@@ -37,10 +41,3 @@ class RawAdapter(BaseAdapter):
 
     def _last_frame(self):
         return self.frames[self.frame - 1]
-
-    def _reset(self):
-        self.frames = {}
-        self.frame = 0
-
-        self.halt_after = RawAdapter.DEFAULT_MAX_FRAME
-        self.halt_fn = lambda: 1 + 1

{rgbmatrixemulator-0.18.0 → rgbmatrixemulator-0.18.2}/RGBMatrixEmulator/emulation/canvas.py

@@ -25,20 +25,14 @@ class Canvas:
         self.display_adapter.load_emulator_window()
 
     def Clear(self) -> None:
-        self.__pixels = np.full(
-            self.__pdims, self.__create_pixel((0, 0, 0)), dtype=np.uint8
-        )
+        self.__pixels = np.full(self.__pdims, (0, 0, 0), dtype=np.uint8)
 
     def Fill(self, r: int, g: int, b: int) -> None:
-        self.__pixels = np.full(
-            self.__pdims, self.__create_pixel((r, g, b)), dtype=np.uint8
-        )
+        self.__pixels = np.full(self.__pdims, (r, g, b), dtype=np.uint8)
 
     def SetPixel(self, x: int, y: int, r: int, g: int, b: int) -> None:
-        if self.__pixel_out_of_bounds(x, y):
-            return
-
-        self.__pixels[int(y)][int(x)] = self.__create_pixel((r, g, b))
+        if 0 <= x < self.width and 0 <= y < self.height:
+            self.__pixels[int(y), int(x)] = (r, g, b)
 
     def SetImage(
         self,
@@ -47,9 +41,6 @@ class Canvas:
         offset_y: int = 0,
         unsafe: bool = True,
     ) -> None:
-        enhancer = ImageEnhance.Brightness(image)
-        image = enhancer.enhance(self.brightness / 100.0)
-
         original = Image.fromarray(self.__pixels, "RGB")
         original.paste(image, (offset_x, offset_y))
         self.__pixels = np.copy(original)  # type: ignore
@@ -69,27 +60,13 @@ class Canvas:
 
         self.options.brightness = value
 
-    def __create_pixel(self, pixel):
-        return self.__adjust_brightness(tuple(pixel), self.brightness / 100.0)
-
-    def __pixel_out_of_bounds(self, x, y):
-        if x < 0 or x >= self.width:
-            return True
-
-        if y < 0 or y >= self.height:
-            return True
-
-        return False
-
-    def __adjust_brightness(self, pixel, alpha, to_int=False):
-        if to_int:
-            return tuple(int(channel) for channel in pixel)
-
-        return tuple(channel * alpha for channel in pixel)
-
     # These are delegated to the display adapter to handle specific implementation.
     def draw_to_screen(self) -> None:
-        self.display_adapter.draw_to_screen(self.__screen.render(self.__pixels))
+        # Handle brightness across the entire pixel buffer as soon as it's ready to draw.
+        alpha = self.brightness / 100.0
+        pixels = (self.__screen.render(self.__pixels) * alpha).astype(np.uint8)
+
+        self.display_adapter.draw_to_screen(pixels)
 
     def check_for_quit_event(self) -> None:
         self.display_adapter.check_for_quit_event()

{rgbmatrixemulator-0.18.0 → rgbmatrixemulator-0.18.2}/RGBMatrixEmulator/graphics/__init__.py

@@ -12,18 +12,28 @@ def validate_color(func):
     """
     Decorator to validate that the 'color' argument is of type Color.
     If not, attempts to map to the rpi-rgb-led-matrix error message.
+
+    The 'color' parameter's position is resolved once at decoration time so the
+    per-call path is just a lookup and an isinstance check -- these draw
+    functions run in tight per-frame loops, so inspecting the signature on every
+    call (signature/bind/apply_defaults) is far too expensive.
     """
+    try:
+        color_index = list(signature(func).parameters).index("color")
+    except ValueError:
+        color_index = None
 
     @wraps(func)
     def wrapper(*args, **kwargs):
-        # Map positional + keyword args to parameter names
-        sig = signature(func)
-        bound = sig.bind(*args, **kwargs)
-        bound.apply_defaults()
-
-        if "color" in bound.arguments:
-            value = bound.arguments["color"]
-            if not isinstance(value, Color):
+        value = None
+
+        if color_index is not None:
+            if "color" in kwargs:
+                value = kwargs["color"]
+            elif color_index < len(args):
+                value = args[color_index]
+
+            if value is not None and not isinstance(value, Color):
                 expected = f"{Color.__module__}.{Color.__qualname__}"
                 actual = f"{type(value).__module__}.{type(value).__qualname__}"
                 raise TypeError(

{rgbmatrixemulator-0.18.0 → rgbmatrixemulator-0.18.2}/RGBMatrixEmulator/version.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
 
 # package version
-__version__ = "0.18.0"
+__version__ = "0.18.2"
 """Installed version of RGBMatrixEmulator."""

{rgbmatrixemulator-0.18.0 → rgbmatrixemulator-0.18.2}/pyproject.toml

@@ -35,7 +35,7 @@ dependencies = [
     "bdfparser<=2.2.0",
     "numpy>=1.2.0",
     "Pillow>=10.0.1",
-    "tornado>=6.5.5",
+    "tornado>=6.5.7",
 ]
 
 [project.scripts]