Add the 4.0 Surround and 4.0 Quad speaker layouts to the kernel
This commit is contained in:
1 parent
7b83358eb5
commit
d2d6ac0e6f
7 files changed
+126
-9
No files matched your search
+3
-1
@@ -439,7 +439,9 @@ $$
|
|||||||
\mathbf h(u)\odot\mathbf v(v).
|
\mathbf h(u)\odot\mathbf v(v).
|
||||||
$$
|
$$
|
||||||
|
|
||||||
For 5.1-family layouts with one horizontal surround pair rather than separate side and rear pairs, the longitudinal coordinate is
|
For layouts with one horizontal surround pair rather than separate side and rear pairs (the 5.1
|
||||||
|
family, and layouts such as 4.0 Quad and 4.0 Surround that carry one rear pair only), the
|
||||||
|
longitudinal coordinate is
|
||||||
|
|
||||||
$$
|
$$
|
||||||
v_{\mathrm{floor}}=
|
v_{\mathrm{floor}}=
|
||||||
|
|||||||
+2
-1
@@ -439,7 +439,8 @@ $$
|
|||||||
\mathbf h(u)\odot\mathbf v(v).
|
\mathbf h(u)\odot\mathbf v(v).
|
||||||
$$
|
$$
|
||||||
|
|
||||||
对于只有一对水平环绕、没有独立 side/rear 两对的 5.1 系列布局,纵向坐标使用
|
对于只有一对水平环绕、没有独立 side/rear 两对的布局(5.1 系列,以及 4.0 Quad 与
|
||||||
|
4.0 Surround 这类只有一对后置声道的布局),纵向坐标使用
|
||||||
|
|
||||||
$$
|
$$
|
||||||
v_{\mathrm{floor}}=
|
v_{\mathrm{floor}}=
|
||||||
|
|||||||
@@ -9,8 +9,8 @@
|
|||||||
#define JOC_VERSION_H
|
#define JOC_VERSION_H
|
||||||
|
|
||||||
#define JOC_VERSION_MAJOR 1
|
#define JOC_VERSION_MAJOR 1
|
||||||
#define JOC_VERSION_MINOR 0
|
#define JOC_VERSION_MINOR 1
|
||||||
#define JOC_VERSION_PATCH 0
|
#define JOC_VERSION_PATCH 0
|
||||||
#define JOC_VERSION_STRING "1.0.0"
|
#define JOC_VERSION_STRING "1.1.0"
|
||||||
|
|
||||||
#endif /* JOC_VERSION_H */
|
#endif /* JOC_VERSION_H */
|
||||||
+1
-1
@@ -84,7 +84,7 @@ struct Options {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const char* kLayoutChoices =
|
const char* kLayoutChoices =
|
||||||
"2.0 3.0 3.1 4.0 5.0 5.1 5.1.2 5.1.4 6.1 7.0 7.1 7.1.2 7.1.4 9.1.4 9.1.6 22.2";
|
"2.0 3.1 \"4.0 Surround\" \"4.0 Quad\" 5.1 7.1 5.1.2 5.1.4 7.1.2 7.1.4 9.1.4 9.1.6";
|
||||||
|
|
||||||
void print_usage() {
|
void print_usage() {
|
||||||
std::printf(
|
std::printf(
|
||||||
|
|||||||
@@ -15,6 +15,8 @@ struct FrozenLayout {
|
|||||||
constexpr FrozenLayout kLayouts[kLayoutCount] = {
|
constexpr FrozenLayout kLayouts[kLayoutCount] = {
|
||||||
{"2.0", 0, 1},
|
{"2.0", 0, 1},
|
||||||
{"3.1", 3, 7},
|
{"3.1", 3, 7},
|
||||||
|
{"4.0 Surround", 0xFF, 35},
|
||||||
|
{"4.0 Quad", 0xFF, 9},
|
||||||
{"5.1", 7, 15},
|
{"5.1", 7, 15},
|
||||||
{"7.1", 11, 31},
|
{"7.1", 11, 31},
|
||||||
{"5.1.2", 13, 1039},
|
{"5.1.2", 13, 1039},
|
||||||
@@ -25,6 +27,14 @@ constexpr FrozenLayout kLayouts[kLayoutCount] = {
|
|||||||
{"9.1.6", 20, 3743},
|
{"9.1.6", 20, 3743},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Spellings accepted in addition to the names above.
|
||||||
|
constexpr struct {
|
||||||
|
const char* alias;
|
||||||
|
const char* name;
|
||||||
|
} kAliases[] = {
|
||||||
|
{"4.0", "4.0 Surround"},
|
||||||
|
};
|
||||||
|
|
||||||
void fill(const FrozenLayout& source, LayoutInfo* out) {
|
void fill(const FrozenLayout& source, LayoutInfo* out) {
|
||||||
out->name = source.name;
|
out->name = source.name;
|
||||||
out->out_ch_config = source.out_ch_config;
|
out->out_ch_config = source.out_ch_config;
|
||||||
@@ -52,6 +62,11 @@ bool layout_by_name(const char* name, LayoutInfo* out) {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
for (const auto& alias : kAliases) {
|
||||||
|
if (std::strcmp(name, alias.alias) == 0) {
|
||||||
|
return layout_by_name(alias.name, out);
|
||||||
|
}
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
namespace joc::speaker {
|
namespace joc::speaker {
|
||||||
|
|
||||||
inline constexpr int kLayoutCount = 10;
|
inline constexpr int kLayoutCount = 12;
|
||||||
|
|
||||||
struct LayoutInfo {
|
struct LayoutInfo {
|
||||||
const char* name = "";
|
const char* name = "";
|
||||||
@@ -17,10 +17,13 @@ struct LayoutInfo {
|
|||||||
std::uint32_t channel_count = 0;
|
std::uint32_t channel_count = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
// All ten layouts in the reference's order (2.0, 3.1, 5.1, 7.1, 5.1.2, 5.1.4,
|
// All twelve layouts in the reference's order (2.0, 3.1, 4.0 Surround, 4.0 Quad,
|
||||||
|
// 5.1, 7.1, 5.1.2, 5.1.4, 7.1.2, 7.1.4, 9.1.4, 9.1.6).
|
||||||
bool layout_at(int index, LayoutInfo* out);
|
bool layout_at(int index, LayoutInfo* out);
|
||||||
|
|
||||||
// False when the name is unknown (case-sensitive, exactly as the reference CLI).
|
// False when the name is unknown (case-sensitive, as the reference CLI). The
|
||||||
|
// legacy spelling "4.0" resolves to 4.0 Surround, which is what that name meant
|
||||||
|
// before the two 4.0 layouts were told apart.
|
||||||
bool layout_by_name(const char* name, LayoutInfo* out);
|
bool layout_by_name(const char* name, LayoutInfo* out);
|
||||||
|
|
||||||
bool layout_by_bitfield(std::uint32_t bitfield, LayoutInfo* out);
|
bool layout_by_bitfield(std::uint32_t bitfield, LayoutInfo* out);
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ struct LayoutGeometry {
|
|||||||
std::array<RegionGeometry, 7> regions{};
|
std::array<RegionGeometry, 7> regions{};
|
||||||
};
|
};
|
||||||
|
|
||||||
inline constexpr std::array<LayoutGeometry, 10> kLayouts{{
|
inline constexpr std::array<LayoutGeometry, 12> kLayouts{{
|
||||||
LayoutGeometry{
|
LayoutGeometry{
|
||||||
0x1u, 0, 2,
|
0x1u, 0, 2,
|
||||||
{{0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
|
{{0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
|
||||||
@@ -136,6 +136,102 @@ inline constexpr std::array<LayoutGeometry, 10> kLayouts{{
|
|||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
},
|
},
|
||||||
|
LayoutGeometry{
|
||||||
|
0x23u, 0xFFu, 4,
|
||||||
|
{{0, 1, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
|
||||||
|
{{
|
||||||
|
RegionGeometry{
|
||||||
|
4, 2, 2, 0,
|
||||||
|
{{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{16384, 32767, 0}, 3}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}},
|
||||||
|
{{AxisGroup{3, {0, 2, 1}}, AxisGroup{1, {3, 0, 0}}, AxisGroup{}, AxisGroup{}}},
|
||||||
|
{{AxisGroup{}, AxisGroup{}, AxisGroup{}, AxisGroup{}}}
|
||||||
|
},
|
||||||
|
RegionGeometry{
|
||||||
|
3, 1, 1, 0,
|
||||||
|
{{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}},
|
||||||
|
{{AxisGroup{3, {0, 2, 1}}, AxisGroup{}, AxisGroup{}, AxisGroup{}}},
|
||||||
|
{{AxisGroup{}, AxisGroup{}, AxisGroup{}, AxisGroup{}}}
|
||||||
|
},
|
||||||
|
RegionGeometry{
|
||||||
|
4, 2, 2, 0,
|
||||||
|
{{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{16384, 32767, 0}, 3}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}},
|
||||||
|
{{AxisGroup{3, {0, 2, 1}}, AxisGroup{1, {3, 0, 0}}, AxisGroup{}, AxisGroup{}}},
|
||||||
|
{{AxisGroup{}, AxisGroup{}, AxisGroup{}, AxisGroup{}}}
|
||||||
|
},
|
||||||
|
RegionGeometry{
|
||||||
|
2, 2, 2, 0,
|
||||||
|
{{SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{{16384, 32767, 0}, 3}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}},
|
||||||
|
{{AxisGroup{1, {0, 0, 0}}, AxisGroup{1, {1, 0, 0}}, AxisGroup{}, AxisGroup{}}},
|
||||||
|
{{AxisGroup{}, AxisGroup{}, AxisGroup{}, AxisGroup{}}}
|
||||||
|
},
|
||||||
|
RegionGeometry{
|
||||||
|
3, 1, 1, 0,
|
||||||
|
{{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}},
|
||||||
|
{{AxisGroup{3, {0, 2, 1}}, AxisGroup{}, AxisGroup{}, AxisGroup{}}},
|
||||||
|
{{AxisGroup{}, AxisGroup{}, AxisGroup{}, AxisGroup{}}}
|
||||||
|
},
|
||||||
|
RegionGeometry{
|
||||||
|
1, 1, 1, 0,
|
||||||
|
{{SpeakerPoint{{16384, 32767, 0}, 3}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}},
|
||||||
|
{{AxisGroup{1, {0, 0, 0}}, AxisGroup{}, AxisGroup{}, AxisGroup{}}},
|
||||||
|
{{AxisGroup{}, AxisGroup{}, AxisGroup{}, AxisGroup{}}}
|
||||||
|
},
|
||||||
|
RegionGeometry{
|
||||||
|
3, 1, 1, 0,
|
||||||
|
{{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{16384, 0, 0}, 2}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}},
|
||||||
|
{{AxisGroup{3, {0, 2, 1}}, AxisGroup{}, AxisGroup{}, AxisGroup{}}},
|
||||||
|
{{AxisGroup{}, AxisGroup{}, AxisGroup{}, AxisGroup{}}}
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
},
|
||||||
|
LayoutGeometry{
|
||||||
|
0x9u, 0xFFu, 4,
|
||||||
|
{{0, 1, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
|
||||||
|
{{
|
||||||
|
RegionGeometry{
|
||||||
|
4, 2, 2, 0,
|
||||||
|
{{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{0, 32767, 0}, 2}, SpeakerPoint{{32767, 32767, 0}, 3}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}},
|
||||||
|
{{AxisGroup{2, {0, 1, 0}}, AxisGroup{2, {2, 3, 0}}, AxisGroup{}, AxisGroup{}}},
|
||||||
|
{{AxisGroup{}, AxisGroup{}, AxisGroup{}, AxisGroup{}}}
|
||||||
|
},
|
||||||
|
RegionGeometry{
|
||||||
|
4, 2, 2, 0,
|
||||||
|
{{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{0, 32767, 0}, 2}, SpeakerPoint{{32767, 32767, 0}, 3}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}},
|
||||||
|
{{AxisGroup{2, {0, 1, 0}}, AxisGroup{2, {2, 3, 0}}, AxisGroup{}, AxisGroup{}}},
|
||||||
|
{{AxisGroup{}, AxisGroup{}, AxisGroup{}, AxisGroup{}}}
|
||||||
|
},
|
||||||
|
RegionGeometry{
|
||||||
|
4, 2, 2, 0,
|
||||||
|
{{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, SpeakerPoint{{0, 32767, 0}, 2}, SpeakerPoint{{32767, 32767, 0}, 3}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}, SpeakerPoint{}}},
|
||||||
|
{{AxisGroup{2, {0, 1, 0}}, AxisGroup{2, {2, 3, 0}}, AxisGroup{}, AxisGroup{}}},
|
||||||
|
{{AxisGroup{}, AxisGroup{}, AxisGroup{}, AxisGroup{}}}
|
||||||
|
},
|
||||||
|
RegionGeometry{
|
||||||
|
2, 1, 1, 0,
|
||||||
|
{{SpeakerPoint{{0, 32767, 0}, 2}, SpeakerPoint{{32767, 32767, 0}, 3}, 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{}}}
|
||||||
|
},
|
||||||
|
RegionGeometry{
|
||||||
|
2, 1, 1, 0,
|
||||||
|
{{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, 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{}}}
|
||||||
|
},
|
||||||
|
RegionGeometry{
|
||||||
|
2, 1, 1, 0,
|
||||||
|
{{SpeakerPoint{{0, 32767, 0}, 2}, SpeakerPoint{{32767, 32767, 0}, 3}, 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{}}}
|
||||||
|
},
|
||||||
|
RegionGeometry{
|
||||||
|
2, 1, 1, 0,
|
||||||
|
{{SpeakerPoint{{0, 0, 0}, 0}, SpeakerPoint{{32767, 0, 0}, 1}, 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{}}}
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
},
|
||||||
LayoutGeometry{
|
LayoutGeometry{
|
||||||
0xFu, 7, 6,
|
0xFu, 7, 6,
|
||||||
{{0, 1, 2, 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
|
{{0, 1, 2, 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
|
||||||
|
|||||||
Reference in new issue
Block a user