mirror of https://github.com/mpv-player/mpv
fd1194de3c
The speaker replacement nonsense sometimes made blatantly incorrect decisions. In this case, it prefered a 7.1(rear) upmix over outputting 5.1(side) as 5.1, which makes no sense at all. This happened because 5.1 and 7.1(rear) appeared equivalent to the final selection, as both of them lose the sl-sr channels. The old code was too stupid to select the one with the lower number of channels as well. Redo this. There's really no reason why there should be a separate final decision, so move the speaker replacement logic into the mp_chmap_is_better() function. Improve some other details. For example, we never should compare the plain number of channels for deciding upmix/downmix, because due to NA channels this is essentially meaningless. Remove the NA channels when doing this comparison. Also, explicitly handle exact matches. Conceptually this is not necessary, but it avoids that we have to needlessly shuffle audio data around. |
||
|---|---|---|
| .. | ||
| decode | ||
| filter | ||
| out | ||
| audio.c | ||
| audio.h | ||
| audio_buffer.c | ||
| audio_buffer.h | ||
| chmap.c | ||
| chmap.h | ||
| chmap_sel.c | ||
| chmap_sel.h | ||
| fmt-conversion.c | ||
| fmt-conversion.h | ||
| format.c | ||
| format.h | ||
| mixer.c | ||
| mixer.h | ||