Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a6c3ace3: am 3913c131: Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1

Browse Source 
* commit 'a6c3ace3274e49075284c25750485af9a72203ba':
  Improvement for issue 3489986: BT SCO volume
This commit is contained in:
Eric Laurent
2011-03-15 23:47:26 -07:00
committed by Android Git Automerger
parent f8c4c12802 a6c3ace327
commit 9bb250bfe7
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/audioflinger/AudioPolicyManagerBase.cpp
View File

@@ -339,6 +339,7 @@ void AudioPolicyManagerBase::setForceUse(AudioSystem::force_use usage, AudioSyst
LOGW("setForceUse() invalid config %d for FOR_COMMUNICATION", config); LOGW("setForceUse() invalid config %d for FOR_COMMUNICATION", config);
return; return;
} }
forceVolumeReeval = true;
mForceUse[usage] = config; mForceUse[usage] = config;
break; break;
case AudioSystem::FOR_MEDIA: case AudioSystem::FOR_MEDIA:
@@ -384,7 +385,7 @@ void AudioPolicyManagerBase::setForceUse(AudioSystem::force_use usage, AudioSyst
updateDeviceForStrategy(); updateDeviceForStrategy();
setOutputDevice(mHardwareOutput, newDevice); setOutputDevice(mHardwareOutput, newDevice);
if (forceVolumeReeval) { if (forceVolumeReeval) {
applyStreamVolumes(mHardwareOutput, newDevice); applyStreamVolumes(mHardwareOutput, newDevice, 0, true);
} }
audio_io_handle_t activeInput = getActiveInput(); audio_io_handle_t activeInput = getActiveInput();
@@ -1973,7 +1974,13 @@ status_t AudioPolicyManagerBase::checkAndSetVolume(int stream, int index, audio_
// offset value to reflect actual hardware volume that never reaches 0 // offset value to reflect actual hardware volume that never reaches 0
// 1% corresponds roughly to first step in VOICE_CALL stream volume setting (see AudioService.java) // 1% corresponds roughly to first step in VOICE_CALL stream volume setting (see AudioService.java)
volume = 0.01 + 0.99 * volume; volume = 0.01 + 0.99 * volume;
// Force VOICE_CALL to track BLUETOOTH_SCO stream volume when bluetooth audio is
// enabled
if (stream == AudioSystem::BLUETOOTH_SCO) {
mpClientInterface->setStreamVolume(AudioSystem::VOICE_CALL, volume, output, delayMs);
}
} }
mpClientInterface->setStreamVolume((AudioSystem::stream_type)stream, volume, output, delayMs); mpClientInterface->setStreamVolume((AudioSystem::stream_type)stream, volume, output, delayMs);
} }
@@ -1986,6 +1993,7 @@ status_t AudioPolicyManagerBase::checkAndSetVolume(int stream, int index, audio_
} else { } else {
voiceVolume = 1.0; voiceVolume = 1.0;
} }
if (voiceVolume != mLastVoiceVolume && output == mHardwareOutput) { if (voiceVolume != mLastVoiceVolume && output == mHardwareOutput) {
mpClientInterface->setVoiceVolume(voiceVolume, delayMs); mpClientInterface->setVoiceVolume(voiceVolume, delayMs);
mLastVoiceVolume = voiceVolume; mLastVoiceVolume = voiceVolume;
@@ -1995,12 +2003,12 @@ status_t AudioPolicyManagerBase::checkAndSetVolume(int stream, int index, audio_
return NO_ERROR; return NO_ERROR;
} }
void AudioPolicyManagerBase::applyStreamVolumes(audio_io_handle_t output, uint32_t device, int delayMs) void AudioPolicyManagerBase::applyStreamVolumes(audio_io_handle_t output, uint32_t device, int delayMs, bool force)
{ {
LOGV("applyStreamVolumes() for output %d and device %x", output, device); LOGV("applyStreamVolumes() for output %d and device %x", output, device);
for (int stream = 0; stream < AudioSystem::NUM_STREAM_TYPES; stream++) { for (int stream = 0; stream < AudioSystem::NUM_STREAM_TYPES; stream++) {
checkAndSetVolume(stream, mStreams[stream].mIndexCur, output, device, delayMs); checkAndSetVolume(stream, mStreams[stream].mIndexCur, output, device, delayMs, force);
} }
} }