diff options
author | Glenn Kasten <gkasten@google.com> | 2012-06-18 10:52:41 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-18 10:52:41 -0700 |
commit | 5b42ee8124ffc7f95d5a8a433b5df0e18d847635 (patch) | |
tree | 94d47409ab7374b4f9f4496ac0d77b26b483d75f /services | |
parent | ff3e9fa062e2afb2b8ebb0f47c8ad90fdd890dbd (diff) | |
parent | 4862d1eaa6b3b2bad040d01fe090e8616685c12b (diff) | |
download | frameworks_av-5b42ee8124ffc7f95d5a8a433b5df0e18d847635.zip frameworks_av-5b42ee8124ffc7f95d5a8a433b5df0e18d847635.tar.gz frameworks_av-5b42ee8124ffc7f95d5a8a433b5df0e18d847635.tar.bz2 |
am 4862d1ea: am eb15716b: Change definition of warmup period
* commit '4862d1eaa6b3b2bad040d01fe090e8616685c12b':
Change definition of warmup period
Diffstat (limited to 'services')
-rw-r--r-- | services/audioflinger/FastMixer.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/services/audioflinger/FastMixer.cpp b/services/audioflinger/FastMixer.cpp index 2c5d751..7652132 100644 --- a/services/audioflinger/FastMixer.cpp +++ b/services/audioflinger/FastMixer.cpp @@ -33,6 +33,7 @@ #define FAST_HOT_IDLE_NS 1000000L // 1 ms: time to sleep while hot idling #define FAST_DEFAULT_NS 999999999L // ~1 sec: default time to sleep +#define MIN_WARMUP_CYCLES 2 // minimum number of loop cycles to wait for warmup #define MAX_WARMUP_CYCLES 10 // maximum number of loop cycles to wait for warmup namespace android { @@ -454,7 +455,7 @@ bool FastMixer::threadLoop() // To avoid an initial underrun on fast tracks after exiting standby, // do not start pulling data from tracks and mixing until warmup is complete. // Warmup is considered complete after the earlier of: - // first successful single write() that blocks for more than warmupNs + // MIN_WARMUP_CYCLES write() attempts and last one blocks for at least warmupNs // MAX_WARMUP_CYCLES write() attempts. // This is overly conservative, but to get better accuracy requires a new HAL API. if (!isWarm && attemptedWrite) { @@ -465,7 +466,7 @@ bool FastMixer::threadLoop() measuredWarmupTs.tv_nsec -= 1000000000; } ++warmupCycles; - if ((attemptedWrite && nsec > warmupNs) || + if ((nsec > warmupNs && warmupCycles >= MIN_WARMUP_CYCLES) || (warmupCycles >= MAX_WARMUP_CYCLES)) { isWarm = true; dumpState->mMeasuredWarmupTs = measuredWarmupTs; @@ -504,6 +505,7 @@ bool FastMixer::threadLoop() } } #ifdef FAST_MIXER_STATISTICS + if (isWarm) { // advance the FIFO queue bounds size_t i = bounds & (FastMixerDumpState::kSamplingN - 1); bounds = (bounds & 0xFFFF0000) | ((bounds + 1) & 0xFFFF); @@ -560,6 +562,7 @@ bool FastMixer::threadLoop() ATRACE_INT("cycle_ms", monotonicNs / 1000000); ATRACE_INT("load_us", loadNs / 1000); #endif + } #endif } else { // first time through the loop |