Add --rosella-filterbank and restore the public bank as the default
The Rosella path picks its analysis and synthesis bank instead of hard-coding one. Bank 1 is the shared public bank the renderer used before the captured variant landed: 13-tap hybrid filters, the 6-slot high-band delay and 961 samples of latency. Bank 2 is the captured Rosella bank: 11-tap filters, the 3-slot delay and 448 samples. Both keep their own coefficients, histories and flush behaviour. - Drive either bank through one RosellaBank interface, and derive the startup skip and the flush capacity from the selected bank - Add joc_rosella_filterbank to joc_task_config and joc_stream_config by replacing the reserved words (struct sizes unchanged, config version 3 -> 4) - Reject an out-of-range value and bank 2 without a Rosella model instead of silently falling back - Expose --rosella-filterbank 1|2 in the CLI with bank 1 as default, and reject it outside the personalized headphone path - Cover bank identity, chunking, reset and per-bank latency in tests - Document both banks, the selector and the CLI help Renders of --rosella-filterbank 1 (and the default) match the pre-merge reference byte for byte; --rosella-filterbank 2 matches the PR #3 reference byte for byte.
This commit is contained in:
1 parent
6674cb5386
commit
34a722f56a
19 files changed
+477
-34
No files matched your search
+13
-5
@@ -82,6 +82,7 @@ joc_cli input.m4a --binaural
|
||||
joc_cli input.m4a --binaural --sofa-hrtf HRTF/other.sofa # another SOFA
|
||||
joc_cli input.m4a --binaural --personalized-headphone # Rosella personalisation
|
||||
# -> output/<name>.binaural.wav
|
||||
joc_cli input.m4a --binaural --personalized-headphone --rosella-filterbank 2 # captured bank
|
||||
|
||||
# Other common switches
|
||||
joc_cli input.m4a --duration 30 --gain-db -3 --trajectory-mode dense64
|
||||
@@ -95,12 +96,19 @@ pass `continue`, `float32` or `abort`). `--duration` is in **seconds**, and
|
||||
`--binaural-tail-threshold` (1e-8, the binaural tail trim) keep the reference
|
||||
defaults. A run always writes `<output>.report.json` (`--report-json` overrides it).
|
||||
|
||||
**Differences from the reference:** `--sofa-hrtf`, `--personalized-headphone`,
|
||||
`--backend python` and the metadata sidecars (`--metadata-dir`, `--metadata-cache`,
|
||||
`--metadata-backend sidecar`) are unavailable in this build and fail immediately
|
||||
with an explanation instead of being ignored. This build adds `--bed` (pre-decoded
|
||||
`--rosella-filterbank 1|2` picks the filterbank of the Rosella `.personalized_headphone`
|
||||
path: `1` (default) is the public 13-tap / 6-slot bank, `2` is the captured 11-tap /
|
||||
3-slot bank. Their latencies are 961 and 448 samples, and each keeps its own
|
||||
coefficients, history and flush capacity. The option only applies to the Rosella
|
||||
model; the SOFA and `.jochrtf` paths reject it. See
|
||||
[Rosella filterbank](docs/rosella_filterbank.en.md).
|
||||
|
||||
**Differences from the reference:** `--backend python` and the metadata sidecars
|
||||
(`--metadata-dir`, `--metadata-cache`, `--metadata-backend sidecar`) are unavailable
|
||||
in this build and fail immediately with an explanation instead of being ignored.
|
||||
This build adds `--bed` (pre-decoded
|
||||
6-channel float32 PCM, which skips ffmpeg decoding), `--kernels`, `--work-dir`,
|
||||
`--report-json`, `--dry-run` and `--quiet`.
|
||||
`--report-json`, `--dry-run`, `--quiet` and `--rosella-filterbank`.
|
||||
|
||||
## Speaker layouts and channel order
|
||||
|
||||
|
||||
Reference in new issue
Block a user