commit 05083ac19249d90af77a23c46f4229a7a002320a
author Andy Hung <hunga@google.com> Thu Dec 14 15:00:28 2017 -0800
committer Andy Hung <hunga@google.com> Thu Dec 14 16:19:20 2017 -0800
tree 515a40fd7ca344de258cb5bec3afe2623d217880
parent 62aef7d364670c9c255f8470b0ea874ac2cca293

EffectModule: robust computation of mMaxDisableWaitCnt

To compensate for overflow / underflow.

Test: Solo Tester and CTS effects
Bug: 70684279
Change-Id: I7ac3d74c43320a2c6427ba2b424c8edb5a0250b1

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index cd3c588..979908a 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -578,8 +578,11 @@
         }
     }
 
-    mMaxDisableWaitCnt = (MAX_DISABLE_TIME_MS * mConfig.outputCfg.samplingRate) /
-            (1000 * mConfig.outputCfg.buffer.frameCount);
+    // mConfig.outputCfg.buffer.frameCount cannot be zero.
+    mMaxDisableWaitCnt = (uint32_t)std::max(
+            (uint64_t)1, // mMaxDisableWaitCnt must be greater than zero.
+            (uint64_t)MAX_DISABLE_TIME_MS * mConfig.outputCfg.samplingRate
+                / ((uint64_t)1000 * mConfig.outputCfg.buffer.frameCount));
 
 exit:
     // TODO: consider clearing mConfig on error.