mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-04 14:25:08 +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> * feat(sports): live Vegas cards for the scoreboards (shared layer) One live element per game, drawn only when what the card shows changes, so a score changes on a card already crossing the panel. The shared part, so each scoreboard adopts it in a few lines: - src/common/sports_vegas.py: game_key, game_fingerprint (the whole game dict, frozen: no drawn field can be missed), dedupe_games, VegasCardCache, StickyOdds (odds a live poll left out stay drawn), finished_games / with_finished_games (a game that just went final keeps its card, after its league's live games; one a heuristic only judged over keeps its live state, so a tied end of regulation never shows FINAL early). - SportsScrollDisplay.make_vegas_renderer() is the override point; build_vegas_elements() and SportsScrollDisplayManager .get_vegas_elements_for() do the rest. A card's version includes its teams' ranks, which the renderer draws from the rankings cache. - SportsLiveSharedMixin._record_finished_game() / finished_games_snapshot(): held for FINISHED_GAME_TTL after it leaves the live list. A sport that does not implement make_vegas_renderer keeps its ordinary Vegas content, so no scoreboard changes until it opts in. scripts/render_plugin.py --vegas renders a plugin's Vegas block as the ticker lays it out, and --timeline stacks it at successive moments as the ticker would update it in place; the join is now render_pipeline.join_plugin_rows(). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * feat(vegas): keep live games in the ticker by default display.vegas_scroll.live_in_ticker now defaults to true: through a live game the marquee keeps running and the live scoreboard takes extra turns in it -- its cards updating in place while they scroll -- instead of the ticker giving way to the full-screen scoreboard. The new default would reach nobody on its own: every existing config holds an explicit false copied from the template (there was no control for it), and the template merge only adds missing keys. ConfigManager therefore turns a stored false on once, with a backup, and records live_in_ticker_migrated so a false chosen afterwards stays. The marker is never in the template. A "Keep live games in the ticker" checkbox under Vegas mode sets it. Tests that pin the full-screen takeover now say live_in_ticker=false. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(sports): a default _determine_game_type on SportsScrollDisplay render_vegas_card looked the method up with getattr and a None default, which static analysis (Codacy) reports as calling something that may not be callable. The base class now has the default -- the card type from the game's state -- and the plugins that define their own override it as before. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix: review follow-ups on the shared live-card layer - The reused Vegas renderer always gets the current rankings, empty included, so ranks cleared since are not kept drawn. - render_plugin.py: --timeline refuses --no-live (a timeline shows live elements changing), --timeline/--no-live need --vegas, and the Vegas paths create the output's directory like the display path does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
141 lines
5.3 KiB
Python
141 lines
5.3 KiB
Python
"""run_iteration() does no per-iteration static-mode bookkeeping.
|
|
|
|
Every iteration used to rebuild a set of STATIC-mode plugins -- asking each
|
|
plugin for its display mode and logging the result at INFO -- that nothing
|
|
ever read. The static pause is driven by _check_static_plugin_trigger(), which
|
|
looks at the next segment, not at that set.
|
|
"""
|
|
|
|
import logging
|
|
import threading
|
|
from types import SimpleNamespace
|
|
from unittest.mock import MagicMock
|
|
|
|
from src.plugin_system.base_plugin import VegasDisplayMode
|
|
from src.vegas_mode.config import VegasModeConfig
|
|
from src.vegas_mode.coordinator import VegasModeCoordinator
|
|
|
|
|
|
def _coordinator(plugins):
|
|
coord = VegasModeCoordinator.__new__(VegasModeCoordinator)
|
|
coord.vegas_config = VegasModeConfig.from_config({'display': {'vegas_scroll': {
|
|
'enabled': True, 'max_cycle_duration': 0}}})
|
|
coord.render_pipeline = MagicMock()
|
|
# The loop paces itself from these (#628); a MagicMock can't be compared.
|
|
coord.render_pipeline.frame_interval = 0.0
|
|
coord.render_pipeline.target_fps = 90
|
|
coord.stream_manager = MagicMock()
|
|
coord.display_manager = MagicMock()
|
|
coord.plugin_manager = SimpleNamespace(plugins=plugins, get_plugin=plugins.get)
|
|
coord.stats = {'cycles_completed': 0, 'interruptions': 0}
|
|
coord._state_lock = threading.Lock()
|
|
coord._is_active = True
|
|
coord._is_paused = False
|
|
coord._should_stop = False
|
|
coord._fps_last_health_log = 0.0
|
|
coord._fps_was_degraded = False
|
|
coord._live_priority_check = None
|
|
coord._live_priority_active = False
|
|
coord._interrupt_check = None
|
|
coord._interrupt_check_interval = 10
|
|
coord._update_callback = None
|
|
coord._update_tick_running = False
|
|
coord._check_static_plugin_trigger = lambda: None
|
|
coord.run_frame = lambda: True
|
|
return coord
|
|
|
|
|
|
def test_an_iteration_does_not_poll_every_plugin_for_its_mode(caplog):
|
|
static = MagicMock()
|
|
static.get_vegas_display_mode.return_value = VegasDisplayMode.STATIC
|
|
coord = _coordinator({'static-plugin': static})
|
|
|
|
with caplog.at_level(logging.INFO, logger='src.vegas_mode.coordinator'):
|
|
assert coord.run_iteration() is True
|
|
|
|
static.get_vegas_display_mode.assert_not_called()
|
|
assert not any('Static mode plugins' in r.getMessage() for r in caplog.records)
|
|
|
|
|
|
def _live_coordinator(live):
|
|
"""A coordinator running the real run_frame(), with a switchable live check.
|
|
|
|
live_in_ticker off: these pin the full-screen takeover, which is no longer
|
|
the default.
|
|
"""
|
|
coord = _coordinator({})
|
|
del coord.run_frame # the real one: it is what refuses frames while paused
|
|
coord.vegas_config = VegasModeConfig.from_config({'display': {'vegas_scroll': {
|
|
'enabled': True, 'max_cycle_duration': 0, 'continuous_scroll': True,
|
|
'live_in_ticker': False}}})
|
|
coord.render_pipeline.has_deferred.return_value = False
|
|
coord.render_pipeline.needs_extension.return_value = False
|
|
coord.render_pipeline.render_frame.return_value = True
|
|
coord._pending_config_update = False
|
|
coord._last_live_check = float('-inf')
|
|
coord._live_priority_check = lambda: live[0]
|
|
return coord
|
|
|
|
|
|
def test_vegas_resumes_after_a_live_priority_pause():
|
|
"""The pause for live content was only ever lifted from inside run_frame(),
|
|
which returns before reaching that check while paused -- so once live
|
|
content had interrupted the ticker, it never came back until a restart.
|
|
The display controller only calls run_iteration() when nothing preempts
|
|
Vegas, so an iteration starting while paused for live content resumes."""
|
|
live = ['nfl_live']
|
|
coord = _live_coordinator(live)
|
|
|
|
assert coord.run_iteration() is False
|
|
assert coord._is_paused and coord._live_priority_active
|
|
coord.render_pipeline.render_frame.assert_not_called()
|
|
|
|
live[0] = None
|
|
coord._last_live_check = float('-inf')
|
|
assert coord.run_iteration() is True
|
|
assert not coord._is_paused and not coord._live_priority_active
|
|
coord.render_pipeline.render_frame.assert_called()
|
|
|
|
|
|
def test_stop_clears_a_live_priority_pause():
|
|
coord = _live_coordinator(['nfl_live'])
|
|
coord._start_time = None
|
|
coord._restore_switch_interval = lambda: None
|
|
coord._remove_render_gate = lambda: None
|
|
coord.run_iteration()
|
|
assert coord._is_paused
|
|
|
|
coord.stop()
|
|
assert not coord._is_paused and not coord._live_priority_active
|
|
|
|
|
|
def test_iteration_length_ignores_wall_clock_steps(monkeypatch):
|
|
"""No RTC: the wall clock jumps when NTP first syncs. A forward step used
|
|
to end the iteration on its first frame."""
|
|
from src.vegas_mode import coordinator as coordinator_module
|
|
coord = _coordinator({})
|
|
coord.vegas_config = VegasModeConfig.from_config({'display': {'vegas_scroll': {
|
|
'enabled': True, 'max_cycle_duration': 10}}})
|
|
frames = [0]
|
|
|
|
def frame():
|
|
frames[0] += 1
|
|
return True
|
|
coord.run_frame = frame
|
|
clock = [1000.0]
|
|
wall = [1000.0]
|
|
|
|
def monotonic():
|
|
clock[0] += 0.5
|
|
return clock[0]
|
|
|
|
def wall_time():
|
|
wall[0] += 3600.0 # NTP stepping the wall clock forward
|
|
return wall[0]
|
|
monkeypatch.setattr(coordinator_module.time, 'monotonic', monotonic)
|
|
monkeypatch.setattr(coordinator_module.time, 'time', wall_time)
|
|
monkeypatch.setattr(coordinator_module.time, 'sleep', lambda s: None)
|
|
|
|
assert coord.run_iteration() is True
|
|
assert frames[0] > 1
|