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

Merge "QMF configuration flag QMF_FLAG_MPSLDFB has always priority over QMF_FLAG_CLDFB" 

am: cf4098ed3b

Change-Id: I0166285d3129440c9caa444fe4fcfa9d59c1f6c1
This commit is contained in:
Fraunhofer IIS FDK 2018-12-29 06:12:16 -08:00 committed by android-build-merger
parent bb32492644 cf4098ed3b
commit 57939192c3
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libFDK/src/FDK_qmf_domain.cpp
View File

@ -889,10 +889,6 @@ QMF_DOMAIN_ERROR FDK_QmfDomain_Configure(HANDLE_FDK_QMF_DOMAIN hqd) {
!(hgc->flags & (QMF_FLAG_CLDFB | QMF_FLAG_MPSLDFB))) {
hgc->flags_requested |= QMF_FLAG_DOWNSAMPLED;
}
if ((hgc->flags_requested & QMF_FLAG_MPSLDFB) &&
(hgc->flags_requested & QMF_FLAG_CLDFB)) {
hgc->flags_requested &= ~QMF_FLAG_CLDFB;
}
hasChanged = 1;
}
@ -901,6 +897,10 @@ QMF_DOMAIN_ERROR FDK_QmfDomain_Configure(HANDLE_FDK_QMF_DOMAIN hqd) {
/* 5. set requested flags */
if (hgc->flags != hgc->flags_requested) {
if ((hgc->flags_requested & QMF_FLAG_MPSLDFB) &&
(hgc->flags_requested & QMF_FLAG_CLDFB)) {
hgc->flags_requested &= ~QMF_FLAG_CLDFB;
}
hgc->flags = hgc->flags_requested;
hasChanged = 1;
}

1
libSACdec/src/sac_dec_lib.cpp
View File

@ -1087,6 +1087,7 @@ mpegSurroundDecoder_ConfigureQmfDomain(
if (coreCodec == AOT_ER_AAC_ELD) {
pGC->flags_requested |= QMF_FLAG_MPSLDFB;
pGC->flags_requested &= ~QMF_FLAG_CLDFB;
}
return err;