f1e9dc7f30
## Purpose This PR includes some preparatory changes that are needed for an upcoming performant CJK font feature. The changes have no impact on render time and heap allocation for latin text. **Despite this, I think these changes stand on their own as a better font compression/decompression implementation.** ## Summary - Font decompressor rewrite: Replaced the 4-slot LRU group cache with a two-tier system — a page buffer (glyphs prewarmed before rendering begins) and a hot-group fallback (last decompressed group retained for non-prewarmed glyphs). - Byte-aligned compressed bitmap format: Glyph bitmaps within compressed groups are now stored row-padded rather than tightly packed before DEFLATE compression, improving compression ratios by making identical pixel rows produce identical byte patterns. Glyphs are compacted back to packed format on demand at render time. Reduces flash size by 155 KB. - Page prewarm system: Added `Page::collectText` and `Page::getDominantStyle` to extract per-style glyph requirements before rendering, and `GfxRenderer::prewarmFontCache` to pre-decompress only the groups needed for the dominant style — eliminating mid-render decompression for the common case. - UTF-8 robustness fixes: `utf8NextCodepoint` now validates continuation bytes and returns a replacement glyph on malformed input; `ChapterHtmlSlimParser` correctly preserves incomplete multi-byte sequences across word-buffer flush boundaries rather than splitting them. --- ### AI Usage While CrossPoint doesn't have restrictions on AI tools in contributing, please be transparent about their usage as it helps set the right context for reviewers. Did you use AI tools to help write this code? _**YES**_ Architecture and design was done by me, refined a bit by Claude. Code mostly by Claude, but not entirely.
56 lines
1.5 KiB
C++
56 lines
1.5 KiB
C++
#pragma once
|
|
|
|
#include <EpdFontFamily.h>
|
|
|
|
#include <cstdint>
|
|
#include <map>
|
|
#include <string>
|
|
|
|
class FontDecompressor;
|
|
|
|
class FontCacheManager {
|
|
public:
|
|
explicit FontCacheManager(const std::map<int, EpdFontFamily>& fontMap);
|
|
|
|
void setFontDecompressor(FontDecompressor* d);
|
|
|
|
void clearCache();
|
|
void prewarmCache(int fontId, const char* utf8Text, uint8_t styleMask = 0x0F);
|
|
void logStats(const char* label = "render");
|
|
void resetStats();
|
|
|
|
// Scan-mode API: called by GfxRenderer::drawText() during scan pass
|
|
bool isScanning() const;
|
|
void recordText(const char* text, int fontId, EpdFontFamily::Style style);
|
|
|
|
// The FontDecompressor pointer, needed by GfxRenderer::getGlyphBitmap()
|
|
FontDecompressor* getDecompressor() const { return fontDecompressor_; }
|
|
|
|
// RAII scope for two-pass prewarm pattern
|
|
class PrewarmScope {
|
|
public:
|
|
explicit PrewarmScope(FontCacheManager& manager);
|
|
~PrewarmScope();
|
|
void endScanAndPrewarm();
|
|
PrewarmScope(PrewarmScope&& other) noexcept;
|
|
PrewarmScope& operator=(PrewarmScope&&) = delete;
|
|
PrewarmScope(const PrewarmScope&) = delete;
|
|
PrewarmScope& operator=(const PrewarmScope&) = delete;
|
|
|
|
private:
|
|
FontCacheManager* manager_;
|
|
bool active_ = true;
|
|
};
|
|
PrewarmScope createPrewarmScope();
|
|
|
|
private:
|
|
const std::map<int, EpdFontFamily>& fontMap_;
|
|
FontDecompressor* fontDecompressor_ = nullptr;
|
|
|
|
enum class ScanMode : uint8_t { None, Scanning };
|
|
ScanMode scanMode_ = ScanMode::None;
|
|
std::string scanText_;
|
|
uint32_t scanStyleCounts_[4] = {};
|
|
int scanFontId_ = -1;
|
|
};
|