aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de>2019-03-08 15:55:05 +0100
committerJean-Michel Trivi <jmtrivi@google.com>2019-03-15 10:32:59 -0700
commit856e3d339e6e9c190d06df7a67bc3ee90cba3ecf (patch)
treec7dd21a38975509e8f321a2fcac15324021cc60f
parenta1f6034653ad9025432bcd7071573172d24c1d6f (diff)
downloadfdk-aac-856e3d339e6e9c190d06df7a67bc3ee90cba3ecf.tar.gz
fdk-aac-856e3d339e6e9c190d06df7a67bc3ee90cba3ecf.tar.bz2
fdk-aac-856e3d339e6e9c190d06df7a67bc3ee90cba3ecf.zip
Trigger config change after a change in SBR activity has been recognized.
Change-Id: I7715e61fdfcd16dfae6029171888aef9c6f0738e
-rw-r--r--libAACdec/src/aacdecoder.cpp5
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;