commit e910bfd0d19f9fcb7fca78f9f99a65dfe912e104
author Shunkai Yao <yaoshunkai@google.com> Thu Apr 18 04:36:42 2024 +0000
committer Shunkai Yao <yaoshunkai@google.com> Thu May 09 01:08:10 2024 +0000
tree 10d9c15549b25d80390015aad76816dc1b594321
parent 5e742388a852fb6b31a311b908b8fe4a890048d7

Use customized event flag for data FMQ not_empty to avoid conflict

Bug: 335547630
Test: atest --test-mapping hardware/interfaces/audio/aidl/vts:presubmit
Change-Id: I0f5776edd58748195df61e4dae911df30f40e5b0
Merged-In: I0f5776edd58748195df61e4dae911df30f40e5b0

media/libeffects/downmix/aidl/EffectDownmix.cpp

diff --git a/media/libeffects/downmix/aidl/EffectDownmix.cpp b/media/libeffects/downmix/aidl/EffectDownmix.cpp
index de60ca4..883d41d 100644
--- a/media/libeffects/downmix/aidl/EffectDownmix.cpp
+++ b/media/libeffects/downmix/aidl/EffectDownmix.cpp
@@ -177,7 +177,10 @@
      * in the life cycle of workerThread (threadLoop).
      */
     uint32_t efState = 0;
-    if (!mEventFlag || ::android::OK != mEventFlag->wait(kEventFlagNotEmpty, &efState)) {
+    if (!mEventFlag ||
+        ::android::OK != mEventFlag->wait(mDataMqNotEmptyEf, &efState, 0 /* no timeout */,
+                                          true /* retry */) ||
+        !(efState & mDataMqNotEmptyEf)) {
         LOG(ERROR) << getEffectName() << __func__ << ": StatusEventFlag invalid";
     }