diff options
| author | Xin Li <delphij@google.com> | 2019-09-05 16:53:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-05 16:53:26 +0000 |
| commit | d929f68a05f5cbdd812dca287c8115a39439acf1 (patch) | |
| tree | fa62c4f58bc140ba5c0a27e2c913d3ea0a5bfe98 /libAACdec/src/aacdecoder.cpp | |
| parent | c2eb64586d6dfc0f067ea66631b38d1922a106ed (diff) | |
| parent | a209adb315f970aa97044a82551a6f5617d61ded (diff) | |
| download | fdk-aac-d929f68a05f5cbdd812dca287c8115a39439acf1.tar.gz fdk-aac-d929f68a05f5cbdd812dca287c8115a39439acf1.tar.bz2 fdk-aac-d929f68a05f5cbdd812dca287c8115a39439acf1.zip | |
Merge "DO NOT MERGE - Merge Android 10 into master"
Diffstat (limited to 'libAACdec/src/aacdecoder.cpp')
| -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; |