commit 0347f0eff05734a223367cc6c1b3ad09979ef985
author Shunkai Yao <yaoshunkai@google.com> Tue Dec 12 22:55:55 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 12 22:55:59 2023 +0000
tree e90189393cca2abff18f7b6bd523245037adef77
parent a83c8a5518234d0744f7453222db3cf2d8b876c2

Revert "audio: Fix remote submix behavior with multiple inputs"

Revert submission 2862771-cuttlefish_aidl_audio-2

Reason for revert: b/316027906

Reverted changes: /q/submissionid:2862771-cuttlefish_aidl_audio-2

Change-Id: I68932be8dad4b4fd4214d0ae6fc01202727f1658

audio/aidl/default/r_submix/SubmixRoute.cpp

diff --git a/audio/aidl/default/r_submix/SubmixRoute.cpp b/audio/aidl/default/r_submix/SubmixRoute.cpp
index 235c9a3..f04e607 100644
--- a/audio/aidl/default/r_submix/SubmixRoute.cpp
+++ b/audio/aidl/default/r_submix/SubmixRoute.cpp
@@ -98,9 +98,6 @@
         }
         mStreamInStandby = true;
         mReadCounterFrames = 0;
-        if (mSink != nullptr) {
-            mSink->shutdown(false);
-        }
     } else {
         mStreamOutOpen = true;
     }
@@ -109,7 +106,8 @@
 void SubmixRoute::closeStream(bool isInput) {
     std::lock_guard guard(mLock);
     if (isInput) {
-        if (--mInputRefCount == 0) {
+        mInputRefCount--;
+        if (mInputRefCount == 0) {
             mStreamInOpen = false;
             if (mSink != nullptr) {
                 mSink->shutdown(true);