diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2018-12-29 06:26:28 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-29 06:26:28 -0800 |
| commit | f353517d83fa5ea0c3c181510961b748d0062fef (patch) | |
| tree | a56786cfb5c487378a9b781be5aabcdc9a73c110 | |
| parent | 70454c4656153df4f1ccccc14adec7dcb800c9e6 (diff) | |
| parent | ca5723b92244e44a343febda95dbac59805c16bb (diff) | |
| download | fdk-aac-f353517d83fa5ea0c3c181510961b748d0062fef.tar.gz fdk-aac-f353517d83fa5ea0c3c181510961b748d0062fef.tar.bz2 fdk-aac-f353517d83fa5ea0c3c181510961b748d0062fef.zip | |
Merge "QMF configuration flag QMF_FLAG_MPSLDFB has always priority over QMF_FLAG_CLDFB" am: cf4098ed3b am: 57939192c3
am: ca5723b922
Change-Id: I074c52872c483d653df525316fb01d80d351708a
| -rw-r--r-- | libFDK/src/FDK_qmf_domain.cpp | 8 | ||||
| -rw-r--r-- | libSACdec/src/sac_dec_lib.cpp | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libFDK/src/FDK_qmf_domain.cpp b/libFDK/src/FDK_qmf_domain.cpp index 409f222..dd63dab 100644 --- a/libFDK/src/FDK_qmf_domain.cpp +++ b/libFDK/src/FDK_qmf_domain.cpp @@ -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; } diff --git a/libSACdec/src/sac_dec_lib.cpp b/libSACdec/src/sac_dec_lib.cpp index e881599..7549e51 100644 --- a/libSACdec/src/sac_dec_lib.cpp +++ b/libSACdec/src/sac_dec_lib.cpp @@ -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; |