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 /libAACdec | |
| 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 'libAACdec')
| -rw-r--r-- | libAACdec/src/aacdecoder_lib.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libAACdec/src/aacdecoder_lib.cpp b/libAACdec/src/aacdecoder_lib.cpp index 4046d66..86ec899 100644 --- a/libAACdec/src/aacdecoder_lib.cpp +++ b/libAACdec/src/aacdecoder_lib.cpp @@ -1676,6 +1676,13 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER self, INT_PCM *pTimeData_extern, reverseOutChannelMap[ch] = ch; } + /* Update sampleRate and frameSize. This may be necessary in case of + * implicit SBR signaling */ + FDK_drcDec_SetParam(self->hUniDrcDecoder, DRC_DEC_SAMPLE_RATE, + self->streamInfo.sampleRate); + FDK_drcDec_SetParam(self->hUniDrcDecoder, DRC_DEC_FRAME_SIZE, + self->streamInfo.frameSize); + /* If SBR and/or MPS is active, the DRC gains are aligned to the QMF domain signal before the QMF synthesis. Therefore the DRC gains need to be delayed by the QMF synthesis delay. */ |