diff options
| author | Martin Storsjo <martin@martin.st> | 2019-10-08 14:53:07 +0300 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2019-10-08 14:53:07 +0300 |
| commit | e365f4f27802954f0cf65d3e2eac88b7fdebc83c (patch) | |
| tree | d0ef656126c0ad2758164a0cf04136efccfe14c1 /libSACdec/src/sac_rom.h | |
| parent | d387d3b6ed79ff9a82c60440bdd86e6e5e324bec (diff) | |
| parent | d929f68a05f5cbdd812dca287c8115a39439acf1 (diff) | |
| download | fdk-aac-e365f4f27802954f0cf65d3e2eac88b7fdebc83c.tar.gz fdk-aac-e365f4f27802954f0cf65d3e2eac88b7fdebc83c.tar.bz2 fdk-aac-e365f4f27802954f0cf65d3e2eac88b7fdebc83c.zip | |
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libSACdec/src/sac_rom.h')
| -rw-r--r-- | libSACdec/src/sac_rom.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libSACdec/src/sac_rom.h b/libSACdec/src/sac_rom.h index d366fb6..38f17f2 100644 --- a/libSACdec/src/sac_rom.h +++ b/libSACdec/src/sac_rom.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -147,7 +147,7 @@ amm-info@iis.fraunhofer.de #define CLIP_PROTECT_GAIN_1(x) FL2FXCONST_CFG(((x) / (float)(1 << 1))) #define CLIP_PROTECT_GAIN_2(x) FL2FXCONST_CFG(((x) / (float)(1 << 2))) -#define SF_CLD_C1C2 (8) +#define SF_CLD_C1C2 (9) extern const FIXP_CFG dequantCPC__FDK[]; extern const FIXP_CFG dequantICC__FDK[8]; @@ -160,6 +160,7 @@ extern const FIXP_CFG dequantCLD__FDK[31]; (FL2FXCONST_DBL(3.1415926535897932f / (float)(1 << (IPD_SCALE - 1)))) extern const FIXP_CFG dequantIPD__FDK[16]; +extern const FIXP_DBL dequantIPD_CLD_ICC_splitAngle__FDK[15][31][8]; extern const FIXP_CFG H11_nc[31][8]; extern const FIXP_CFG H12_nc[31][8]; |