aboutsummaryrefslogtreecommitdiffstats
path: root/libAACdec/src/aacdecoder_lib.cpp
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-05-15 03:10:59 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-05-15 03:10:59 +0000
commit85f0919fe86141888967622be878e759483413f3 (patch)
treeeb79a0e826e3165de4b16e3259622623dfe119f0 /libAACdec/src/aacdecoder_lib.cpp
parentd7290bf39139a2139364e3a30b1a27ed769cee03 (diff)
parente48f30ae1f536b836267bcf103db8c38a3d2592a (diff)
downloadfdk-aac-85f0919fe86141888967622be878e759483413f3.tar.gz
fdk-aac-85f0919fe86141888967622be878e759483413f3.tar.bz2
fdk-aac-85f0919fe86141888967622be878e759483413f3.zip
Snap for 5566918 from e48f30ae1f536b836267bcf103db8c38a3d2592a to rvc-release
Change-Id: I36a7ac7c4cb5b280331648caf34ebbdc5cd23cc8
Diffstat (limited to 'libAACdec/src/aacdecoder_lib.cpp')
-rw-r--r--libAACdec/src/aacdecoder_lib.cpp7
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. */