diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2021-06-01 14:42:00 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2021-06-01 14:42:00 +0200 |
| commit | e0835d4cbde8e3b61b0c965afcd41f8f4b7ac121 (patch) | |
| tree | f49619fc806249da71afaf2ac14f99e088d24153 /fdk-aac/libSACdec/src/sac_calcM1andM2.h | |
| parent | 5ad4acef6721a67b8156cd6f7b45ad59849ca09b (diff) | |
| download | ODR-AudioEnc-e0835d4cbde8e3b61b0c965afcd41f8f4b7ac121.tar.gz ODR-AudioEnc-e0835d4cbde8e3b61b0c965afcd41f8f4b7ac121.tar.bz2 ODR-AudioEnc-e0835d4cbde8e3b61b0c965afcd41f8f4b7ac121.zip | |
Update fdk to v2.0.2
Diffstat (limited to 'fdk-aac/libSACdec/src/sac_calcM1andM2.h')
| -rw-r--r-- | fdk-aac/libSACdec/src/sac_calcM1andM2.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fdk-aac/libSACdec/src/sac_calcM1andM2.h b/fdk-aac/libSACdec/src/sac_calcM1andM2.h index 996238d..cefc4bb 100644 --- a/fdk-aac/libSACdec/src/sac_calcM1andM2.h +++ b/fdk-aac/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); |