fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Trigger config change after a change in SBR activity has been recognized."

This commit is contained in:
Jean-Michel Trivi 2019-03-15 18:07:26 +00:00 committed by Android (Google) Code Review
parent 1e0313fb04 856e3d339e
commit 97b421ce43
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libAACdec/src/aacdecoder.cpp
View File

@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android 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. Forschung e.V. All rights reserved.
1. INTRODUCTION 1. INTRODUCTION
@ -1815,6 +1815,9 @@ CAacDecoder_Init(HANDLE_AACDECODER self, const CSAudioSpecificConfig *asc,
self->useLdQmfTimeAlign = self->useLdQmfTimeAlign =
asc->m_sc.m_eldSpecificConfig.m_useLdQmfTimeAlign; asc->m_sc.m_eldSpecificConfig.m_useLdQmfTimeAlign;
} }
if (self->sbrEnabled != asc->m_sbrPresentFlag) {
ascChanged = 1;
}
} }
self->streamInfo.extAot = asc->m_extensionAudioObjectType; self->streamInfo.extAot = asc->m_extensionAudioObjectType;