tequilaOS/platform_hardware_libhardware_legacy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "audio: add mechanism to re-route nullified audio"

Browse source
This commit is contained in:
Eric Laurent 2014-07-23 16:00:53 +00:00 committed by Gerrit Code Review
commit 39b3abc0ca
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
audio/AudioPolicyManagerBase.cpp
View file

@ -2639,7 +2639,22 @@ uint32_t AudioPolicyManagerBase::setOutputDevice(audio_io_handle_t output,
if (device != AUDIO_DEVICE_NONE) {
outputDesc->mDevice = device;
// Force routing if previously asked for this output
if (outputDesc->mForceRouting) {
ALOGV("Force routing to current device as previous device was null for this output");
force = true;
// Request consumed. Reset mForceRouting to false
outputDesc->mForceRouting = false;
}
}
else {
// Device is null and does not reflect the routing. Save the necessity to force
// re-routing upon next attempt to select a non-null device for this output
outputDesc->mForceRouting = true;
}
muteWaitMs = checkDeviceMuteStrategies(outputDesc, prevDevice, delayMs);
// Do not change the routing if:
@ -3254,7 +3269,8 @@ AudioPolicyManagerBase::AudioOutputDescriptor::AudioOutputDescriptor(
: mId(0), mSamplingRate(0), mFormat((audio_format_t)0),
mChannelMask((audio_channel_mask_t)0), mLatency(0),
mFlags((audio_output_flags_t)0), mDevice(AUDIO_DEVICE_NONE),
mOutput1(0), mOutput2(0), mProfile(profile), mDirectOpenCount(0)
mOutput1(0), mOutput2(0), mProfile(profile), mDirectOpenCount(0),
mForceRouting(false)
{
// clear usage count for all stream types
for (int i = 0; i < AudioSystem::NUM_STREAM_TYPES; i++) {

1
include/hardware_legacy/AudioPolicyManagerBase.h
View file

@ -286,6 +286,7 @@ protected:
bool mStrategyMutedByDevice[NUM_STRATEGIES]; // strategies muted because of incompatible
// device selection. See checkDeviceMuteStrategies()
uint32_t mDirectOpenCount; // number of clients using this output (direct outputs only)
bool mForceRouting; // Next routing for this output will be forced as current device routed is null
};
// descriptor for audio inputs. Used to maintain current configuration of each opened audio input