diff options
| author | Xin Li <delphij@google.com> | 2019-07-01 20:59:18 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2019-07-01 20:59:18 +0000 |
| commit | 4d56b880e2d129757bd0855859da83cad0399965 (patch) | |
| tree | fa62c4f58bc140ba5c0a27e2c913d3ea0a5bfe98 /libSACdec/src/sac_rom.h | |
| parent | c10b5daa8da7e059eeaebbe7ac22c9635a6af26d (diff) | |
| parent | 058d1295f4d9e3418eafb1fd7c92602000ff5c53 (diff) | |
| download | fdk-aac-4d56b880e2d129757bd0855859da83cad0399965.tar.gz fdk-aac-4d56b880e2d129757bd0855859da83cad0399965.tar.bz2 fdk-aac-4d56b880e2d129757bd0855859da83cad0399965.zip | |
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
Bug: 134405016
Change-Id: I30ab93ed5c2fa3c47306058d1a0f749b8101b01e
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]; |