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 /libAACdec/src | |
| 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 'libAACdec/src')
| -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. */ |