Skip to content

Commit 1c7e55d

Browse files
committed
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.
1 parent c820c2d commit 1c7e55d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Diff for: libswresample/rematrix.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ av_cold int swr_build_matrix(uint64_t in_ch_layout_param, uint64_t out_ch_layout
143143

144144
if (in_ch_layout == AV_CH_LAYOUT_22POINT2 &&
145145
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);
147147
av_get_channel_layout_string(buf, sizeof(buf), -1, in_ch_layout);
148148
av_log(log_context, AV_LOG_WARNING,
149149
"Full-on remixing from 22.2 has not yet been implemented! "

0 commit comments

Comments
 (0)