From a8a40c2d202b8b036f61e5a71ea7a8a68e7af38d Mon Sep 17 00:00:00 2001 From: TheM14 Date: Wed, 18 Nov 2026 17:05:52 +0800 Subject: [PATCH] Correct the bed channel positions, the bed anchor order and the 5.1 surrounds - Put the height row of the bed channel table on the ADM 62-level grid: Tfl/Tfr, Tsl/Tsr and Tbl/Tbr take x = -0.516113 / 0.516113 (Q15 7928 / 24840) with Y = 1 / 0 / -1 instead of the older (-0.5, 0.5, 1) values, and Lw/Rw take Y = 21/31 (Q15 5285) instead of 0.5; LFE and LFE2 take the same non-spatial entries as the ADM label table. - Scale bed_channel_q15 by 32768 and round instead of truncating, so the half-step positions come out exact (16384, 7928, 24840, 5285). - Anchor a bed channel to its same-named speaker by that channel's own index: channel_names shares the internal order of the region speaker ids, so the extra standard_from_internal lookup swapped the side/rear anchors of 7.1.x/9.1.x and the top front/top back anchors of 9.1.6. - Keep the single surround pair of 5.1, 5.1.2 and 5.1.4 at the rear corners (Y = 32767) instead of Y = 16384. - Refresh the 5.1 gain expectations in the core tests for the moved surround pair; the new values match the Python reference bit for bit. --- src/joc_bitstream/bed_layout_map.cpp | 51 +++++++++++++++++----------- src/speaker/speaker_layouts.h | 30 ++++++++-------- tests/test_core.cpp | 18 +++++----- 3 files changed, 55 insertions(+), 44 deletions(-) diff --git a/src/joc_bitstream/bed_layout_map.cpp b/src/joc_bitstream/bed_layout_map.cpp index 369dd98..83365f4 100644 --- a/src/joc_bitstream/bed_layout_map.cpp +++ b/src/joc_bitstream/bed_layout_map.cpp @@ -44,6 +44,9 @@ constexpr BedChannel kNonStandardBits[17] = { BedChannel::kLeft, }; +// 每个 bed 声道的固定方位:speakerLabel 各自对应唯一的 ADM (X,Y,Z),与目标扬声器 +// 布局无关。顶部那一行取 ADM 62 级网格的 15/62 与 47/62,即归一化 x 的 0,241943 / +// 0,758057(Q15 分子 7928 / 24840);Lw/Rw 的 Y 记作 0,677419,即 42/62 = 21/31。 struct ChannelSpec { BedChannel channel; const char* short_name; @@ -55,20 +58,20 @@ constexpr ChannelSpec kChannels[] = { {BedChannel::kLeft, "L", "RC_L", {-1.0, 1.0, 0.0}}, {BedChannel::kRight, "R", "RC_R", {1.0, 1.0, 0.0}}, {BedChannel::kCenter, "C", "RC_C", {0.0, 1.0, 0.0}}, - {BedChannel::kLfe, "LFE", "RC_LFE", {0.0, 0.0, 0.0}}, + {BedChannel::kLfe, "LFE", "RC_LFE", {-1.0, 1.0, -1.0}}, {BedChannel::kLeftSurround, "Ls", "RC_LS", {-1.0, 0.0, 0.0}}, {BedChannel::kRightSurround, "Rs", "RC_RS", {1.0, 0.0, 0.0}}, {BedChannel::kLeftRearSurround, "Lrs", "RC_LB", {-1.0, -1.0, 0.0}}, {BedChannel::kRightRearSurround, "Rrs", "RC_RB", {1.0, -1.0, 0.0}}, - {BedChannel::kTopFrontLeft, "Ltf", "RC_TFL", {-0.5, 0.5, 1.0}}, - {BedChannel::kTopFrontRight, "Rtf", "RC_TFR", {0.5, 0.5, 1.0}}, - {BedChannel::kTopSideLeft, "Ltm", "RC_TSL", {-1.0, 0.0, 1.0}}, - {BedChannel::kTopSideRight, "Rtm", "RC_TSR", {1.0, 0.0, 1.0}}, - {BedChannel::kTopBackLeft, "Ltr", "RC_TBL", {-0.5, -0.5, 1.0}}, - {BedChannel::kTopBackRight, "Rtr", "RC_TBR", {0.5, -0.5, 1.0}}, - {BedChannel::kLeftWide, "Lw", "RC_LW", {-1.0, 0.5, 0.0}}, - {BedChannel::kRightWide, "Rw", "RC_RW", {1.0, 0.5, 0.0}}, - {BedChannel::kLfe2, "LFE2", "RC_LFE2", {0.0, 0.0, 0.0}}, + {BedChannel::kTopFrontLeft, "Ltf", "RC_TFL", {-0.516113, 1.0, 1.0}}, + {BedChannel::kTopFrontRight, "Rtf", "RC_TFR", {0.516113, 1.0, 1.0}}, + {BedChannel::kTopSideLeft, "Ltm", "RC_TSL", {-0.516113, 0.0, 1.0}}, + {BedChannel::kTopSideRight, "Rtm", "RC_TSR", {0.516113, 0.0, 1.0}}, + {BedChannel::kTopBackLeft, "Ltr", "RC_TBL", {-0.516113, -1.0, 1.0}}, + {BedChannel::kTopBackRight, "Rtr", "RC_TBR", {0.516113, -1.0, 1.0}}, + {BedChannel::kLeftWide, "Lw", "RC_LW", {-1.0, 21.0 / 31.0, 0.0}}, + {BedChannel::kRightWide, "Rw", "RC_RW", {1.0, 21.0 / 31.0, 0.0}}, + {BedChannel::kLfe2, "LFE2", "RC_LFE2", {1.0, 1.0, -1.0}}, }; const ChannelSpec* spec_of(BedChannel channel) { @@ -279,12 +282,18 @@ bool bed_channel_q15(BedChannel channel, std::uint16_t q15[3]) { if (!bed_channel_adm_position(channel, xyz) || q15 == nullptr) { return false; } - const double q1 = (xyz[0] + 1.0) * 0.5 * 32767.0; - const double q2 = (1.0 - xyz[1]) * 0.5 * 32767.0; - const double q3 = xyz[2] * 32767.0; - q15[0] = static_cast(q1 < 0.0 ? 0.0 : (q1 > 32767.0 ? 32767.0 : q1)); - q15[1] = static_cast(q2 < 0.0 ? 0.0 : (q2 > 32767.0 ? 32767.0 : q2)); - q15[2] = static_cast(q3 < 0.0 ? 0.0 : (q3 > 32767.0 ? 32767.0 : q3)); + // Q15 满刻度是 32768(渲染器按 q / 32768 还原方位),所以用 32768 定标并四舍五入; + // 截断会让半格位置(16384、7928)各低 1。 + const double q1 = (xyz[0] + 1.0) * 0.5 * 32768.0; + const double q2 = (1.0 - xyz[1]) * 0.5 * 32768.0; + const double q3 = xyz[2] * 32768.0; + const double rounded[3] = {q1 + 0.5, q2 + 0.5, q3 + 0.5}; + for (int axis = 0; axis < 3; ++axis) { + const double value = rounded[axis] < 0.0 + ? 0.0 + : (rounded[axis] > 32767.0 ? 32767.0 : rounded[axis]); + q15[axis] = static_cast(value); + } return true; } @@ -308,17 +317,19 @@ bool layout_bed_anchor(std::uint32_t out_ch_config, BedChannel channel, if (table == nullptr || geometry == nullptr) { return false; } - int standard_index = -1; + // channel_names 与区域几何同序(region 的 speaker_id 就是这里的下标), + // 因此同名声道不需要再经 standard_from_internal 换序。 + int internal_index = -1; for (std::uint32_t index = 0; index < table->count; ++index) { if (std::strcmp(table->names[index], name) == 0) { - standard_index = static_cast(index); + internal_index = static_cast(index); break; } } - if (standard_index < 0) { + if (internal_index < 0) { return false; } - const std::uint8_t internal = geometry->standard_from_internal[standard_index]; + const std::uint8_t internal = static_cast(internal_index); const ejoc::speaker_tables::RegionGeometry& region = geometry->regions[0]; for (std::uint32_t point = 0; point < region.point_count; ++point) { if (region.points[point].speaker_id != internal) { diff --git a/src/speaker/speaker_layouts.h b/src/speaker/speaker_layouts.h index 7f67cf3..305027a 100644 --- a/src/speaker/speaker_layouts.h +++ b/src/speaker/speaker_layouts.h @@ -190,25 +190,25 @@ inline constexpr std::array kLayouts{{ {{ RegionGeometry{ 5, 2, 2, 0, - {{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 16384, 0}, 4}, SpeakerPoint{{32767, 16384, 0}, 5}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, + {{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 32767, 0}, 4}, SpeakerPoint{{32767, 32767, 0}, 5}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, {{AxisGroup{3, {0, 2, 1}}, AxisGroup{2, {3, 4, 0}}, AxisGroup{}, AxisGroup{}}}, {{AxisGroup{}, AxisGroup{}, AxisGroup{}, AxisGroup{}}} }, RegionGeometry{ 5, 2, 2, 0, - {{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 16384, 0}, 4}, SpeakerPoint{{32767, 16384, 0}, 5}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, + {{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 32767, 0}, 4}, SpeakerPoint{{32767, 32767, 0}, 5}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, {{AxisGroup{3, {0, 2, 1}}, AxisGroup{2, {3, 4, 0}}, AxisGroup{}, AxisGroup{}}}, {{AxisGroup{}, AxisGroup{}, AxisGroup{}, AxisGroup{}}} }, RegionGeometry{ 5, 2, 2, 0, - {{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 16384, 0}, 4}, SpeakerPoint{{32767, 16384, 0}, 5}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, + {{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 32767, 0}, 4}, SpeakerPoint{{32767, 32767, 0}, 5}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, {{AxisGroup{3, {0, 2, 1}}, AxisGroup{2, {3, 4, 0}}, AxisGroup{}, AxisGroup{}}}, {{AxisGroup{}, AxisGroup{}, AxisGroup{}, AxisGroup{}}} }, RegionGeometry{ 3, 2, 2, 0, - {{SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 16384, 0}, 4}, SpeakerPoint{{32767, 16384, 0}, 5}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, + {{SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 32767, 0}, 4}, SpeakerPoint{{32767, 32767, 0}, 5}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, {{AxisGroup{1, {0, 0, 0}}, AxisGroup{2, {1, 2, 0}}, AxisGroup{}, AxisGroup{}}}, {{AxisGroup{}, AxisGroup{}, AxisGroup{}, AxisGroup{}}} }, @@ -220,7 +220,7 @@ inline constexpr std::array kLayouts{{ }, RegionGeometry{ 2, 1, 1, 0, - {{SpeakerPoint{{0, 16384, 0}, 4}, SpeakerPoint{{32767, 16384, 0}, 5}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, + {{SpeakerPoint{{0, 32767, 0}, 4}, SpeakerPoint{{32767, 32767, 0}, 5}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, {{AxisGroup{2, {0, 1, 0}}, AxisGroup{}, AxisGroup{}, AxisGroup{}}}, {{AxisGroup{}, AxisGroup{}, AxisGroup{}, AxisGroup{}}} }, @@ -286,25 +286,25 @@ inline constexpr std::array kLayouts{{ {{ RegionGeometry{ 7, 3, 2, 1, - {{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 16384, 0}, 4}, SpeakerPoint{{32767, 16384, 0}, 5}, SpeakerPoint{{7928, 16384, 32767}, 6}, SpeakerPoint{{24840, 16384, 32767}, 7}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, + {{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 32767, 0}, 4}, SpeakerPoint{{32767, 32767, 0}, 5}, SpeakerPoint{{7928, 16384, 32767}, 6}, SpeakerPoint{{24840, 16384, 32767}, 7}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, {{AxisGroup{3, {0, 2, 1}}, AxisGroup{2, {3, 4, 0}}, AxisGroup{}, AxisGroup{}}}, {{AxisGroup{2, {5, 6, 0}}, AxisGroup{}, AxisGroup{}, AxisGroup{}}} }, RegionGeometry{ 7, 3, 2, 1, - {{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 16384, 0}, 4}, SpeakerPoint{{32767, 16384, 0}, 5}, SpeakerPoint{{7928, 16384, 32767}, 6}, SpeakerPoint{{24840, 16384, 32767}, 7}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, + {{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 32767, 0}, 4}, SpeakerPoint{{32767, 32767, 0}, 5}, SpeakerPoint{{7928, 16384, 32767}, 6}, SpeakerPoint{{24840, 16384, 32767}, 7}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, {{AxisGroup{3, {0, 2, 1}}, AxisGroup{2, {3, 4, 0}}, AxisGroup{}, AxisGroup{}}}, {{AxisGroup{2, {5, 6, 0}}, AxisGroup{}, AxisGroup{}, AxisGroup{}}} }, RegionGeometry{ 7, 3, 2, 1, - {{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 16384, 0}, 4}, SpeakerPoint{{32767, 16384, 0}, 5}, SpeakerPoint{{7928, 16384, 32767}, 6}, SpeakerPoint{{24840, 16384, 32767}, 7}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, + {{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 32767, 0}, 4}, SpeakerPoint{{32767, 32767, 0}, 5}, SpeakerPoint{{7928, 16384, 32767}, 6}, SpeakerPoint{{24840, 16384, 32767}, 7}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, {{AxisGroup{3, {0, 2, 1}}, AxisGroup{2, {3, 4, 0}}, AxisGroup{}, AxisGroup{}}}, {{AxisGroup{2, {5, 6, 0}}, AxisGroup{}, AxisGroup{}, AxisGroup{}}} }, RegionGeometry{ 5, 3, 2, 1, - {{SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 16384, 0}, 4}, SpeakerPoint{{32767, 16384, 0}, 5}, SpeakerPoint{{7928, 16384, 32767}, 6}, SpeakerPoint{{24840, 16384, 32767}, 7}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, + {{SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 32767, 0}, 4}, SpeakerPoint{{32767, 32767, 0}, 5}, SpeakerPoint{{7928, 16384, 32767}, 6}, SpeakerPoint{{24840, 16384, 32767}, 7}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, {{AxisGroup{1, {0, 0, 0}}, AxisGroup{2, {1, 2, 0}}, AxisGroup{}, AxisGroup{}}}, {{AxisGroup{2, {3, 4, 0}}, AxisGroup{}, AxisGroup{}, AxisGroup{}}} }, @@ -316,7 +316,7 @@ inline constexpr std::array kLayouts{{ }, RegionGeometry{ 4, 3, 1, 1, - {{SpeakerPoint{{0, 16384, 0}, 4}, SpeakerPoint{{32767, 16384, 0}, 5}, SpeakerPoint{{7928, 16384, 32767}, 6}, SpeakerPoint{{24840, 16384, 32767}, 7}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, + {{SpeakerPoint{{0, 32767, 0}, 4}, SpeakerPoint{{32767, 32767, 0}, 5}, SpeakerPoint{{7928, 16384, 32767}, 6}, SpeakerPoint{{24840, 16384, 32767}, 7}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, {{AxisGroup{2, {0, 1, 0}}, AxisGroup{}, AxisGroup{}, AxisGroup{}}}, {{AxisGroup{2, {2, 3, 0}}, AxisGroup{}, AxisGroup{}, AxisGroup{}}} }, @@ -334,25 +334,25 @@ inline constexpr std::array kLayouts{{ {{ RegionGeometry{ 9, 3, 2, 2, - {{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 16384, 0}, 4}, SpeakerPoint{{32767, 16384, 0}, 5}, SpeakerPoint{{7928, 7928, 32767}, 6}, SpeakerPoint{{24840, 7928, 32767}, 7}, SpeakerPoint{{7928, 24840, 32767}, 8}, SpeakerPoint{{24840, 24840, 32767}, 9}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, + {{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 32767, 0}, 4}, SpeakerPoint{{32767, 32767, 0}, 5}, SpeakerPoint{{7928, 7928, 32767}, 6}, SpeakerPoint{{24840, 7928, 32767}, 7}, SpeakerPoint{{7928, 24840, 32767}, 8}, SpeakerPoint{{24840, 24840, 32767}, 9}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, {{AxisGroup{3, {0, 2, 1}}, AxisGroup{2, {3, 4, 0}}, AxisGroup{}, AxisGroup{}}}, {{AxisGroup{2, {5, 6, 0}}, AxisGroup{2, {7, 8, 0}}, AxisGroup{}, AxisGroup{}}} }, RegionGeometry{ 9, 3, 2, 2, - {{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 16384, 0}, 4}, SpeakerPoint{{32767, 16384, 0}, 5}, SpeakerPoint{{7928, 7928, 32767}, 6}, SpeakerPoint{{24840, 7928, 32767}, 7}, SpeakerPoint{{7928, 24840, 32767}, 8}, SpeakerPoint{{24840, 24840, 32767}, 9}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, + {{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 32767, 0}, 4}, SpeakerPoint{{32767, 32767, 0}, 5}, SpeakerPoint{{7928, 7928, 32767}, 6}, SpeakerPoint{{24840, 7928, 32767}, 7}, SpeakerPoint{{7928, 24840, 32767}, 8}, SpeakerPoint{{24840, 24840, 32767}, 9}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, {{AxisGroup{3, {0, 2, 1}}, AxisGroup{2, {3, 4, 0}}, AxisGroup{}, AxisGroup{}}}, {{AxisGroup{2, {5, 6, 0}}, AxisGroup{2, {7, 8, 0}}, AxisGroup{}, AxisGroup{}}} }, RegionGeometry{ 9, 3, 2, 2, - {{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 16384, 0}, 4}, SpeakerPoint{{32767, 16384, 0}, 5}, SpeakerPoint{{7928, 7928, 32767}, 6}, SpeakerPoint{{24840, 7928, 32767}, 7}, SpeakerPoint{{7928, 24840, 32767}, 8}, SpeakerPoint{{24840, 24840, 32767}, 9}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, + {{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 32767, 0}, 4}, SpeakerPoint{{32767, 32767, 0}, 5}, SpeakerPoint{{7928, 7928, 32767}, 6}, SpeakerPoint{{24840, 7928, 32767}, 7}, SpeakerPoint{{7928, 24840, 32767}, 8}, SpeakerPoint{{24840, 24840, 32767}, 9}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, {{AxisGroup{3, {0, 2, 1}}, AxisGroup{2, {3, 4, 0}}, AxisGroup{}, AxisGroup{}}}, {{AxisGroup{2, {5, 6, 0}}, AxisGroup{2, {7, 8, 0}}, AxisGroup{}, AxisGroup{}}} }, RegionGeometry{ 7, 3, 2, 2, - {{SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 16384, 0}, 4}, SpeakerPoint{{32767, 16384, 0}, 5}, SpeakerPoint{{7928, 7928, 32767}, 6}, SpeakerPoint{{24840, 7928, 32767}, 7}, SpeakerPoint{{7928, 24840, 32767}, 8}, SpeakerPoint{{24840, 24840, 32767}, 9}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, + {{SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{0, 32767, 0}, 4}, SpeakerPoint{{32767, 32767, 0}, 5}, SpeakerPoint{{7928, 7928, 32767}, 6}, SpeakerPoint{{24840, 7928, 32767}, 7}, SpeakerPoint{{7928, 24840, 32767}, 8}, SpeakerPoint{{24840, 24840, 32767}, 9}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, {{AxisGroup{1, {0, 0, 0}}, AxisGroup{2, {1, 2, 0}}, AxisGroup{}, AxisGroup{}}}, {{AxisGroup{2, {3, 4, 0}}, AxisGroup{2, {5, 6, 0}}, AxisGroup{}, AxisGroup{}}} }, @@ -364,7 +364,7 @@ inline constexpr std::array kLayouts{{ }, RegionGeometry{ 6, 3, 1, 2, - {{SpeakerPoint{{0, 16384, 0}, 4}, SpeakerPoint{{32767, 16384, 0}, 5}, SpeakerPoint{{7928, 7928, 32767}, 6}, SpeakerPoint{{24840, 7928, 32767}, 7}, SpeakerPoint{{7928, 24840, 32767}, 8}, SpeakerPoint{{24840, 24840, 32767}, 9}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, + {{SpeakerPoint{{0, 32767, 0}, 4}, SpeakerPoint{{32767, 32767, 0}, 5}, SpeakerPoint{{7928, 7928, 32767}, 6}, SpeakerPoint{{24840, 7928, 32767}, 7}, SpeakerPoint{{7928, 24840, 32767}, 8}, SpeakerPoint{{24840, 24840, 32767}, 9}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}}, {{AxisGroup{2, {0, 1, 0}}, AxisGroup{}, AxisGroup{}, AxisGroup{}}}, {{AxisGroup{2, {2, 3, 0}}, AxisGroup{2, {4, 5, 0}}, AxisGroup{}, AxisGroup{}}} }, diff --git a/tests/test_core.cpp b/tests/test_core.cpp index b05be73..d00fe13 100644 --- a/tests/test_core.cpp +++ b/tests/test_core.cpp @@ -587,8 +587,8 @@ void test_speaker_warp_and_trim() { CHECK(joc::speaker::parameters_from_oamd(nullptr, layout514, &automatic514).ok()); // Warp 0 leaves the floor Y alone; warp 1 doubles it before the clamp. - const std::vector warp0 = {0.85973646214220434, 0, 0, 0, 0.35611450268596406, 0}; - const std::vector warp1 = {0.65801380052399572, 0, 0, 0, 0.65801380052399572, 0}; + const std::vector warp0 = {0.9126902722074105, 0, 0, 0, 0.18155106823708969, 0}; + const std::vector warp1 = {0.85973219419392444, 0, 0, 0, 0.35612480624995158, 0}; const std::vector clamped = {0, 0, 0, 0, 0.70794578438413791, 0}; check_gains(speaker_gains(layout51, automatic51, 0, 4096, 0), warp0); ejoc_speaker_controls warped = automatic51; @@ -612,10 +612,10 @@ void test_speaker_warp_and_trim() { explicit_controls.surround_db = -6.0; explicit_controls.listener_balance = 9.0 / 16.0; explicit_controls.overhead_balance = -9.0 / 16.0; - const std::vector trimmed = {0.36269933962647599, 0, 0, 0, 0.71183753429070229, 0}; + const std::vector trimmed = {0.68117911059016056, 0, 0, 0, 0.41744281702545366, 0}; check_gains(speaker_gains(layout51, explicit_controls, 0, 4096, 0), trimmed); // Per-object bypass keeps warp but drops balance and trim. - const std::vector bypassed = {0.70710678118654757, 0, 0, 0, 0.70710678118654757, 0}; + const std::vector bypassed = {0.92387494614065435, 0, 0, 0, 0.38269450465561039, 0}; check_gains(speaker_gains(layout51, explicit_controls, 0, 4096, 0, true), bypassed); // Centre trim is local to the front-centre region; height trim scales with Z. @@ -796,7 +796,7 @@ void test_speaker_step_trim_events() { update.trim.global_trim_mode = 0; update.trim.object_count = 16; CHECK(joc::speaker::step(&step, frame, &update, &error).ok()); - const std::vector warp1 = {0.65801380052399572, 0, 0, 0, 0.65801380052399572, 0}; + const std::vector warp1 = {0.85973219419392444, 0, 0, 0, 0.35612480624995158, 0}; std::vector gains(step.layout.channel_count); for (std::uint32_t channel = 0; channel < step.layout.channel_count; ++channel) { gains[channel] = step.output[read + channel]; @@ -810,8 +810,8 @@ void test_speaker_step_trim_events() { for (std::uint32_t channel = 0; channel < step.layout.channel_count; ++channel) { gains[channel] = step.output[read + channel]; } - const std::vector half_warp1 = {0.89123112643513935, 0, 0, 0, - 0.36916001977848539, 0}; + const std::vector half_warp1 = {0.9461247896349676, 0, 0, 0, + 0.18820181552760662, 0}; check_gains(gains, half_warp1); // A new trim element switches the controls back to warp 0. @@ -825,8 +825,8 @@ void test_speaker_step_trim_events() { for (std::uint32_t channel = 0; channel < step.layout.channel_count; ++channel) { gains[channel] = step.output[read + channel]; } - const std::vector half_warp0 = {0.94612591737884011, 0, 0, 0, - 0.18819614606507579, 0}; + const std::vector half_warp0 = {0.96001622724230795, 0, 0, 0, + 0.094556249720175942, 0}; check_gains(gains, half_warp0); // A warp 2 element renders through the expanded layout and folds.