Rate control: rebuilt per-frame, wired in, and gated at zero drift
FINDINGS 26 stopped the session-5 rate controller before it shipped: it built a lam-ladder of independent whole-sequence encodes and picked frames off it, so SKIP blocks referenced reconstructions the decoder never saw -- 111 of 120 frames drifted. The fix is the structural one 26.1 said it had to be. vq_hybrid is now frame-drivable -- frame_ctx / decide / paint -- and encode() is a thin loop over it. Rate control drives the same three calls, bisects lam per frame under the leaky bucket, and feeds back the frame it actually emitted. The desync has no way to occur, and 09_ratectl_drift.py goes 111/120 -> 0/120. That test is now part of check.sh, which is ~2 min rather than ~40 s. Both overshoots on the worst sustained window are closed for under 1 dB, totals including audio: sasi 137.4 -> 109.5 KB/s (-0.60 dB), scsi 381.6 -> 280.0 KB/s (-0.91 dB). Zero frames hit the lam=800 cliff, so nothing was destroyed to get there. Rate control also makes the display path cheaper -- scsi's median drops 53.6% -> 47.1% -- because raising lam moves blocks to SKIP and V1. Two knobs measured rather than guessed. --rc-floor is worth 0.00 dB on that window and defaults to the profile lam, so rate control cannot regress content that already fits. --prefill defaults to 0 and is documented as a trap: it buys a permission to overshoot of exactly bucket/nframes, and on a 14-frame clip it disables the controller outright. FINDINGS 26.5 was wrong in both halves and 27.6 records it. _paint was not the bottleneck (14% of a frame, though vectorising it was still right at 17.1x) and the ladder was never "minutes" -- those were k-means in build(). What makes per-frame rate control affordable is that VQ.assign depends on neither lam nor prev, so it is cached one frame deep: a 12-step search over 120 frames costs 0.31 s against 49.1 s. Also caught: fixed-lam sasi was already 5% over target on 00020, the clip everyone called easy. Nothing noticed because the profile table quotes PSNR and not bitrate. check.sh: ALL GREEN. Claude-Session: https://claude.ai/code/session_01194oWYW8DQXK1SZ2DnChW6
This commit is contained in:
@@ -15,8 +15,10 @@ the mode headers would exploit.
|
||||
V4 four 2x2 codewords, 4 bytes
|
||||
RAW 16 literal palette indices -- the escape that makes lam=0 pixel-exact
|
||||
|
||||
Usage: python3 tools/analysis/08_mode_map.py <frames_dir> <out.webm> [--profile p]
|
||||
[--scale N]
|
||||
Usage: python3 tools/analysis/08_mode_map.py <frames_dir> <out.webm>
|
||||
[--profile sasi|scsi] [--scale N] [--lossless] [--fixed-lam]
|
||||
|
||||
--fixed-lam renders the pre-session-6 encoder (no rate control) instead.
|
||||
Output format follows the extension. Prefer .webm: GIF re-quantises to 256
|
||||
colours, which is a poor fit for output whose subject is colour fidelity.
|
||||
"""
|
||||
@@ -45,7 +47,14 @@ def main():
|
||||
prof = RC.PROFILES[sys.argv[sys.argv.index("--profile")+1]
|
||||
if "--profile" in sys.argv else "sasi"]
|
||||
m = H.build(src, k1=prof["k1"], k4=prof["k4"])
|
||||
enc = H.encode(m, lam=prof["lam"])
|
||||
# Rate-controlled by default, so the map shows the mode decisions that
|
||||
# actually ship. --fixed-lam renders the pre-session-6 encoder instead;
|
||||
# the difference is visible as V4/RAW collapsing to V1/SKIP on peak frames.
|
||||
if "--fixed-lam" in sys.argv:
|
||||
enc = H.encode(m, lam=prof["lam"])
|
||||
else:
|
||||
enc = RC.encode_rate_controlled(m, prof["kbps"],
|
||||
lam_lo=prof["lam"])
|
||||
pal, H_, W_ = m["pal"], m["H"], m["W"]
|
||||
nbx, nby = W_ // 4, H_ // 4
|
||||
|
||||
|
||||
Reference in New Issue
Block a user