generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

aac: correctly map 7.1ch-wide AAC from FDK AAC encoder

Browse Source 
FDK AAC encoder outputs SCE(front)+CPE(front)+CPE(back)+CPE(back) on
MODE_7_1_REAR_SURROUND configuration.
Since decoder couldn't properly map 4 back channels, decoding failed
unless -request_channel_layout 0x8000000000000000 has been specified.
Now we treat first CPE(back) as CPE(side) on channel mapping.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
nu774 2015-06-04 14:42:08 +09:00 committed by Luca Barbato
parent 252d6200c3
commit 677c804aa3
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/aacdec.c
View File

@ -291,6 +291,11 @@ static uint64_t sniff_channel_order(uint8_t (*layout_map)[3], int tags)
if (num_back_channels < 0)
return 0;
if (num_side_channels == 0 && num_back_channels >= 4) {
num_side_channels = 2;
num_back_channels -= 2;
}
i = 0;
if (num_front_channels & 1) {
e2c_vec[i] = (struct elem_to_channel) {