Place CBA bed channels at the positions their labels define
A bed channel is a fixed source: its PCM is an object at the position its OAMD speaker label names, so the coordinate comes only from the label (ETSI TS 103 420 V1.2.1 clause B.2.1.4 table B.10) and never from the target output layout. - src/bed_layout.py carries table B.10 for all seventeen labels, including Tfl/Tfr at (±1, 1, 1), Tbl/Tbr at (±1, -1, 1) and Lw/Rw at Y = 21/31 (0,677419); LFE and LFE2 are recorded but stay out of the object slots - src/speaker_renderer.py sends the bed slots through the same point-source path as dynamic objects at those fixed positions; the layout region-0 anchor lookup is gone, so every layout and the binaural timeline share one source position per bed channel - src/oamd_bits.py expands the 17-bit non-standard bed mask in table 12 channel order (RC_L first, RC_LFE2 last); both mask expansions are now single helpers, standard_bed_channels and nonstandard_bed_channels - src/metadata.py reports the bed coverage mismatch only when a bed is declared, so an object-only program no longer logs it on every frame - README.md and README.en.md describe bed rendering by channel label instead of by output layout Checked: table B.10 coordinates, table 12/13 channel order and masks, object slot order, identical source positions across all eleven speaker layouts plus the binaural timeline and the ADM tracks, and LFE passthrough; a 180 s 9.1.6 bed stream renders to 25-channel ADM BWF with all fifteen objects static at those positions.
This commit is contained in:
1 parent
faf8a921c2
commit
26e84569c2
6 files changed
+71
-93
No files matched your search
+8
-51
@@ -19,61 +19,18 @@ Q15_SCALE = 32768.0
|
||||
Q15_MAX = 32767.0 / Q15_SCALE
|
||||
GAIN_SNAP_THRESHOLD = 1.0e-4
|
||||
|
||||
# 每个布局 region 0 控制点 → 该点上唯一响应的声道。床声道用这个锚点直接落到目标
|
||||
# 布局的同名扬声器上(床声道是一路固定通道,不是需要声像的对象)。
|
||||
_ANCHOR_CACHE: dict[str, dict[str, tuple[float, float, float]]] = {}
|
||||
|
||||
|
||||
def layout_channel_anchors(layout: SpeakerLayout) -> dict[str, tuple[float, float, float]]:
|
||||
"""返回 ``{声道名: (u, v, w)}``:把点对象放在这里时该声道增益为 1。
|
||||
|
||||
坐标取自布局自己的 region 0 控制点,因此锚点与布局的声像模型一致;目标布局没
|
||||
有的声道不会出现在结果里。
|
||||
"""
|
||||
cached = _ANCHOR_CACHE.get(layout.name)
|
||||
if cached is not None:
|
||||
return cached
|
||||
anchors: dict[str, tuple[float, float, float]] = {}
|
||||
region = layout.regions[0]
|
||||
for coordinates in region.coordinates_q15:
|
||||
u, v, w = (coordinate / 32767.0 for coordinate in coordinates)
|
||||
gains = render_point_gains(layout, u, v, w, standard_order=True)
|
||||
best = int(np.argmax(gains))
|
||||
dominant = float(gains[best])
|
||||
if dominant < 0.99:
|
||||
continue
|
||||
others = np.delete(gains, best)
|
||||
if others.size and float(np.max(np.abs(others))) > 1.0e-3:
|
||||
continue
|
||||
anchors.setdefault(layout.channels[best], (u, v, w))
|
||||
_ANCHOR_CACHE[layout.name] = anchors
|
||||
return anchors
|
||||
|
||||
|
||||
def bed_object_anchors(layout: SpeakerLayout, bed_channels) -> dict[int, tuple[float, float, float]]:
|
||||
def bed_object_targets(bed_channels) -> dict[int, tuple[float, float, float]]:
|
||||
"""JOC 对象槽 → 固定方位 ``(u, v, w)``;只包含 bed 声道。
|
||||
|
||||
目标布局有同名扬声器时用该扬声器的锚点(床声道直连同名声道);目标布局没有这
|
||||
个声道时退回 bed 布局给出的标准方位,由声像模型摆位。
|
||||
bed 声道的方位由声道标签定义(ETSI TS 103 420 Table B.10),与目标扬声器布局
|
||||
无关:同一个声道无论输出哪种布局都落在同一个源位置,再交给与动态对象相同的
|
||||
点声源渲染路径。LFE 不占对象槽,单独处理。
|
||||
"""
|
||||
from bed_layout import BED_CHANNEL_ADM_POSITION, BED_CHANNEL_NAMES
|
||||
from bed_layout import adm_xyz_to_render_coordinates, bed_object_positions
|
||||
|
||||
anchors = layout_channel_anchors(layout)
|
||||
result: dict[int, tuple[float, float, float]] = {}
|
||||
for object_index, label in enumerate(bed_channels or (), 1):
|
||||
if object_index > 15:
|
||||
break
|
||||
name = BED_CHANNEL_NAMES.get(label)
|
||||
if name is None or name == "LFE":
|
||||
continue
|
||||
if name in anchors:
|
||||
result[object_index] = anchors[name]
|
||||
continue
|
||||
position = BED_CHANNEL_ADM_POSITION.get(label)
|
||||
if position is not None:
|
||||
x, y, z = position
|
||||
result[object_index] = ((x + 1.0) * 0.5, (1.0 - y) * 0.5, z)
|
||||
return result
|
||||
return {slot: adm_xyz_to_render_coordinates(*xyz)
|
||||
for slot, xyz in bed_object_positions(bed_channels or ()).items()}
|
||||
|
||||
|
||||
def _all_object_targets(layout: SpeakerLayout, state: JocFieldState,
|
||||
@@ -258,7 +215,7 @@ class PythonSpeakerRenderer:
|
||||
self.block_size = int(block_size)
|
||||
if self.block_size <= 0:
|
||||
raise ValueError("block_size must be positive")
|
||||
self.bed_targets = bed_object_anchors(self.layout, bed_channels)
|
||||
self.bed_targets = bed_object_targets(bed_channels)
|
||||
self.reset()
|
||||
|
||||
def reset(self):
|
||||
|
||||
Reference in new issue
Block a user