Sync the kernel copy with the warp 2/3 surround fold
The kernel copy follows the new kernel: the OAMD parser and the speaker controls accept warp modes 2 and 3, and the renderer pans the 5.1-family and 4.0 layouts in an expanded surround layout before folding the rear pair into the target. Trim selection, balance and automatic compensation stay with the final target layout, and the folded result feeds the existing ramp and mix. Builds Release-Static|x64 and |Win32. layout_table_test and channel_swap_test still pass; the render harness now renders a warp-3 stream instead of reporting the unimplemented mode.
This commit is contained in:
1 parent
d35f6abe7a
commit
5b41868e94
4 files changed
+200
-18
No files matched your search
@@ -23,10 +23,11 @@ inline constexpr int kBalanceSteps = 16;
|
||||
// kappa_h: 0 -> 0, 2 -> 1, otherwise 2
|
||||
int trim_config_index(const LayoutInfo& layout);
|
||||
|
||||
// Converts OAMD calibration to the speaker controls of one layout. Warp modes
|
||||
// 2/3 and the reserved global trim mode are reported as unsupported. A null
|
||||
// trim selects warp 0 and automatic trim, or disabled trim for a layout that
|
||||
// carries no trim semantics.
|
||||
// Converts OAMD calibration to the speaker controls of one layout. Warp 0
|
||||
// renders directly, 1 scales the floor Y, and 2/3 render through an expanded
|
||||
// surround layout before folding; the reserved global trim mode is reported as
|
||||
// unsupported. A null trim selects warp 0 and automatic trim, or disabled trim
|
||||
// for a layout that carries no trim semantics.
|
||||
Status parameters_from_oamd(const oamd::OamdTrim* trim, const LayoutInfo& layout,
|
||||
ejoc_speaker_controls* out);
|
||||
|
||||
|
||||
Reference in new issue
Block a user