Put the sky bed channels back on the room walls

The sky bed channels (TFL/TFR, TSL/TSR, TBL/TBR) take x = -1 / +1 again instead
of the 62-level values -0.516113 / 0.516113; Y stays 1 / 0 / -1 and Z stays 1,
and the LFE rows stay at the origin because those channels carry no direction.
The horizontal pan of a point source only varies between the ends of a speaker
row, and the top row of every output layout spans 0.241943 .. 0.758057, so the
wall value still sits inside the full-power zone of either end speaker: the
decoded speaker output is unchanged, while the ADM position attribute and the
binaural fixed directions follow the wall geometry again.

Checked: the bed reference table produces the expected Q15 triples, the nine
output layouts still match the layout tables, and the regression suite passes.
This commit is contained in:
TheM14 committed 2026-11-18 19:50:42 +08:00
1 parent 76074a05ba
commit fae8e09b59
1 file changed
+11 -10
+11 -10
View File
@@ -85,26 +85,27 @@ BED_CHANNEL_NAMES = {
# 每个 bed 声道的固定方位(ADM 笛卡尔坐标,x 向右、y 向前、z 向上):speakerLabel
# 各自对应唯一的 position(X,Y,Z),与目标扬声器布局无关。bed 对象在 OAMD 里没有位置
# 字段,位置只由声明的声道标签决定。
# 顶部那一行取 ADM 62 级网格的 15/62 与 47/62,即归一化 x 的 0,241943 / 0,758057
# (Q15 分子 7928 / 24840);Lw/Rw 的 Y 记作 0,677419,即 42/62 = 21/31。
# 天空声道的 X 取墙边(±1):点声源的横向声像只在扬声器跨度的端点之间分摊,取端点仍
# 落在输出布局顶部声道的满功率区里,与顶部声道互相下混的结果一致。Lw/Rw 的 Y 记作
# 0,677419,即 42/62 = 21/31。LFE/LFE2 不参与摆位,位置记为原点。
BED_CHANNEL_ADM_POSITION = {
"RC_L": (-1.0, 1.0, 0.0),
"RC_R": (1.0, 1.0, 0.0),
"RC_C": (0.0, 1.0, 0.0),
"RC_LFE": (-1.0, 1.0, -1.0),
"RC_LFE": (0.0, 0.0, 0.0),
"RC_LS": (-1.0, 0.0, 0.0),
"RC_RS": (1.0, 0.0, 0.0),
"RC_LB": (-1.0, -1.0, 0.0),
"RC_RB": (1.0, -1.0, 0.0),
"RC_TFL": (-0.516113, 1.0, 1.0),
"RC_TFR": (0.516113, 1.0, 1.0),
"RC_TSL": (-0.516113, 0.0, 1.0),
"RC_TSR": (0.516113, 0.0, 1.0),
"RC_TBL": (-0.516113, -1.0, 1.0),
"RC_TBR": (0.516113, -1.0, 1.0),
"RC_TFL": (-1.0, 1.0, 1.0),
"RC_TFR": (1.0, 1.0, 1.0),
"RC_TSL": (-1.0, 0.0, 1.0),
"RC_TSR": (1.0, 0.0, 1.0),
"RC_TBL": (-1.0, -1.0, 1.0),
"RC_TBR": (1.0, -1.0, 1.0),
"RC_LW": (-1.0, 21.0 / 31.0, 0.0),
"RC_RW": (1.0, 21.0 / 31.0, 0.0),
"RC_LFE2": (1.0, 1.0, -1.0),
"RC_LFE2": (0.0, 0.0, 0.0),
}
# LFE 不是空间声源:它的 PCM 走独立通路,不参与对象摆位。