diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-02-15 03:18:33 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-02-15 03:18:33 +0000 |
| commit | 4422539a921bc39694a2ae210ce69e4410d2c235 (patch) | |
| tree | 44d6676c2975eec965bb3e6c2562e1632eaf4385 /libFDK/include/mdct.h | |
| parent | 67aa964d429b7bfe242b28cd223ae1dddf8e3a78 (diff) | |
| parent | e016635f0d3a5c7532b00711ce461f97a13f7bc2 (diff) | |
| download | fdk-aac-4422539a921bc39694a2ae210ce69e4410d2c235.tar.gz fdk-aac-4422539a921bc39694a2ae210ce69e4410d2c235.tar.bz2 fdk-aac-4422539a921bc39694a2ae210ce69e4410d2c235.zip | |
Snap for 6210127 from e016635f0d3a5c7532b00711ce461f97a13f7bc2 to rvc-release
Change-Id: Icca87a4feea92b453adc049922c543eb3bf048fd
Diffstat (limited to 'libFDK/include/mdct.h')
| -rw-r--r-- | libFDK/include/mdct.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libFDK/include/mdct.h b/libFDK/include/mdct.h index 1382374..e7cf3ad 100644 --- a/libFDK/include/mdct.h +++ b/libFDK/include/mdct.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 @@ -106,18 +106,16 @@ amm-info@iis.fraunhofer.de #include "common_fix.h" #define MDCT_OUT_HEADROOM 2 /* Output additional headroom */ -#define PCM_OUT_BITS SAMPLE_BITS + +#define PCM_OUT_BITS DFRACT_BITS #define PCM_OUT_HEADROOM 8 /* Must have the same values as DMXH_HEADROOM */ -#define MDCT_OUTPUT_SCALE (-MDCT_OUT_HEADROOM + (DFRACT_BITS - SAMPLE_BITS)) +#define MDCT_OUTPUT_SCALE (-MDCT_OUT_HEADROOM + (DFRACT_BITS - PCM_OUT_BITS)) /* Refer to "Output word length" in ISO/IEC 14496-3:2008(E) 23.2.3.6 */ #define MDCT_OUTPUT_GAIN 16 -#if (MDCT_OUTPUT_SCALE >= 0) -#define IMDCT_SCALE(x) SATURATE_RIGHT_SHIFT(x, MDCT_OUTPUT_SCALE, PCM_OUT_BITS) -#else -#define IMDCT_SCALE(x) SATURATE_LEFT_SHIFT(x, -MDCT_OUTPUT_SCALE, PCM_OUT_BITS) -#endif +#define IMDCT_SCALE(x, s) \ + SATURATE_RIGHT_SHIFT((x), ((s) + MDCT_OUTPUT_SCALE), PCM_OUT_BITS) #define IMDCT_SCALE_DBL(x) (FIXP_DBL)(x) #define IMDCT_SCALE_DBL_LSH1(x) SATURATE_LEFT_SHIFT_ALT((x), 1, DFRACT_BITS) |