diff options
author | Eric Laurent <elaurent@google.com> | 2010-08-30 15:07:45 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-30 15:07:45 -0700 |
commit | ea798dd9f37b34acfa3cf8d945dbe7f7e90e7196 (patch) | |
tree | 5a9d2208819406e3859139031255e6f8f3267bf0 /services | |
parent | f015774f9d5a8b7af547ccad92d98b5cfd4009fb (diff) | |
parent | da701fe59d6676d45c1be49a1ed14045bdf92eec (diff) | |
download | frameworks_av-ea798dd9f37b34acfa3cf8d945dbe7f7e90e7196.zip frameworks_av-ea798dd9f37b34acfa3cf8d945dbe7f7e90e7196.tar.gz frameworks_av-ea798dd9f37b34acfa3cf8d945dbe7f7e90e7196.tar.bz2 |
am 44217848: am ae6bdc23: Merge "Fix issue 2952766." into gingerbread
Merge commit '4421784895a58bb7bcf90236a9e443b372b5b80e'
* commit '4421784895a58bb7bcf90236a9e443b372b5b80e':
Fix issue 2952766.
Diffstat (limited to 'services')
-rw-r--r-- | services/audioflinger/AudioPolicyManagerBase.cpp | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/services/audioflinger/AudioPolicyManagerBase.cpp b/services/audioflinger/AudioPolicyManagerBase.cpp index 4614c8d..65d9ef7 100644 --- a/services/audioflinger/AudioPolicyManagerBase.cpp +++ b/services/audioflinger/AudioPolicyManagerBase.cpp @@ -133,7 +133,7 @@ status_t AudioPolicyManagerBase::setDeviceConnectionState(AudioSystem::audio_dev // request routing change if necessary uint32_t newDevice = getNewDevice(mHardwareOutput, false); #ifdef WITH_A2DP - checkOutputForAllStrategies(newDevice); + checkOutputForAllStrategies(); // A2DP outputs must be closed after checkOutputForAllStrategies() is executed if (state == AudioSystem::DEVICE_STATE_UNAVAILABLE && AudioSystem::isA2dpDevice(device)) { closeA2dpOutputs(); @@ -274,7 +274,7 @@ void AudioPolicyManagerBase::setPhoneState(int state) // check for device and output changes triggered by new phone state newDevice = getNewDevice(mHardwareOutput, false); #ifdef WITH_A2DP - checkOutputForAllStrategies(newDevice); + checkOutputForAllStrategies(); // suspend A2DP output if a SCO device is present. if (mA2dpOutput != 0 && mScoDeviceAddress != "") { if (oldState == AudioSystem::MODE_NORMAL) { @@ -386,13 +386,28 @@ void AudioPolicyManagerBase::setForceUse(AudioSystem::force_use usage, AudioSyst // check for device and output changes triggered by new phone state uint32_t newDevice = getNewDevice(mHardwareOutput, false); #ifdef WITH_A2DP - checkOutputForAllStrategies(newDevice); + checkOutputForAllStrategies(); #endif updateDeviceForStrategy(); setOutputDevice(mHardwareOutput, newDevice); if (forceVolumeReeval) { applyStreamVolumes(mHardwareOutput, newDevice); } + + audio_io_handle_t activeInput = getActiveInput(); + if (activeInput != 0) { + AudioInputDescriptor *inputDesc = mInputs.valueFor(activeInput); + newDevice = getDeviceForInputSource(inputDesc->mInputSource); + if (newDevice != inputDesc->mDevice) { + LOGV("setForceUse() changing device from %x to %x for input %d", + inputDesc->mDevice, newDevice, activeInput); + inputDesc->mDevice = newDevice; + AudioParameter param = AudioParameter(); + param.addInt(String8(AudioParameter::keyRouting), (int)newDevice); + mpClientInterface->setParameters(activeInput, param.toString()); + } + } + } AudioSystem::forced_config AudioPolicyManagerBase::getForceUse(AudioSystem::force_use usage) @@ -1382,7 +1397,7 @@ void AudioPolicyManagerBase::closeA2dpOutputs() } } -void AudioPolicyManagerBase::checkOutputForStrategy(routing_strategy strategy, uint32_t &newDevice) +void AudioPolicyManagerBase::checkOutputForStrategy(routing_strategy strategy) { uint32_t prevDevice = getDeviceForStrategy(strategy); uint32_t curDevice = getDeviceForStrategy(strategy, false); @@ -1401,12 +1416,6 @@ void AudioPolicyManagerBase::checkOutputForStrategy(routing_strategy strategy, u LOGV("checkOutputForStrategy() moving strategy %d from a2dp", strategy); srcOutput = mA2dpOutput; } - - // do not change newDevice if it was already set before this call by a previous call to - // getNewDevice() or checkOutputForStrategy() for a strategy with higher priority - if (newDevice == 0 && mOutputs.valueFor(mHardwareOutput)->isUsedByStrategy(strategy)) { - newDevice = getDeviceForStrategy(strategy, false); - } } if (a2dpIsUsed && !a2dpWasUsed) { bool dupUsed = a2dpUsedForSonification() && a2dpIsUsed && (AudioSystem::popCount(curDevice) == 2); @@ -1441,15 +1450,12 @@ void AudioPolicyManagerBase::checkOutputForStrategy(routing_strategy strategy, u } } -void AudioPolicyManagerBase::checkOutputForAllStrategies(uint32_t &newDevice) +void AudioPolicyManagerBase::checkOutputForAllStrategies() { - // Check strategies in order of priority so that once newDevice is set - // for a given strategy it is not modified by subsequent calls to - // checkOutputForStrategy() - checkOutputForStrategy(STRATEGY_PHONE, newDevice); - checkOutputForStrategy(STRATEGY_SONIFICATION, newDevice); - checkOutputForStrategy(STRATEGY_MEDIA, newDevice); - checkOutputForStrategy(STRATEGY_DTMF, newDevice); + checkOutputForStrategy(STRATEGY_PHONE); + checkOutputForStrategy(STRATEGY_SONIFICATION); + checkOutputForStrategy(STRATEGY_MEDIA); + checkOutputForStrategy(STRATEGY_DTMF); } #endif |