mirror of
https://github.com/mpv-player/mpv
synced 2025-02-19 14:26:57 +00:00
015a7638fb
Instead of somehow having 4 different cases with each their own weight,
do it with a single function that decides which channel layout is the
better fallback.
This is simpler, and also introduces new (fixed) semantics. The new test
added to test/chmap_sel.c actually works now. This is a mixed case with
no perfect upmix or downmix, but the better choice is the one which
loses the least channels from the original layout.
One test also changes. If the input is 7.1(wide-side), and the available
layouts are 7.1 and 5.1(side), the latter is now chosen instead of the
former. This makes sense: both layouts contain 6 out of 8 channels from
the original layout, but the 5.1(side) one is smaller. This follows the
general logic. The 7.1 layout has FLC/RLC speakers instead of BL/BR,
and judging by the names, "front left center" is completely different
from "back left". If these should be exchangeable, a separate exception
would have to be added.
(cherry picked from commit
|
||
|---|---|---|
| .. | ||
| decode | ||
| filter | ||
| out | ||
| audio_buffer.c | ||
| audio_buffer.h | ||
| audio.c | ||
| audio.h | ||
| chmap_sel.c | ||
| chmap_sel.h | ||
| chmap.c | ||
| chmap.h | ||
| fmt-conversion.c | ||
| fmt-conversion.h | ||
| format.c | ||
| format.h | ||
| mixer.c | ||
| mixer.h | ||