commit 57939192c3378e57d4af8509a086f58e9721a7c1
author Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> Sat Dec 29 06:12:16 2018 -0800
committer android-build-merger <android-build-merger@google.com> Sat Dec 29 06:12:16 2018 -0800
tree 72e4f52ffcfc4e870e34be0e337c3a1bb5f21dba
parent bb3249264438604d874fd33bd19f20abbae67647
parent cf4098ed3ba7030b52c129db0dbb9d51b49384e6

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

Change-Id: I0166285d3129440c9caa444fe4fcfa9d59c1f6c1

libFDK/src/FDK_qmf_domain.cpp

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 @@
         !(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 @@
 
   /* 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;
   }

libSACdec/src/sac_dec_lib.cpp

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 @@
 
   if (coreCodec == AOT_ER_AAC_ELD) {
     pGC->flags_requested |= QMF_FLAG_MPSLDFB;
+    pGC->flags_requested &= ~QMF_FLAG_CLDFB;
   }
 
   return err;