diff options
| author | Xin Li <delphij@google.com> | 2020-09-08 16:53:57 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2020-09-08 16:53:57 -0700 |
| commit | 7f7e67fe023aa5e479aba0388a7e3fb591bda4e5 (patch) | |
| tree | 0e353968c34e8c9699663a9b252836b70847c30b /libSACdec/src/sac_calcM1andM2.h | |
| parent | 946a672b0f5b8481eb3a429f854fcb34d847d692 (diff) | |
| parent | 7a0dde5d5dc4d24095c0391e7fa8297de3c7cd45 (diff) | |
| download | fdk-aac-7f7e67fe023aa5e479aba0388a7e3fb591bda4e5.tar.gz fdk-aac-7f7e67fe023aa5e479aba0388a7e3fb591bda4e5.tar.bz2 fdk-aac-7f7e67fe023aa5e479aba0388a7e3fb591bda4e5.zip | |
Merge Android R
Bug: 168057903
Merged-In: Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77
Change-Id: I29b7ae1003fb72aeb5fbf1fdfdceea849c1c12b8
Diffstat (limited to 'libSACdec/src/sac_calcM1andM2.h')
| -rw-r--r-- | libSACdec/src/sac_calcM1andM2.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libSACdec/src/sac_calcM1andM2.h b/libSACdec/src/sac_calcM1andM2.h index 996238d..cefc4bb 100644 --- a/libSACdec/src/sac_calcM1andM2.h +++ b/libSACdec/src/sac_calcM1andM2.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 @@ -117,6 +117,9 @@ amm-info@iis.fraunhofer.de /* Scaling of spectral data after applying M2 matrix, but only for binaural upmix type Scaling is compensated later in synthesis qmf filterbank */ #define SCALE_DATA_APPLY_M2 (1) +/* Applying M2 parameter in combination with phase coding needs 2 bits headroom + * because up to a maximum of 4 spectral values can be added for USAC */ +#define SCALE_DATA_APPLY_M2_PC (2) SACDEC_ERROR initM1andM2(spatialDec* self, int initStatesFlag, int configChanged); |