commit bf6dc1af5bd88135f47c2489c03cdb9f95d57927
author Andy Hung <hunga@google.com> Thu Jul 07 21:19:29 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 07 21:19:30 2016 +0000
tree a005f9f0b508331cd1225ef5677b6b8a166999ad
parent b343e0444a3420321c606a827347f18445d76385
parent 0a31dddf67e739684f60aecc85311ff446fb68f9

Merge "Attribute throttle time to previous loops write time" into nyc-mr1-dev

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index e00070c..6f827d9 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -3326,6 +3326,9 @@
                                     " ret(%zd) deltaMs(%d) requires sleep %d ms",
                                     this, ret, deltaMs, throttleMs);
                             mThreadThrottleTimeMs += throttleMs;
+                            // Throttle must be attributed to the previous mixer loop's write time
+                            // to allow back-to-back throttling.
+                            lastWriteFinished += throttleMs * 1000000;
                         } else {
                             uint32_t diff = mThreadThrottleTimeMs - mThreadThrottleEndMs;
                             if (diff > 0) {