diff options
| author | Martin Storsjo <martin@martin.st> | 2014-11-07 09:32:48 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2014-11-07 09:32:48 +0200 |
| commit | 6ccecbc4b0dfca00f13999aa41b2c56f6b55a72f (patch) | |
| tree | da3cf1b27c50bd6d81be8b0183f494d15539027a /libAACdec/src/aac_rom.h | |
| parent | ce1863444a9e1d825c53bb3929f0b8fe664a6464 (diff) | |
| parent | d149516e1a3a63549d2c654b1398544d5de46a3e (diff) | |
| download | fdk-aac-dabplus-6ccecbc4b0dfca00f13999aa41b2c56f6b55a72f.tar.gz fdk-aac-dabplus-6ccecbc4b0dfca00f13999aa41b2c56f6b55a72f.tar.bz2 fdk-aac-dabplus-6ccecbc4b0dfca00f13999aa41b2c56f6b55a72f.zip | |
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libAACdec/src/aac_rom.h')
| -rw-r--r-- | libAACdec/src/aac_rom.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libAACdec/src/aac_rom.h b/libAACdec/src/aac_rom.h index 536d184..f314a2d 100644 --- a/libAACdec/src/aac_rom.h +++ b/libAACdec/src/aac_rom.h @@ -177,11 +177,12 @@ extern const USHORT randomSign[AAC_NF_NO_RANDOM_VAL/16]; extern const FIXP_DBL pow2_div24minus1[47]; extern const int offsetTab[2][16]; -/* Channel mapping indices for time domain I/O. First dimension is channel count-1. */ -extern const UCHAR channelMappingTablePassthrough[8][8]; -extern const UCHAR channelMappingTableWAV[8][8]; +/* Channel mapping indices for time domain I/O. + The first dimension is the channel configuration index. */ +extern const UCHAR channelMappingTablePassthrough[15][8]; +extern const UCHAR channelMappingTableWAV[15][8]; /* Lookup tables for elements in ER bitstream */ -extern const MP4_ELEMENT_ID elementsTab[8][7]; +extern const MP4_ELEMENT_ID elementsTab[15][7]; #endif /* #ifndef AAC_ROM_H */ |