diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2019-03-15 18:07:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-03-15 18:07:26 +0000 |
| commit | 97b421ce43995eaa730ac5081c56d8c2f55c9982 (patch) | |
| tree | c7dd21a38975509e8f321a2fcac15324021cc60f | |
| parent | 1e0313fb0450c01b0526b70be2d3d2cd9023ed84 (diff) | |
| parent | 856e3d339e6e9c190d06df7a67bc3ee90cba3ecf (diff) | |
| download | fdk-aac-97b421ce43995eaa730ac5081c56d8c2f55c9982.tar.gz fdk-aac-97b421ce43995eaa730ac5081c56d8c2f55c9982.tar.bz2 fdk-aac-97b421ce43995eaa730ac5081c56d8c2f55c9982.zip | |
Merge "Trigger config change after a change in SBR activity has been recognized."
| -rw-r--r-- | libAACdec/src/aacdecoder.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libAACdec/src/aacdecoder.cpp b/libAACdec/src/aacdecoder.cpp index 8f03328..7617937 100644 --- a/libAACdec/src/aacdecoder.cpp +++ b/libAACdec/src/aacdecoder.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 @@ -1815,6 +1815,9 @@ CAacDecoder_Init(HANDLE_AACDECODER self, const CSAudioSpecificConfig *asc, self->useLdQmfTimeAlign = asc->m_sc.m_eldSpecificConfig.m_useLdQmfTimeAlign; } + if (self->sbrEnabled != asc->m_sbrPresentFlag) { + ascChanged = 1; + } } self->streamInfo.extAot = asc->m_extensionAudioObjectType; |