diff options
author | wm4 <wm4@nowhere> | 2015-10-26 15:52:21 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-10-26 15:52:21 +0100 |
commit | 76d1b430b0a8c846676dfd36852844134bafaff0 (patch) | |
tree | db4eff9a0847c2dbafab20a4188b61d530f45713 /audio/filter/af_lavrresample.c | |
parent | ec27d573f492f30c1111678273d56f922330fdcd (diff) | |
download | mpv-76d1b430b0a8c846676dfd36852844134bafaff0.tar.bz2 mpv-76d1b430b0a8c846676dfd36852844134bafaff0.tar.xz |
audio: improve mp_chmap_to_lavc_unchecked() unknown chmap behavior
Change it so that it will always return a bitmask with the correct
number of channels set if an unknown channel map is passed. This didn't
work for channel counts larger than 8, as there are not any standard
channel layouts defined with more than 8 channels (both in mpv and
FFmpeg). Instead, it returned 0.
This will help when raising the maximum allowed channel count in mpv.
Some code in af_lavrresample relies on it, more or less.
One change is that unknown channel maps won't result in lavc standard
channel layouts anymore, just a set of random speakers. This should be
fine, as the caller of mp_chmap_to_lavc_unchecked() should handle these
cases. For mp_chmap_reorder_to_lavc() this is not so clear anymore, but
should also be ok.
For normal channel maps, simply dropping NA channels is still the
correct and wanted behavior.
Currently, the mpv maximum channel count is 8. This commit is
preparation for raising this limit.
Diffstat (limited to 'audio/filter/af_lavrresample.c')
0 files changed, 0 insertions, 0 deletions