diff options
author | Eric Laurent <elaurent@google.com> | 2012-11-08 09:43:15 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-08 09:43:16 -0800 |
commit | 911408bc76f833feca92b51cb7dcd91875cc48e8 (patch) | |
tree | 257e3dcf4801f649618a44c453253c016d953903 /audio/AudioPolicyManagerBase.cpp | |
parent | 3dee034c458bd579b1cc619f849b3523e881da6e (diff) | |
parent | 42fa8215a763822c0d03fc936e4cac1eb864c9cc (diff) | |
download | hardware_libhardware_legacy-911408bc76f833feca92b51cb7dcd91875cc48e8.zip hardware_libhardware_legacy-911408bc76f833feca92b51cb7dcd91875cc48e8.tar.gz hardware_libhardware_legacy-911408bc76f833feca92b51cb7dcd91875cc48e8.tar.bz2 |
Merge "audio policy: fix notification start delay"
Diffstat (limited to 'audio/AudioPolicyManagerBase.cpp')
-rw-r--r-- | audio/AudioPolicyManagerBase.cpp | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp index 19fff57..134fb3b 100644 --- a/audio/AudioPolicyManagerBase.cpp +++ b/audio/AudioPolicyManagerBase.cpp @@ -348,7 +348,7 @@ void AudioPolicyManagerBase::setPhoneState(int state) for (size_t i = 0; i < mOutputs.size(); i++) { AudioOutputDescriptor *desc = mOutputs.valueAt(i); //take the biggest latency for all outputs - if (delayMs < desc->mLatency*2) { + if (delayMs < (int)desc->mLatency*2) { delayMs = desc->mLatency*2; } //mute STRATEGY_MEDIA on all outputs @@ -702,8 +702,9 @@ status_t AudioPolicyManagerBase::startOutput(audio_io_handle_t output, } // wait for audio on other active outputs to be presented when starting // a notification so that audio focus effect can propagate. - if (shouldWait && (desc->refCount() != 0) && (waitMs < desc->latency())) { - waitMs = desc->latency(); + uint32_t latency = desc->latency(); + if (shouldWait && desc->isActive(latency * 2) && (waitMs < latency)) { + waitMs = latency; } } } @@ -3065,6 +3066,18 @@ audio_devices_t AudioPolicyManagerBase::AudioOutputDescriptor::supportedDevices( } } +bool AudioPolicyManagerBase::AudioOutputDescriptor::isActive(uint32_t inPastMs) const +{ + nsecs_t sysTime = systemTime(); + for (int i = 0; i < AudioSystem::NUM_STREAM_TYPES; i++) { + if (mRefCount[i] != 0 || + ns2ms(sysTime - mStopTime[i]) < inPastMs) { + return true; + } + } + return false; +} + status_t AudioPolicyManagerBase::AudioOutputDescriptor::dump(int fd) { const size_t SIZE = 256; |