From 51b816025183801f5953d849fe4ea83cd9385582 Mon Sep 17 00:00:00 2001 From: Luke Hoersten Date: Mon, 15 Jun 2026 07:23:47 -0500 Subject: firmware: zero-copy JPEG → BGR888 → DSI hot path; Scrypted pre-rotates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Architectural rework of the /frame hot path. Scrypted now ships every JPEG already scaled + rotated to the panel's native dimensions (read from the firmware's /state response so nothing is hardcoded on the Scrypted side); the firmware decodes the JPEG straight into a BGR888 buffer that's directly draw_bitmap'able by the DSI driver, with zero CPU pixel work and zero rotation work in between. Firmware - jpeg_decoder now uses JPEG_DECODE_OUT_FORMAT_RGB888 + JPEG_DEC_RGB_ELEMENT_ORDER_BGR. Output buffer sized for 800*480*3. - New display_present_bgr888() is a one-liner that hands the decoder's output straight to esp_lcd_panel_draw_bitmap. - /frame handler validates dimensions against the panel-native VIEWPORT_PANEL_WIDTH x VIEWPORT_PANEL_HEIGHT (was effective_dims branching on orientation). Returns 400 if it's anything else. - /state JSON adds panel_width + panel_height so Scrypted can read them without hardcoding board-specific knowledge. - display_present_rgb565 + s_rot_buf stay for the local-screens cold path (info screen, loading) which still does its own CPU conversion + rotation — infrequent enough that it's not worth the rewrite. Scrypted - startStream() GETs /state at stream-start time, caches panel_width and panel_height in viewport storage, and uses them as the ffmpeg scale target. Falls back to cached or 800x480 if /state is mid-reboot. - For portrait viewports the ffmpeg pipeline now does scale=H:W:flags=lanczos,transpose=1 so the JPEG arrives pre-rotated 90° CW into panel-native dimensions. Landscape is just scale=W:H. - No more in-firmware rotation; Scrypted is the single source of truth for "how do I get this camera frame into a panel-shaped JPEG". Expected ceiling lift: ~5 fps → ~10 fps, gated by the JPEG decoder hardware throughput instead of the CPU rgb565→bgr888 + rotation loop. --- main/jpeg_decoder.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'main/jpeg_decoder.h') diff --git a/main/jpeg_decoder.h b/main/jpeg_decoder.h index 9c5bf89..2ac436d 100644 --- a/main/jpeg_decoder.h +++ b/main/jpeg_decoder.h @@ -7,7 +7,7 @@ #include "esp_err.h" #define JPEG_DECODER_MAX_INPUT_BYTES (1024 * 1024) // 1 MB -#define JPEG_DECODER_MAX_OUTPUT_BYTES (800 * 480 * 2) // RGB565 panel native +#define JPEG_DECODER_MAX_OUTPUT_BYTES (800 * 480 * 3) // BGR888 panel native // One-time setup of the ESP32-P4 hardware JPEG decoder. Allocates reusable // DMA-aligned input + output buffers in PSRAM. @@ -23,11 +23,12 @@ void jpeg_decoder_unlock(void); // JPEG_DECODER_MAX_INPUT_BYTES. Caller fills before calling decode. void *jpeg_decoder_input_buffer(void); -// Decode the JPEG sitting in the input buffer. Fills out_rgb565 with a -// pointer to the decoded RGB565 image and reports its width/height in -// pixels. The output buffer is owned by the decoder — valid only until -// the next jpeg_decoder_unlock(). +// Decode the JPEG sitting in the input buffer. Fills out_bgr888 with a +// pointer to the decoded 24-bit image (3 bytes/pixel, BGR memory order so +// the DSI engine + TC358762 + Pi panel render channels correctly) and +// reports the image's width/height in pixels. The output buffer is owned +// by the decoder — valid only until the next jpeg_decoder_unlock(). esp_err_t jpeg_decoder_decode(size_t jpeg_len, - void **out_rgb565, + void **out_bgr888, uint16_t *out_width, uint16_t *out_height); -- cgit v1.2.3