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.
Unified · Split
| @@ -143,7 +143,7 @@ av_cold int swr_build_matrix(uint64_t in_ch_layout_param, uint64_t out_ch_layout · 142 unmodified lines | |||
| 143 | 143 | ||
| 144 | if (in_ch_layout == AV_CH_LAYOUT_22POINT2 && | 144 | if (in_ch_layout == AV_CH_LAYOUT_22POINT2 && |
| 145 | out_ch_layout != AV_CH_LAYOUT_22POINT2) { | 145 | out_ch_layout != AV_CH_LAYOUT_22POINT2) { |
| 146 | in_ch_layout = AV_CH_LAYOUT_5POINT1_BACK; | 146 | in_ch_layout = (AV_CH_LAYOUT_7POINT1_WIDE_BACK|AV_CH_BACK_CENTER); |
| 147 | av_get_channel_layout_string(buf, sizeof(buf), -1, in_ch_layout); | 147 | av_get_channel_layout_string(buf, sizeof(buf), -1, in_ch_layout); |
| 148 | av_log(log_context, AV_LOG_WARNING, | 148 | av_log(log_context, AV_LOG_WARNING, |
| 149 | "Full-on remixing from 22.2 has not yet been implemented! " | 149 | "Full-on remixing from 22.2 has not yet been implemented! " |