Support the two 4.0 layouts in the plugin and the fork

This commit is contained in:
TheM14 committed 2026-10-27 23:52:43 +08:00
1 parent 9a9bb7b0c8
commit 7d013fef46
8 files changed
+56 -25

No files matched your search

+1 -1
View File
@@ -136,7 +136,7 @@ ad-joc-gain-db = 0
|---|---|---|
| `--ad-joc-binaural` | yes / no | yes |
| `--ad-joc-hrtf` | SOFA / Rosella / `.jochrtf` 路径 | 空(自动搜索) |
| `--ad-joc-layout` | `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` | 7.1 |
| `--ad-joc-layout` | `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`(旧值 `4.0` 仍按 `4.0 Surround`) | 7.1 |
| `--ad-joc-mode` | near / far / mid | mid |
| `--ad-joc-gain-db` | -60 … 12 | 0 |
| `--ad-joc-int24` | yes / no | no |
+8 -2
View File
@@ -551,7 +551,11 @@ static const struct mp_filter_info ad_joc_filter = {
/* mpv names layouts up to 7.1 itself; the renderer goes further (it is a Dolby
* Atmos renderer, so 5.1.2 … 9.1.6 follow the usual speaker order). Spell the
* wider ones out as speaker lists so mpv knows which channel is which. */
* wider ones out as speaker lists so mpv knows which channel is which.
*
* The two 4.0 layouts are different speaker sets: Surround is a front trio plus a
* back-centre speaker, Quad is a front and a back pair. "4.0" is the name the
* option used before they were told apart and still means the Surround layout. */
static const struct {
const char *name;
const char *speakers;
@@ -559,7 +563,9 @@ static const struct {
{"2.0", "fl-fr"},
{"3.0", "fl-fr-fc"},
{"3.1", "fl-fr-fc-lfe"},
{"4.0", "fl-fr-fc-bc"},
{"4.0", "fl-fr-fc-bc"},
{"4.0 Surround", "fl-fr-fc-bc"},
{"4.0 Quad", "fl-fr-bl-br"},
{"5.0", "fl-fr-fc-bl-br"},
{"5.1", "fl-fr-fc-lfe-bl-br"},
{"5.1.2", "fl-fr-fc-lfe-bl-br-tfl-tfr"},