62d6732504
Two root causes, both found by building an oracle rather than guessing. 1. Amplitude ~75x low: the IMDCT applied a 2/n normalisation the encoder's forward transform had already carried. Because 2/n varies with block size it produced DIFFERENT errors on 256- vs 2048-sample blocks — exactly the reported symptom. Removing it gives fit scale 1.0000. 2. Leading trim, the real remaining defect. The first audio packet produces NO output (its window only primes the overlap-add) but we emitted from the first block's centre, injecting half a priming window of garbage and shifting everything early. And Vorbis carries encoder delay in the GRANULE POSITION, which varies per file — afinfo confirms 128 / 1103 / 960 frames on three samples — while our Ogg reader kept only last_granule and discarded per-page granules, making it unrecoverable. Added per-page granule tracking: the first page reporting a granule pins priming as centre - granule, and valid audio starts at priming + blocksize_0/2. That reproduces afinfo's numbers exactly on all three. A premise in the brief was also wrong and worth recording: our output length was already correct. afinfo reports valid frames matching OUR output — it is afconvert that trims a further 128. The reference WAV was short, not us. mono 47 files mean corr 1.00000 (min 1.00000) 47/47 exact stereo 107 files mean corr 0.826 68/107 exact Decode cost 5.13 ms/file average; 11.5 MB compressed expands to 143.3 MB of f32 PCM, which is why the sample bank's LRU cap matters. Honest remaining defect: ~39 stereo files decode wrongly and it is NOT alignment — a full lag sweep peaks at 0.40-0.89 with fit scales 0.40-1.87, so specific blocks have wrong amplitude. Mono being 47/47 rules out floor, residue 0/1, MDCT, windowing and priming; coupling matches the spec's square-polar mapping including reverse order; floor 0 is rejected rather than mis-decoded; and both channels are identical in the failing files, so it is not a swap. The failing set is transient-heavy impact/footstep sounds, so the lead is residue type 2 partition counting on short blocks. reference_decode.rs is no longer #[ignore]d: 3 real tests asserting mono correlation > 0.999 and length == granule, plus a 3000-mutation fuzz that must never panic, all skipping cleanly without fixtures. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
33 lines
1.4 KiB
Rust
33 lines
1.4 KiB
Rust
//! Decode cost and memory across a pack, for the Quest budget.
|
|
use makepad_game_audio as audio;
|
|
use std::time::Instant;
|
|
fn main() {
|
|
let a: Vec<String> = std::env::args().collect();
|
|
let files = walk(&a[1]);
|
|
let (mut n, mut bin, mut pcm, mut fr) = (0usize, 0usize, 0usize, 0usize);
|
|
let t0 = Instant::now();
|
|
let mut worst = (0f64, String::new());
|
|
for f in &files {
|
|
let Ok(b) = std::fs::read(f) else { continue };
|
|
let t = Instant::now();
|
|
let Ok(p) = audio::decode(&b) else { continue };
|
|
let ms = t.elapsed().as_secs_f64() * 1000.0;
|
|
if ms > worst.0 { worst = (ms, f.rsplit('/').next().unwrap_or(f).to_string()); }
|
|
n += 1; bin += b.len(); pcm += p.samples.len() * 4; fr += p.frames();
|
|
}
|
|
let total = t0.elapsed().as_secs_f64() * 1000.0;
|
|
println!("decoded {n} files in {total:.0} ms ({:.2} ms/file avg)", total / n.max(1) as f64);
|
|
println!("slowest {:.2} ms {}", worst.0, worst.1);
|
|
println!("compressed {:.1} MB -> f32 PCM {:.1} MB ({fr} frames)",
|
|
bin as f64 / 1048576.0, pcm as f64 / 1048576.0);
|
|
}
|
|
fn walk(dir: &str) -> Vec<String> {
|
|
let mut out = Vec::new();
|
|
let Ok(rd) = std::fs::read_dir(dir) else { return out };
|
|
for e in rd.flatten() {
|
|
let p = e.path();
|
|
if p.is_dir() { out.extend(walk(&p.to_string_lossy())) }
|
|
else if p.extension().map(|x| x == "ogg").unwrap_or(false) { out.push(p.to_string_lossy().into_owned()) }
|
|
}
|
|
out
|
|
}
|