diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2019-05-14 13:49:34 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-14 13:49:34 -0700 |
| commit | e48f30ae1f536b836267bcf103db8c38a3d2592a (patch) | |
| tree | eb79a0e826e3165de4b16e3259622623dfe119f0 /libDRCdec/src/drcGainDec_init.cpp | |
| parent | 47697ab8f4b11c45dc3bda52e30f9f6946a2c2bd (diff) | |
| parent | b1dbb88c464317c3f51c0ec6fccad9b35ab45d5c (diff) | |
| download | fdk-aac-e48f30ae1f536b836267bcf103db8c38a3d2592a.tar.gz fdk-aac-e48f30ae1f536b836267bcf103db8c38a3d2592a.tar.bz2 fdk-aac-e48f30ae1f536b836267bcf103db8c38a3d2592a.zip | |
Fix HE-AAC using MPEG-D DRC with implicit SBR signaling. am: e970ac4c95
am: b1dbb88c46
Change-Id: Id2112f143ab76559d799f6168b04d699576a9cc7
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++) { |