]> git.sesse.net Git - ffmpeg/commit
swresample: Use channel count in rematrix initialization
authorMarcin Gorzel <gorzel-at-google.com@ffmpeg.org>
Tue, 24 Jul 2018 13:55:47 +0000 (14:55 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 26 Jul 2018 00:42:42 +0000 (02:42 +0200)
commit8b710ea5e7b8a3c3f60fb867bb104b0ec9ea4e83
treeed1678f7455741e4bbc9cd377de6968deb46798f
parentd01d46ad860c526e2bde9bcaca28a3592787848d
swresample: Use channel count in rematrix initialization

Rematrixing supports up to 64 channels. However, there is only a limited number of channel layouts defined. Since the in/out channel count is currently obtained from the channel layout, for undefined layouts (e.g. for 9, 10, 11 channels etc.) the rematrixing fails.

This patch changes rematrix init methods to use in (used) and out channel count directly instead of computing it from channel layout.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libswresample/rematrix.c
libswresample/x86/rematrix_init.c