commit d2123e631834a887c2d8600c3ac43dda02d47cb9
author Glenn Kasten <gkasten@google.com> Thu Jan 29 10:02:44 2015 -0800
committer Glenn Kasten <gkasten@google.com> Thu Feb 19 09:47:44 2015 -0800
tree 1b0fbc7dd7ffb18d7a7084f2cff34f82c61a25b2
parent ad8510a339ffab330c2c46e5c247dd1cf9e15c22

Warmup cycles must be in range and consecutive

Change-Id: Ie8a40ec3547bdd62a1e2e05b11fb107c25841784

services/audioflinger/FastMixer.cpp

diff --git a/services/audioflinger/FastMixer.cpp b/services/audioflinger/FastMixer.cpp
index 67e2e6e..8b12f28 100644
--- a/services/audioflinger/FastMixer.cpp
+++ b/services/audioflinger/FastMixer.cpp
@@ -195,13 +195,15 @@
             underrunNs = (frameCount * 1750000000LL) / sampleRate;  // 1.75
             overrunNs = (frameCount * 500000000LL) / sampleRate;    // 0.50
             forceNs = (frameCount * 950000000LL) / sampleRate;      // 0.95
-            warmupNs = (frameCount * 500000000LL) / sampleRate;     // 0.50
+            warmupNsMin = (frameCount * 750000000LL) / sampleRate;  // 0.75
+            warmupNsMax = (frameCount * 1250000000LL) / sampleRate; // 1.25
         } else {
             periodNs = 0;
             underrunNs = 0;
             overrunNs = 0;
             forceNs = 0;
-            warmupNs = 0;
+            warmupNsMin = 0;
+            warmupNsMax = LONG_MAX;
         }
         mMixerBufferState = UNDEFINED;
 #if !LOG_NDEBUG