drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue 2952766." into gingerbread

Browse Source
This commit is contained in:
Eric Laurent
2010-08-30 15:02:06 -07:00
committed by Android (Google) Code Review
parent 7ec7b9970c b8453f4e0e
commit ae6bdc23bd
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
services/audioflinger/AudioPolicyManagerBase.cpp
View File

@ -133,7 +133,7 @@ status_t AudioPolicyManagerBase::setDeviceConnectionState(AudioSystem::audio_dev
// request routing change if necessary // request routing change if necessary
uint32_t newDevice = getNewDevice(mHardwareOutput, false); uint32_t newDevice = getNewDevice(mHardwareOutput, false);
#ifdef WITH_A2DP #ifdef WITH_A2DP
checkOutputForAllStrategies(newDevice); checkOutputForAllStrategies();
// A2DP outputs must be closed after checkOutputForAllStrategies() is executed // A2DP outputs must be closed after checkOutputForAllStrategies() is executed
if (state == AudioSystem::DEVICE_STATE_UNAVAILABLE && AudioSystem::isA2dpDevice(device)) { if (state == AudioSystem::DEVICE_STATE_UNAVAILABLE && AudioSystem::isA2dpDevice(device)) {
closeA2dpOutputs(); closeA2dpOutputs();
@ -274,7 +274,7 @@ void AudioPolicyManagerBase::setPhoneState(int state)
// check for device and output changes triggered by new phone state // check for device and output changes triggered by new phone state
newDevice = getNewDevice(mHardwareOutput, false); newDevice = getNewDevice(mHardwareOutput, false);
#ifdef WITH_A2DP #ifdef WITH_A2DP
checkOutputForAllStrategies(newDevice); checkOutputForAllStrategies();
// suspend A2DP output if a SCO device is present. // suspend A2DP output if a SCO device is present.
if (mA2dpOutput != 0 && mScoDeviceAddress != "") { if (mA2dpOutput != 0 && mScoDeviceAddress != "") {
if (oldState == AudioSystem::MODE_NORMAL) { 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 // check for device and output changes triggered by new phone state
uint32_t newDevice = getNewDevice(mHardwareOutput, false); uint32_t newDevice = getNewDevice(mHardwareOutput, false);
#ifdef WITH_A2DP #ifdef WITH_A2DP
checkOutputForAllStrategies(newDevice); checkOutputForAllStrategies();
#endif #endif
updateDeviceForStrategy(); updateDeviceForStrategy();
setOutputDevice(mHardwareOutput, newDevice); setOutputDevice(mHardwareOutput, newDevice);
if (forceVolumeReeval) { if (forceVolumeReeval) {
applyStreamVolumes(mHardwareOutput, newDevice); 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) 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 prevDevice = getDeviceForStrategy(strategy);
uint32_t curDevice = getDeviceForStrategy(strategy, false); 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); LOGV("checkOutputForStrategy() moving strategy %d from a2dp", strategy);
srcOutput = mA2dpOutput; 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) { if (a2dpIsUsed && !a2dpWasUsed) {
bool dupUsed = a2dpUsedForSonification() && a2dpIsUsed && (AudioSystem::popCount(curDevice) == 2); 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 checkOutputForStrategy(STRATEGY_PHONE);
// for a given strategy it is not modified by subsequent calls to checkOutputForStrategy(STRATEGY_SONIFICATION);
// checkOutputForStrategy() checkOutputForStrategy(STRATEGY_MEDIA);
checkOutputForStrategy(STRATEGY_PHONE, newDevice); checkOutputForStrategy(STRATEGY_DTMF);
checkOutputForStrategy(STRATEGY_SONIFICATION, newDevice);
checkOutputForStrategy(STRATEGY_MEDIA, newDevice);
checkOutputForStrategy(STRATEGY_DTMF, newDevice);
} }
#endif #endif