RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Jan Ekström 2020-08-07 00:35:55 +03:00
parent c820c2d4bf
commit 1c7e55dd50
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libswresample/rematrix.c
View File

@ -143,7 +143,7 @@ av_cold int swr_build_matrix(uint64_t in_ch_layout_param, uint64_t out_ch_layout
if (in_ch_layout == AV_CH_LAYOUT_22POINT2 && if (in_ch_layout == AV_CH_LAYOUT_22POINT2 &&
out_ch_layout != AV_CH_LAYOUT_22POINT2) { out_ch_layout != AV_CH_LAYOUT_22POINT2) {
in_ch_layout = AV_CH_LAYOUT_5POINT1_BACK; in_ch_layout = (AV_CH_LAYOUT_7POINT1_WIDE_BACK|AV_CH_BACK_CENTER);
av_get_channel_layout_string(buf, sizeof(buf), -1, in_ch_layout); av_get_channel_layout_string(buf, sizeof(buf), -1, in_ch_layout);
av_log(log_context, AV_LOG_WARNING, av_log(log_context, AV_LOG_WARNING,
"Full-on remixing from 22.2 has not yet been implemented! " "Full-on remixing from 22.2 has not yet been implemented! "