]> git.sesse.net Git - ffmpeg/commit
swresample/rematrix: handle 22.2 as a 9 channel layout
authorJan Ekström <jeebjp@gmail.com>
Thu, 6 Aug 2020 21:35:55 +0000 (00:35 +0300)
committerJan Ekström <jeebjp@gmail.com>
Tue, 18 Aug 2020 19:47:35 +0000 (22:47 +0300)
commit1c7e55dd504245d71444fac1a73e5370cc76fede
treef22fcddd9951ec546a9d624de29140e37fd59178
parentc820c2d4bfb7e2573f7bf8e2a3544a98e5a11343
swresample/rematrix: handle 22.2 as a 9 channel layout

This is as far as 22.2 follows the same channel order as
WaveFormatExtensible's channel mask (and the AV_CH_* defines).

After LFE2 the side channels would follow, but that offset of
one stops us from utilizing them without further tweaks.

This change was verified by using swresample to downmix to 5.1,
and then feeding that to WASAPI.
libswresample/rematrix.c