Put the CBA bed height row on the 62-level grid and render PCM 2.0/5.1/7.1 binaurally

The height row of the bed reference coordinates sits at ADM 62-level steps
15/62 and 47/62, not at the room corners: Tfl/Tfr, Tsl/Tsr and Tbl/Tbr move
from x = -1 / 1 to -0.516113 / 0.516113, which puts their Q15 numerators at
7928 / 24840 so every bed channel lands on its reference position instead of
being snapped to the nearest neighbour. Lw/Rw keep Y = 21/31 (5285). The
ADM-to-Q15 conversion scales by 32768, the full scale the renderer divides
by, so half-step positions such as 16384 and 7928 are no longer one count
low.

5.1, 5.1.2 and 5.1.4 keep their single surround pair at the rear corners
(y = 32767) instead of y = 16384. That family has no side pair, so its Ls/Rs
is the rear pair, which is the same point the multichannel PCM virtual
sources use; 7.1.x and 9.1.x keep Ls/Rs at 0.5 and Lrs/Rrs at 1.

Add the multichannel PCM binaural path. src/multichannel_binaural.py maps the
2.0 / 5.1 / 7.1 WAV channel order to synthetic objects (LFE on slot 0, the
full-band channels on slots 1..N in ffmpeg order, the remaining slots
silent), resamples the input to the native 48 kHz and drives the Rosella or
.jochrtf adapter. FixedPositionTimeline gives those static directions the
positions_at interface the OAMD timeline exposes, and both adapters accept an
optional fixed_positions argument instead of deriving a timeline from bed
labels.

Checked: the fifteen bed labels convert to the reference Q15 triples, the nine
output layouts agree with the layout table region by region, bed routing and
the derived direct bed labels are unchanged for every layout, and the
regression suite passes.
This commit is contained in:
TheM14 committed 2026-11-18 17:05:30 +08:00
1 parent 7de17a8576
commit 76074a05ba
9 files changed
+381 -60

No files matched your search

+3 -3
View File
@@ -80,9 +80,9 @@ def _fold_vector(calc, final, warp_mode, vector):
def bed_object_targets(bed_channels) -> dict[int, tuple[float, float, float]]:
"""JOC 对象槽 → 固定方位 ``(u, v, w)``;只包含 bed 声道。
bed 声道的方位由声道标签定义(ETSI TS 103 420 Table B.10),与目标扬声器布局
无关:同一个声道无论输出哪种布局都落在同一个源位置,再交给与动态对象相同的
点声源渲染路径。LFE 不占对象槽,单独处理。
bed 声道的方位由声道标签定义,与目标扬声器布局无关:同一个声道无论输出哪种
布局都落在同一个源位置,再交给与动态对象相同的点声源渲染路径。LFE 不占对象
槽,单独处理。
"""
from bed_layout import adm_xyz_to_render_coordinates, bed_object_positions