Implement PLIIx and Lo/Ro folding for warp modes 2/3
- Render 5.1-family and 4.0 layouts through expanded surround geometry before folding. - Keep trim, balance and automatic position compensation tied to the final target layout. - Preserve height channels, LFE passthrough and per-object trim bypass behavior. - Update the bilingual README and mathematical documentation.
This commit is contained in:
1 parent
0e28cd085c
commit
4aef8db36e
6 files changed
+160
-22
No files matched your search
+45
-4
@@ -454,8 +454,8 @@ v_{\mathrm{floor}}=
|
||||
$$
|
||||
|
||||
Warp 0 and other layouts use $v_{\mathrm{floor}}=v$. The height layer is not scaled.
|
||||
An absent warp indication uses 0; no CLI override is provided. Modes 2/3 are
|
||||
explicitly unsupported rather than mapped to 0/1. Balance follows this scaling.
|
||||
An absent warp indication uses 0; no CLI override is provided. Modes 2/3 use
|
||||
the intermediate layout and folding matrix in §12.5. Balance follows this scaling.
|
||||
|
||||
### 10.3 Height layer
|
||||
|
||||
@@ -563,7 +563,7 @@ Warp, trim and balance controls are read from OAMD metadata:
|
||||
|
||||
| Parameter | Value or unit | Behavior |
|
||||
|---|---|---|
|
||||
| `warp_mode` | 0 / 1 | Selects the floor Y mapping in §10.2; modes 2/3 are unsupported and rejected |
|
||||
| `warp_mode` | 0 / 1 / 2 / 3 | Direct rendering / floor Y scaling / PLIIx folding / Standard (Lo/Ro) folding |
|
||||
| `global_trim_mode` | 0 / 1 / 2 | Automatic / disabled / per-layout configuration; reserved value 3 is rejected |
|
||||
| $T_s$, $T_h$ | dB | Explicit surround and height trim, with positive values treated as zero |
|
||||
| $T_c$ | dB | Signed explicit centre trim |
|
||||
@@ -642,7 +642,7 @@ $1$ at the back wall; $x$ and $z$ are unchanged.
|
||||
### 12.4 Where it is applied
|
||||
|
||||
Let $B_z(y)$ denote the balance map of §12.3 and $W(y)$ the warp map of §10.2.
|
||||
The ordinary point-object path keeps three coordinates:
|
||||
Direct point rendering in warp modes 0/1 keeps three coordinates:
|
||||
|
||||
$$
|
||||
y_f=B_z(W(y)),\qquad y_h=B_z(y),\qquad y_t=B_z(y).
|
||||
@@ -664,6 +664,47 @@ Height and trim coordinates pass through balance alone. The trim scalar
|
||||
multiplies the object's entire panning vector before accumulation into output
|
||||
channels. LFE passes through.
|
||||
|
||||
### 12.5 Surround folding in warp modes 2/3
|
||||
|
||||
For a 5.1, 5.1.2 or 5.1.4 target, warp modes 2/3 first render objects to the
|
||||
corresponding 7.1, 7.1.2 or 7.1.4 intermediate layout, then fold the rear
|
||||
surrounds into the target surround pair. The 4.0 layout also adds a rear pair
|
||||
without adding centre or LFE. Other existing layouts render directly.
|
||||
|
||||
The intermediate layout changes speaker geometry and panning only. The trim
|
||||
configuration, both balance layers and the maximum automatic position
|
||||
compensation remain those of the final target. For example, 5.1.2 uses
|
||||
configuration 4 and a maximum compensation of $-2.25$ dB even when its
|
||||
intermediate layout is 7.1.2. With separate side and rear pairs in the
|
||||
intermediate layout, floor Y is not doubled. Balance and per-object trim
|
||||
are evaluated during intermediate rendering.
|
||||
|
||||
For intermediate outputs $L_s,R_s,L_{rs},R_{rs}$ and target surrounds
|
||||
$L'_s,R'_s$:
|
||||
|
||||
$$
|
||||
L'_s=L_s+aL_{rs}+bR_{rs},\qquad
|
||||
R'_s=R_s+bL_{rs}+aR_{rs}.
|
||||
$$
|
||||
|
||||
| Mode | $a$ | $b$ |
|
||||
|---|---|---|
|
||||
| 2: PLIIx | $\sqrt{3}/2$ | $1/2$ |
|
||||
| 3: Standard (Lo/Ro) | $1$ | $0$ |
|
||||
|
||||
Both matrices add linear amplitudes without normalizing energy after the
|
||||
fold. Shared front, height and LFE channels pass through to their matching
|
||||
positions. The folded object gain vector enters the target-gain update and
|
||||
ramp in §13 before object audio is accumulated.
|
||||
|
||||
The complete order is: select calibration for the target layout → apply
|
||||
balance and trim while panning in the intermediate layout → fold horizontal
|
||||
surrounds → update gain ramps and mix. Per-object bypass disables balance
|
||||
and trim while retaining layout selection and folding. These modes are
|
||||
generic speaker-rendering controls; the publicly defined E-AC-3 JOC warp
|
||||
values remain 0/1. Source trajectories, ADM and binaural do not bake in the
|
||||
folded result.
|
||||
|
||||
## 13. OAMD time alignment and gain ramps
|
||||
|
||||
The coded position of an OAMD update is
|
||||
|
||||
+36
-4
@@ -451,7 +451,7 @@ v_{\mathrm{floor}}=
|
||||
$$
|
||||
|
||||
`warp_mode=0` 或其他布局使用 $v_{\mathrm{floor}}=v$。高度层不做该缩放。
|
||||
未携带 warp 元数据时采用 0;命令行不提供覆盖选项。2/3 保留为未实现,报错而不回退。
|
||||
未携带 warp 元数据时采用 0;命令行不提供覆盖选项。warp 2/3 使用 §12.5 的中间布局与折叠矩阵。
|
||||
有 front/back balance 时,先求这里的分支坐标,再应用 §12.3 的 balance。
|
||||
|
||||
### 10.3 高度层
|
||||
@@ -557,7 +557,7 @@ warp、trim 和 balance 均从 OAMD 元数据读取。各参数的取值与作
|
||||
|
||||
| 参数 | 取值或单位 | 行为 |
|
||||
|---|---|---|
|
||||
| `warp_mode` | 0 / 1 | 选择 §10.2 的地面 Y 映射;2/3 暂不支持,遇到时明确报错 |
|
||||
| `warp_mode` | 0 / 1 / 2 / 3 | 直接渲染 / 地面 Y 缩放 / PLIIx 折叠 / Standard(Lo/Ro)折叠 |
|
||||
| `global_trim_mode` | 0 / 1 / 2 | automatic / disabled / 按目标布局配置选择;3 为保留值,明确报错 |
|
||||
| $T_s$、$T_h$ | dB | 显式 surround、height trim 参数,正值按 0 处理 |
|
||||
| $T_c$ | dB | 显式 centre trim 参数,保留符号 |
|
||||
@@ -628,7 +628,7 @@ $$
|
||||
### 12.4 施加位置
|
||||
|
||||
记 §12.3 的高度混合 balance 映射为 $B_z(y)$,§10.2 的 warp 映射为 $W(y)$。
|
||||
普通点对象的实际分支顺序为
|
||||
warp 0/1 直接渲染点对象时,分支顺序为
|
||||
|
||||
$$
|
||||
y_f=B_z(W(y)),\qquad y_h=B_z(y),\qquad y_t=B_z(y).
|
||||
@@ -642,11 +642,43 @@ $$
|
||||
|
||||
因此可概括为 warp → balance → trim 与声像增益合成,但不能让所有阶段共用一个
|
||||
已经 warp 的 Y。balance 仅在 explicit 且未逐对象 bypass 时启用;warp 不受 trim
|
||||
状态或 trim bypass 控制。源坐标保持原值,ADM 与 binaural 不预烘焙此变换。
|
||||
状态或 trim bypass 控制。源坐标保持原值,ADM 与 binaural 不预处理此变换。
|
||||
|
||||
地面坐标依次经过 warp、balance,再用于地面声像;顶部坐标和 trim 求值坐标只经过
|
||||
balance。trim 标量乘到该对象的整条声像增益向量后,再累加到输出声道。LFE 直接通过。
|
||||
|
||||
### 12.5 warp 2/3 的环绕折叠
|
||||
|
||||
目标为 5.1、5.1.2 或 5.1.4 时,warp 2/3 先把对象渲染到对应的 7.1、7.1.2 或
|
||||
7.1.4 中间布局,再将后环绕折叠到目标的环绕对。4.0 同样先增加一对后环绕,
|
||||
中间布局不增加 centre 或 LFE。其他现有布局直接渲染。
|
||||
|
||||
中间布局只改变扬声器几何与声像分配。Trim 配置、两层 Balance 和 Auto Trim 的
|
||||
最大位置补偿仍按最终目标布局选择。例如,5.1.2 使用配置 4,最大位置补偿为
|
||||
$-2.25$ dB,即使其中间布局是 7.1.2,也继续使用这些参数。中间布局已有独立
|
||||
side/rear 两对,地面 Y 不再乘 2;Balance 和逐对象 Trim 在中间渲染时求值。
|
||||
|
||||
设中间布局输出为 $L_s,R_s,L_{rs},R_{rs}$,最终目标的环绕输出为 $L'_s,R'_s$:
|
||||
|
||||
$$
|
||||
L'_s=L_s+aL_{rs}+bR_{rs},\qquad
|
||||
R'_s=R_s+bL_{rs}+aR_{rs}.
|
||||
$$
|
||||
|
||||
| 模式 | $a$ | $b$ |
|
||||
|---|---|---|
|
||||
| 2:PLIIx | $\sqrt{3}/2$ | $1/2$ |
|
||||
| 3:Standard(Lo/Ro) | $1$ | $0$ |
|
||||
|
||||
两种矩阵都按线性幅度相加,不做折叠后的能量归一化。共同的前方、高度和 LFE
|
||||
声道按对应位置直接通过。折叠后的对象增益向量进入 §13 的目标增益更新与斜坡,
|
||||
然后累加对象音频。
|
||||
|
||||
完整顺序为:按目标布局选择校准参数 → 在中间布局应用 Balance、Trim 并计算声像
|
||||
增益 → 折叠水平环绕 → 更新增益斜坡与混音。逐对象 bypass 关闭 Balance 和 Trim,
|
||||
但仍保留 warp 2/3 的布局选择与折叠。上述模式属于通用扬声器渲染控制;E-AC-3 JOC
|
||||
公开定义的 warp 值仍为 0/1,源对象轨迹、ADM 和 binaural 不预处理折叠结果。
|
||||
|
||||
## 13. OAMD 时间对齐与增益斜坡
|
||||
|
||||
OAMD 更新的编码位置为
|
||||
|
||||
Reference in new issue
Block a user