diff --git a/README.en.md b/README.en.md
index 9f46cbf..efab57d 100644
--- a/README.en.md
+++ b/README.en.md
@@ -169,8 +169,8 @@ every container in the library, which is where the volume comes from.
## Known limitations
* ADM BWF output is not implemented.
-* Speaker layouts go up to 9.1.6 (16 channels), which is the renderer's own limit — there is no
- 22.2, see [Speaker layouts and channel order](#speaker-layouts-and-channel-order).
+* Speaker layouts go up to 9.1.6 (16 channels), the renderer's own output limit; see
+ [Speaker layouts and channel order](#speaker-layouts-and-channel-order).
* A multichannel layout declares no speaker positions in Properties, and the per-chunk map used for
playback is only foobar2000's default for the channel count; output mapping is up to the user's
channel assignment (same section).
diff --git a/README.md b/README.md
index 147f886..48a8782 100644
--- a/README.md
+++ b/README.md
@@ -136,7 +136,7 @@ pwsh -File tools/package.ps1 # 两个架构,打包到 dist\*.fb2k-c
## 已知限制
* 不实现 ADM BWF 输出。
-* 扬声器布局到 9.1.6(16 声道)为止;内核输出上限就是 16 声道,没有 22.2,见
+* 扬声器布局到 9.1.6(16 声道)为止;内核输出上限就是 16 声道,见
[扬声器布局与声道顺序](#扬声器布局与声道顺序)。
* 多声道布局在 Properties 里不声明扬声器位置,播放时的块内映射只是 foobar2000 对该声道数的
默认值;输出映射要按声道编号自行完成(同上)。
diff --git a/kernel/joc_kernel.vcxproj b/kernel/joc_kernel.vcxproj
index 3935ec4..9ddb582 100644
--- a/kernel/joc_kernel.vcxproj
+++ b/kernel/joc_kernel.vcxproj
@@ -175,6 +175,7 @@
+
@@ -250,6 +251,7 @@
+
diff --git a/kernel/src/adm/adm_metadata.cpp b/kernel/src/adm/adm_metadata.cpp
index fa9329d..4240162 100644
--- a/kernel/src/adm/adm_metadata.cpp
+++ b/kernel/src/adm/adm_metadata.cpp
@@ -151,6 +151,14 @@ Status build_dbmd(std::uint32_t object_count, BinauralMode mode, std::string* ou
for (std::size_t i = 5u + 262u; i < segment10.size(); ++i) {
segment10[i] = static_cast(0x84);
}
+ // Nine 15-byte configuration trims start at byte 7; the first byte of each
+ // carries the auto-trim flag in bit 0 (1 = automatic, 0 = manual). The
+ // default is automatic, so a freshly rendered master opens with automatic
+ // trims in the renderer.
+ for (std::size_t layout = 0; layout < 9; ++layout) {
+ const std::size_t flag = 7u + 15u * layout;
+ segment10[flag] = static_cast(static_cast(segment10[flag]) | 0x01u);
+ }
const std::size_t object_modes = 4u + 2u + 1u + 9u * 15u + object_count;
for (std::uint32_t i = 10; i < std::min(object_count, 10u + kObjectCount); ++i) {
const std::size_t index = object_modes + i;
diff --git a/kernel/src/adm/adm_tracks.cpp b/kernel/src/adm/adm_tracks.cpp
index 067f8fa..437ea9e 100644
--- a/kernel/src/adm/adm_tracks.cpp
+++ b/kernel/src/adm/adm_tracks.cpp
@@ -236,6 +236,9 @@ void TrajectoryBuilder::submit_frame(std::int64_t frame_index, const oamd::OamdU
ramp_samples = static_cast(update->ramp_duration_samples);
}
for (int object = 1; object <= kObjectCount; ++object) {
+ if (fixed_[object - 1]) {
+ continue; // 固定 bed 声道:位置由布局给出,不跟 OAMD 更新
+ }
double x = 0.0;
double y = 0.0;
double z = 0.0;
@@ -260,6 +263,18 @@ Status TrajectoryBuilder::build(std::int64_t total_samples, TrajectoryMode mode,
for (int object = 1; object <= kObjectCount; ++object) {
Track track;
track.name = "JOC_Object_" + std::to_string(object);
+ if (fixed_[object - 1]) {
+ Keyframe block;
+ block.rtime_samples = 0;
+ block.x = fixed_xyz_[object - 1][0];
+ block.y = fixed_xyz_[object - 1][1];
+ block.z = fixed_xyz_[object - 1][2];
+ block.duration_samples = total_samples;
+ block.interpolation_samples = 0;
+ track.blocks.push_back(block);
+ out->push_back(std::move(track));
+ continue;
+ }
const Status status =
(mode == TrajectoryMode::Compact)
? expand_compact(events_[object - 1], total_samples, rate_, block_,
diff --git a/kernel/src/adm/adm_tracks.h b/kernel/src/adm/adm_tracks.h
index 8ad2505..316ccb1 100644
--- a/kernel/src/adm/adm_tracks.h
+++ b/kernel/src/adm/adm_tracks.h
@@ -38,6 +38,18 @@ public:
Status build(std::int64_t total_samples, TrajectoryMode mode, std::vector