Read the OAMD trim element into speaker rendering and ADM
The OAMD parser reads the trim element: warp mode, global trim mode, the nine per-configuration records (centre, surround and height level, the two front-back balances) and the per-object bypass flags. OamdUpdate carries it, so the file task and the streaming step see the same state; a payload without the element keeps the previous controls, and an absent element starts at warp 0 with automatic trim. Speaker rendering reads the controls from OAMD only; neither the CLI nor the frontends offer an override. Eligible layouts leave the floor Y alone at warp 0 and use clamp(2Y, 0, 1) at warp 1, the height layer is never scaled, and warp 2/3 is reported as unsupported where the speaker consumes it. Floor, height and trim evaluation keep separate coordinates: floor Y is balance(warp(Y)), while height Y and trim Y are balance(Y). An explicit configuration contributes a position-dependent scalar for each object, applied before accumulation instead of to the output channels after the mix; automatic, disabled and explicit are mutually exclusive, and a bypassed object keeps its warp but loses balance and trim. Automatic still uses the layout position compensation, disabled uses unity, and layouts without trim semantics stay disabled. LFE passes through, and ADM source positions and binaural rendering are unchanged. The controls travel in ejoc_speaker_controls, a C struct a future decoder can fill without knowing the layout; the layout table now carries the surround and height channel counts and the seven layouts that have trim semantics. The internal ABI goes to version 3 for the new process parameter. The ADM writer mirrors the element into both carriers. AXML gains DolbyAtmosMasterFile with DolbyMasterContentInfo, DolbyTrimModeSetup (one record per configuration, zero values for a disabled one) and DolbyWarpMode. dbmd segment 10 carries the nine 15-byte records (automatic flag, three float32 levels and two sign-magnitude balances), and segment 9 writes the warp code into the low three bits of at[152] while keeping the other packed fields. The task scans the first 64 audio frames for the element, as the reference does, so a duration-limited render still writes it. The bilingual mathematical notes describe the configuration index, the balance map, the three coordinates and the evaluation order; the READMEs state that the controls come from OAMD and that warp 2/3 is refused. ctest covers the element parse, configuration selection, warp 0/1 with the Q15 clamp, the height coordinate, explicit trim and balance, per-object bypass, LFE passthrough, the step's metadata updates and the exact dbmd/AXML bytes. Speaker output over the same objects16 stream is byte-identical to the reference for the seven trimmed layouts and the wider ones, and both ADM carriers of a rendered BWF are byte-identical to the reference writer. The product version goes to 1.2.0; the public ABI stays at 5.
This commit is contained in:
1 parent
20f2e77664
commit
58e3403642
21 files changed
+1597
-48
No files matched your search
+150
-4
@@ -453,7 +453,9 @@ v_{\mathrm{floor}}=
|
||||
\mathrm{clamp}(2v,0,1).
|
||||
$$
|
||||
|
||||
Other layouts use $v_{\mathrm{floor}}=v$.
|
||||
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.
|
||||
|
||||
### 10.3 Height layer
|
||||
|
||||
@@ -474,6 +476,9 @@ $$
|
||||
|
||||
## 11. Layout-dependent position compensation
|
||||
|
||||
This is the per-object gain for automatic trim. Disabled trim uses unity;
|
||||
explicit trim uses §12.2 instead, without multiplying automatic compensation again.
|
||||
|
||||
Let $N_h$ be the number of relevant height speakers and $N_f$ the number of relevant additional horizontal speakers:
|
||||
|
||||
$$
|
||||
@@ -519,7 +524,147 @@ G_{\mathrm{pos}}
|
||||
\mathbf G_{\mathrm{point}}.
|
||||
$$
|
||||
|
||||
## 12. OAMD time alignment and gain ramps
|
||||
## 12. OAMD trim and front-back balance
|
||||
|
||||
### 12.1 Configuration selection
|
||||
|
||||
The OAMD trim element splits a programme's calibration data into nine
|
||||
configurations, chosen by the target layout's additional horizontal speaker
|
||||
count $N_f$ and height speaker count $N_h$:
|
||||
|
||||
$$
|
||||
\kappa_f(N)=
|
||||
\begin{cases}
|
||||
0, & N=0,\\
|
||||
1, & N\in\{2,3\},\\
|
||||
2, & \text{otherwise},
|
||||
\end{cases}
|
||||
\qquad
|
||||
\kappa_h(N)=
|
||||
\begin{cases}
|
||||
0, & N=0,\\
|
||||
1, & N=2,\\
|
||||
2, & \text{otherwise}.
|
||||
\end{cases}
|
||||
$$
|
||||
|
||||
$$
|
||||
c_{\mathrm{trim}}=\kappa_f(N_f)+3\,\kappa_h(N_h).
|
||||
$$
|
||||
|
||||
The nine configurations enumerate "no / some / many additional horizontal
|
||||
speakers by no / some / many height speakers".
|
||||
|
||||
Trim and front-back balance apply to seven layouts only: 2.0, 3.1, 4.0, 5.1,
|
||||
5.1.2, 5.1.4 and 7.1. Wider layouts (7.1.2, 7.1.4, 9.1.4, 9.1.6) are left
|
||||
untrimmed, with $g_t=1$ and $b=0$.
|
||||
|
||||
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 |
|
||||
| `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 |
|
||||
| $b_{\mathrm{lis}}$, $b_{\mathrm{tb}}$ | $[-1,1]$, step $1/16$ | Listener-plane and overhead front-back balance |
|
||||
| Per-object trim bypass | Boolean | Disables the object's balance and trim gain while retaining warp |
|
||||
|
||||
With global mode 2, the selected configuration's default or disabled flag
|
||||
chooses automatic or disabled trim. A missing configuration uses automatic;
|
||||
otherwise its explicit parameters apply. Automatic uses §11, disabled uses
|
||||
unity, and explicit uses §12.2. These modes are mutually exclusive.
|
||||
|
||||
Without an initial trim element, warp is 0 and trim is automatic. A later
|
||||
payload without that element retains the previous controls; a new element
|
||||
updates them at the corresponding metadata event boundary. The CLI has no
|
||||
warp override.
|
||||
|
||||
### 12.2 Per-object levels
|
||||
|
||||
Centre, surround and height levels parameterize a position-dependent object
|
||||
gain; they are not fixed gains applied to the output channels after mixing.
|
||||
For original Y after balance $y_t$ and $z=\max(w,0)$:
|
||||
|
||||
$$
|
||||
a_s=\mathrm{clamp}(2y_t,0,1)(1-z),\quad a_h=z,
|
||||
$$
|
||||
|
||||
$$
|
||||
a_c=1-\mathrm{clamp}\bigl(10\max(|z|-0.05,y_t-0.05,|u-0.5|-0.05),0,1\bigr).
|
||||
$$
|
||||
|
||||
Explicit trim uses
|
||||
|
||||
$$
|
||||
D=a_s\min(T_s,0)+a_h\min(T_h,0)+a_cT_c,\qquad g_t=10^{D/20}.
|
||||
$$
|
||||
|
||||
The scalar multiplies the object's whole panning vector before accumulation.
|
||||
Automatic trim uses §11; disabled trim or per-object bypass uses unity. LFE
|
||||
passes through. Gain evaluation, panning interpolation and object accumulation
|
||||
use float64.
|
||||
|
||||
### 12.3 Front-back balance
|
||||
|
||||
Each configuration also carries two front-back balance values:
|
||||
$b_{\mathrm{lis}}$ for the listener plane and $b_{\mathrm{tb}}$ for the overhead
|
||||
layer. Both are quantised to a $1/16$ grid and are non-zero only in an explicit
|
||||
configuration.
|
||||
|
||||
Writing $n=\mathrm{round}(16\,|b|)$ and $s=n/18$, the single-layer map is
|
||||
|
||||
$$
|
||||
B_b(y)=
|
||||
\begin{cases}
|
||||
y, & y\le 0.05\ \text{or}\ y\ge 0.95,\\[2pt]
|
||||
(1+s)y-0.05s, & 0.05<y<0.5,\ b>0,\\[2pt]
|
||||
(1-s)(y-0.5)+0.5+0.45s, & 0.5\le y<0.95,\ b>0,\\[2pt]
|
||||
(1-s)y+0.05s, & 0.05<y<0.5,\ b<0,\\[2pt]
|
||||
(1+s)(y-0.5)+0.5-0.45s, & 0.5\le y<0.95,\ b<0.
|
||||
\end{cases}
|
||||
$$
|
||||
|
||||
It maps $[0.05,0.95]$ monotonically onto itself: the two walls stay fixed, the
|
||||
two halves meet at $y=0.5$, and their slopes are $1+s$ and $1-s$. The 5 percent
|
||||
wall bands and the case $b=0$ pass through unchanged, so the map never leaves
|
||||
the interval and needs no extra clamp.
|
||||
|
||||
The height $w$ blends the two layers:
|
||||
|
||||
$$
|
||||
y'=(1-w)\,B_{b_{\mathrm{lis}}}(y)+w\,B_{b_{\mathrm{tb}}}(y).
|
||||
$$
|
||||
|
||||
The front-back axis $y$ is oriented as in §9, with $0$ at the front wall and
|
||||
$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:
|
||||
|
||||
$$
|
||||
y_f=B_z(W(y)),\qquad y_h=B_z(y),\qquad y_t=B_z(y).
|
||||
$$
|
||||
|
||||
Floor and height panning use $y_f,y_h$; trim evaluation uses $y_t$. The final gain is
|
||||
|
||||
$$
|
||||
g_{o,c}=G_{\mathrm{object}}\,g_t(u,y_t,z)\,P_c(u,y_f,y_h,z).
|
||||
$$
|
||||
|
||||
Warp precedes balance, followed by trim/pan gain composition, but not every
|
||||
stage shares a warped Y. Balance requires explicit trim without object bypass;
|
||||
warp remains independent of trim state and bypass. Source positions are kept
|
||||
unchanged for ADM and binaural.
|
||||
|
||||
Floor coordinates pass through warp and then balance before floor panning.
|
||||
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.
|
||||
|
||||
## 13. OAMD time alignment and gain ramps
|
||||
|
||||
The coded position of an OAMD update is
|
||||
|
||||
@@ -575,7 +720,7 @@ $$
|
||||
|
||||
If no new metadata update intervenes, this is equivalent to a sample-wise linear ramp of total length $KB$.
|
||||
|
||||
## 13. Final speaker mix
|
||||
## 14. Final speaker mix
|
||||
|
||||
For target output channel $c$:
|
||||
|
||||
@@ -607,9 +752,10 @@ y_{24}[n]=
|
||||
\right).
|
||||
$$
|
||||
|
||||
## 14. Scope of the formulas
|
||||
## 15. Scope of the formulas
|
||||
|
||||
- The JOC matrix section covers both the dense MTX and the sparse IDX/VEC differential syntax.
|
||||
- The speaker-panning section describes ordinary point objects; extent, spread, divergence, and similar modes require additional models.
|
||||
- Multiple OAMD position blocks must be scheduled in time order.
|
||||
- A limiter is separate post-processing and is not included in the mixing equations above.
|
||||
- Trim and front-back balance affect speaker rendering only; binaural rendering does not read them.
|
||||
Reference in new issue
Block a user