diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2019-03-08 16:08:07 +0100 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2019-05-13 15:24:51 -0700 |
| commit | e970ac4c95e2e1016c72caa5218fc8f1bafe58fe (patch) | |
| tree | eb79a0e826e3165de4b16e3259622623dfe119f0 /libDRCdec/src/drcGainDec_init.cpp | |
| parent | 14f7e1369382c0a399b991648c96fbcf8940efc8 (diff) | |
| download | fdk-aac-e970ac4c95e2e1016c72caa5218fc8f1bafe58fe.tar.gz fdk-aac-e970ac4c95e2e1016c72caa5218fc8f1bafe58fe.tar.bz2 fdk-aac-e970ac4c95e2e1016c72caa5218fc8f1bafe58fe.zip | |
Fix HE-AAC using MPEG-D DRC with implicit SBR signaling.
Bug: 132641988
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I97c5d3972528092f627153ad3127c7db977a0e5d
Diffstat (limited to 'libDRCdec/src/drcGainDec_init.cpp')
| -rw-r--r-- | libDRCdec/src/drcGainDec_init.cpp | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/libDRCdec/src/drcGainDec_init.cpp b/libDRCdec/src/drcGainDec_init.cpp index c9f87d7..89d0f55 100644 --- a/libDRCdec/src/drcGainDec_init.cpp +++ b/libDRCdec/src/drcGainDec_init.cpp @@ -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 @@ -184,24 +184,11 @@ static DRC_ERROR _generateDrcInstructionsDerivedData( } DRC_ERROR -initGainDec(HANDLE_DRC_GAIN_DECODER hGainDec, const int frameSize, - const int sampleRate) { +initGainDec(HANDLE_DRC_GAIN_DECODER hGainDec) { int i, j, k; - if (frameSize < 1) { - return DE_NOT_OK; - } - - hGainDec->frameSize = frameSize; - - if (hGainDec->frameSize * 1000 < sampleRate) { - return DE_NOT_OK; - } - - hGainDec->deltaTminDefault = getDeltaTmin(sampleRate); - if (hGainDec->deltaTminDefault > hGainDec->frameSize) { - return DE_NOT_OK; - } + /* sanity check */ + if (hGainDec->deltaTminDefault > hGainDec->frameSize) return DE_NOT_OK; for (i = 0; i < MAX_ACTIVE_DRCS; i++) { for (j = 0; j < 8; j++) { |