fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-06-05 22:39:13 +02:00
Code Issues Projects Releases Wiki Activity

Merge "QMF configuration flag QMF_FLAG_MPSLDFB has always priority over QMF_FLAG_CLDFB" am: cf4098ed3b

Browse Source 
am: 57939192c3

Change-Id: I799ffa0efb296051c963645e5070dfae67ef9b03
This commit is contained in:
Fraunhofer IIS FDK
2018-12-29 06:17:11 -08:00
committed by android-build-merger
parent ecba7fdd99 57939192c3
commit ca5723b922
2 changed files with 5 additions and 4 deletions
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 & (QMF_FLAG_CLDFB | QMF_FLAG_MPSLDFB))) {
hgc->flags_requested |= QMF_FLAG_DOWNSAMPLED; 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; hasChanged = 1;
} }
@@ -901,6 +897,10 @@ QMF_DOMAIN_ERROR FDK_QmfDomain_Configure(HANDLE_FDK_QMF_DOMAIN hqd) {
/* 5. set requested flags */ /* 5. set requested flags */
if (hgc->flags != hgc->flags_requested) { 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; hgc->flags = hgc->flags_requested;
hasChanged = 1; hasChanged = 1;
} }

1
libSACdec/src/sac_dec_lib.cpp
View File

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