mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-04 06:15:09 +00:00
* perf(timing): say which render-thread work a late frame followed The soak already says how often a moving frame reached the panel late, but not what the render thread was doing just before it. Vegas does two kinds of work there between frames -- building its strip (compose, extend) and, with live elements, patching changed pixels into it -- and deciding whether either is affordable needs their own numbers. - FrameTimingRecorder.note_op(kind, nbytes) tags the next presented frame. Totals gain op_frames, late_op_frames, op_freezes and op_bytes per kind; aggregate() still takes frames without ops. The file schema is unchanged. - Vegas tags compose and every strip extension (with the bytes it copied). - frame_soak prints an "after work" table: frames, late %, freezes and MB moved per kind, only when something tagged its work. - render_bench gains --strip-screens (Vegas-sized strips), --patch-bytes / --patch-every / --patch-where (in-place column writes, as a live element update does) and --extend-every-screens / --extend-width (append + trim on a fixed cadence that holds the strip's width). No runtime behaviour changes: this is the measurement gate for live Vegas elements. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(changelog): note the frame-op attribution and bench modes Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * perf(scroll): build the strip's PIL image only when something reads it Every Vegas strip extension rebuilt ScrollHelper.cached_image from cached_array in full, twice (append, then trim), on the render thread: Image.fromarray is 1.7ms for an 8,000px strip and 3.8ms for 20,000px on a Pi 4 (measured on ledpi), about two thirds of an extension's render-thread cost. Nothing on the frame path reads the image's pixels; every frame is cut from the array. cached_image is now a property. append_content and drop_scrolled_prefix defer it; the first read builds it from the array it started with and keeps it only if the strip has not changed meanwhile, so a sync push racing an extension cannot leave a stale image cached. Assigning cached_image stores exactly what was assigned, as before. has_strip() says whether there is a strip without building its image; the helper's frame path, Vegas and the adapter's scroll-cache invalidation use it. The strip is also no longer held in memory twice. In Vegas the image is now built only by a multi-display sync push. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * feat(vegas): live elements -- a plugin API for content that changes while it scrolls Vegas bakes each plugin's pictures into one strip, so a card already on its way across the panel keeps what it showed when it was drawn. This adds the API and bookkeeping for content that can be updated in place; the worker that redraws and swaps it follows separately. No shipped plugin implements the hook yet, so nothing changes for users. Plugin API (core 3.8.0), all no-ops by default: - BasePlugin.get_vegas_elements() -> [VegasElement(key, image, version, live, refresh_hz)]: named, fixed-width pieces of Vegas content. - BasePlugin.redraw_vegas_element(key, width, height, at): a lock-free redraw for content that changes with time. - BasePlugin.notify_vegas_data_changed(): data that lands outside update(). - src/plugin_system/vegas_elements.py (VegasElement, re-exported from base_plugin). Core: - PluginAdapter asks a plugin that implements the hook for elements on the background fetch only (under its lock, on its own canvas); every other path keeps get_vegas_content(). Live elements are pinned (padded with content_padding, never trimmed), tagged with their key, digest and data epoch in Image.info so the existing cache and group plumbing carry them unchanged, and untagged if a width budget crops them. - RenderPipeline records where each live element lands (ElementRecord), in absolute strip columns a trim does not move; the block-start arithmetic is shared with the STATIC markers. - PluginManager update listeners (add/remove_update_listener, notify_data_changed): told the moment update() completes, not at the next ~4s Vegas poll. The coordinator uses one to move each plugin's data epoch on. - vegas_scroll.live_refresh (kill switch), live_max_hz, live_min_interval, live_lead_screens; per-plugin core-owned vegas_live. Live elements are off under multi-display sync, in swap mode and with offscreen_prefetch off. - scripts/check_plugin.py checks the element contract (src/plugin_system/testing/vegas.py); test/fixtures/plugins/vegas-live-stub is a working example. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * feat(vegas): live elements update in place while they scroll One background worker (src/vegas_mode/live_worker.py) redraws a plugin's live elements when its data epoch moves on (update listener) or on their refresh_hz, nearest the screen first, and hands changed pixels lock-free to the render thread, which copies them into the strip between frames (RenderPipeline.apply_live_patches, ScrollHelper.patch_columns): at most four patches or two screens of bytes a frame, no drawing or locks there. The worker takes over group prefetch once a live element is placed, runs inside the render gate, and is supervised. Update tick 1s while live elements exist. Web UI switch for live_refresh. OFFSCREEN_RENDERING.md describes what was built and why SegmentStrip was not needed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
212 lines
7.1 KiB
Python
212 lines
7.1 KiB
Python
"""The render thread's half of a live update: RenderPipeline.apply_live_patches.
|
|
|
|
Between two frames the render thread copies prepared pixels into the strip.
|
|
It must do nothing else there -- no drawing, no locks, a bounded number of
|
|
bytes -- and must refuse a patch that no longer fits: a strip rebuilt since,
|
|
an element trimmed away or already behind the screen, a patch older than what
|
|
the strip already shows.
|
|
"""
|
|
import sys
|
|
import threading
|
|
import time
|
|
from pathlib import Path
|
|
|
|
import numpy as np
|
|
import pytest
|
|
from PIL import Image
|
|
|
|
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
|
|
|
from src.vegas_mode import elements # noqa: E402
|
|
from src.vegas_mode.config import VegasModeConfig # noqa: E402
|
|
from src.vegas_mode.elements import ElementMeta, LivePatch # noqa: E402
|
|
from src.vegas_mode.render_pipeline import RenderPipeline # noqa: E402
|
|
|
|
W, H = 128, 32
|
|
|
|
|
|
def _live(key, width, seed):
|
|
rng = np.random.default_rng(seed)
|
|
pixels = rng.integers(20, 255, (H, width, 3), dtype=np.uint8)
|
|
image = Image.frombytes("RGB", (width, H), pixels.tobytes())
|
|
pinned, array = elements.pin_element(image, 8)
|
|
return elements.tag(pinned, ElementMeta("p", key, 1, elements.pixel_digest(array), 0.0, 0.0))
|
|
|
|
|
|
class _Stream:
|
|
def __init__(self, groups):
|
|
self.groups = groups
|
|
self.plugin_manager = type("PM", (), {"plugins": {}})()
|
|
self.plugin_adapter = None
|
|
self.i = 0
|
|
|
|
def get_grouped_content_for_composition(self):
|
|
return self.groups[0]
|
|
|
|
def get_active_plugin_ids(self):
|
|
return ["p"]
|
|
|
|
def take_next_group(self, count=None, offscreen_only=False):
|
|
self.i += 1
|
|
return self.groups[self.i] if self.i < len(self.groups) else []
|
|
|
|
|
|
class _Timing:
|
|
def __init__(self):
|
|
self.notes = []
|
|
|
|
def note_op(self, kind, nbytes=0):
|
|
self.notes.append((kind, nbytes))
|
|
|
|
|
|
class _DM:
|
|
width, height = W, H
|
|
|
|
def __init__(self):
|
|
self.image = Image.new("RGB", (W, H))
|
|
self.frame_timing = _Timing()
|
|
|
|
def set_scrolling_state(self, *a):
|
|
pass
|
|
|
|
def update_display(self):
|
|
pass
|
|
|
|
|
|
def _pipeline(n=6):
|
|
groups = [[("p", [_live(f"k{i}", 40, i) for i in range(n)])]]
|
|
p = RenderPipeline(VegasModeConfig(continuous_scroll=True, lead_in_width=0),
|
|
_DM(), _Stream(groups))
|
|
assert p.compose_scroll_content()
|
|
p.display_manager.frame_timing.notes.clear() # the compose's own note
|
|
return p
|
|
|
|
|
|
def _patch_for(p, record, value, epoch=None, gen=None):
|
|
pixels = np.full((H, record.width, 3), value, dtype=np.uint8)
|
|
pixels.setflags(write=False)
|
|
return LivePatch(seq=record.seq, strip_gen=p._strip_gen if gen is None else gen,
|
|
epoch=record.epoch if epoch is None else epoch, pixels=pixels,
|
|
digest=elements.pixel_digest(pixels), made_at=0.0)
|
|
|
|
|
|
def _offer(p, patch):
|
|
p._live_slots[patch.seq] = patch
|
|
p._live_ready.append(patch.seq)
|
|
|
|
|
|
def _columns(p, record):
|
|
x = record.abs_x - p._strip_origin
|
|
return p.scroll_helper.cached_array[:, x:x + record.width]
|
|
|
|
|
|
def test_a_patch_is_copied_into_its_columns_and_noted():
|
|
p = _pipeline()
|
|
record = p.live_records()[2]
|
|
_offer(p, _patch_for(p, record, 123))
|
|
assert p.apply_live_patches() == 1
|
|
assert (_columns(p, record) == 123).all()
|
|
assert p._applied[record.seq][1] == elements.pixel_digest(_columns(p, record))
|
|
assert p.display_manager.frame_timing.notes == [("patch", record.width * H * 3)]
|
|
|
|
|
|
def test_nothing_to_apply_costs_nothing():
|
|
p = _pipeline()
|
|
assert p.apply_live_patches() == 0
|
|
assert p.display_manager.frame_timing.notes == []
|
|
|
|
|
|
def test_at_most_four_patches_a_frame_the_rest_next_frame():
|
|
p = _pipeline()
|
|
for record in p.live_records():
|
|
_offer(p, _patch_for(p, record, 50))
|
|
assert p.apply_live_patches() == 4
|
|
assert p.apply_live_patches() == 2
|
|
|
|
|
|
def test_the_byte_budget_still_applies_one():
|
|
p = _pipeline(n=1)
|
|
record = p.live_records()[0]
|
|
big = LivePatch(seq=record.seq, strip_gen=p._strip_gen, epoch=1,
|
|
pixels=np.full((H, record.width, 3), 9, dtype=np.uint8),
|
|
digest=((H, record.width, 3), 1), made_at=0.0)
|
|
p.LIVE_PATCH_BUDGET_SCREENS = 0
|
|
_offer(p, big)
|
|
assert p.apply_live_patches() == 1
|
|
|
|
|
|
@pytest.mark.parametrize("why", ["old strip", "unknown element", "older data",
|
|
"behind the screen"])
|
|
def test_a_patch_that_no_longer_fits_is_dropped(why):
|
|
p = _pipeline()
|
|
record = p.live_records()[0]
|
|
before = _columns(p, record).copy()
|
|
patch = _patch_for(p, record, 77)
|
|
if why == "old strip":
|
|
patch = _patch_for(p, record, 77, gen=p._strip_gen - 1)
|
|
elif why == "unknown element":
|
|
patch = patch._replace(seq=999)
|
|
elif why == "older data":
|
|
p._applied[record.seq] = (5, p._applied[record.seq][1])
|
|
patch = _patch_for(p, record, 77, epoch=4)
|
|
else:
|
|
p.scroll_helper.scroll_position = record.abs_x + record.width + 1
|
|
_offer(p, patch)
|
|
assert p.apply_live_patches() == 0
|
|
assert np.array_equal(_columns(p, record), before)
|
|
|
|
|
|
def test_the_latest_patch_wins_and_its_duplicate_entry_is_harmless():
|
|
p = _pipeline()
|
|
record = p.live_records()[1]
|
|
_offer(p, _patch_for(p, record, 10))
|
|
_offer(p, _patch_for(p, record, 20)) # replaces the slot, queues seq again
|
|
assert p.apply_live_patches() == 1
|
|
assert (_columns(p, record) == 20).all()
|
|
assert not p._live_ready
|
|
|
|
|
|
def test_under_sync_nothing_is_applied_and_the_queue_is_emptied():
|
|
p = _pipeline()
|
|
record = p.live_records()[0]
|
|
before = _columns(p, record).copy()
|
|
p.sync_manager = object()
|
|
_offer(p, _patch_for(p, record, 5))
|
|
assert p.apply_live_patches() == 0
|
|
assert not p._live_ready and not p._live_slots
|
|
assert np.array_equal(_columns(p, record), before)
|
|
|
|
|
|
def test_the_render_thread_takes_no_lock_and_draws_nothing(monkeypatch):
|
|
# Another thread holds every lock a live update could involve; the render
|
|
# thread's apply must not care, and must not draw or rebuild the strip.
|
|
p = _pipeline()
|
|
locks = [p._prefetch_lock, threading.Lock()]
|
|
for lock in locks:
|
|
lock.acquire()
|
|
for name in ("new", "fromarray"):
|
|
monkeypatch.setattr(Image, name, lambda *a, **k: (_ for _ in ()).throw(
|
|
AssertionError("drew on the render thread")))
|
|
monkeypatch.setattr(np, "concatenate", lambda *a, **k: (_ for _ in ()).throw(
|
|
AssertionError("rebuilt the strip")))
|
|
try:
|
|
for record in p.live_records():
|
|
_offer(p, _patch_for(p, record, 3))
|
|
started = time.perf_counter()
|
|
applied = p.apply_live_patches() + p.apply_live_patches()
|
|
assert time.perf_counter() - started < 0.05
|
|
assert applied == 6
|
|
finally:
|
|
for lock in locks:
|
|
lock.release()
|
|
|
|
|
|
def test_the_view_is_published_each_frame():
|
|
p = _pipeline()
|
|
p.scroll_helper.set_pixels_per_frame(1)
|
|
assert p.render_frame()
|
|
view = p._view
|
|
assert view.abs_right - view.abs_left == W
|
|
assert view.abs_left == p._strip_origin + int(p.scroll_helper.scroll_position)
|
|
assert view.abs_end == p._strip_origin + p.scroll_helper.total_scroll_width
|