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/ModuleRemoteSubmix.cpp

diff --git a/audio/aidl/default/r_submix/ModuleRemoteSubmix.cpp b/audio/aidl/default/r_submix/ModuleRemoteSubmix.cpp
index 2f42889..3e8dd7c 100644
--- a/audio/aidl/default/r_submix/ModuleRemoteSubmix.cpp
+++ b/audio/aidl/default/r_submix/ModuleRemoteSubmix.cpp
@@ -112,7 +112,7 @@
     static constexpr int32_t kMaxLatencyMs =
             (r_submix::kDefaultPipeSizeInFrames * 1000) / r_submix::kDefaultSampleRateHz;
     static constexpr int32_t kMinLatencyMs = kMaxLatencyMs / r_submix::kDefaultPipePeriodCount;
-    return kMinLatencyMs;
+    return (kMaxLatencyMs + kMinLatencyMs) / 2;
 }
 
 }  // namespace aidl::android::hardware::audio::core