Merge "Ignore outputs with direct flag when selectOutput." am: a1270b044b am: f3bcc30de3 (f7adb3f0) · Commits · e / os / android_frameworks_av

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1257,13 +1257,12 @@ audio_io_handle_t AudioPolicyManager::selectOutput(const SortedVector<audio_io_h
	for (audio_io_handle_t output : outputs) {		for (audio_io_handle_t output : outputs) {
	sp<SwAudioOutputDescriptor> outputDesc = mOutputs.valueFor(output);		sp<SwAudioOutputDescriptor> outputDesc = mOutputs.valueFor(output);
	if (!outputDesc->isDuplicated()) {		if (!outputDesc->isDuplicated()) {
	// if a valid format is specified, skip output if not compatible
	if (format != AUDIO_FORMAT_INVALID) {
	if (outputDesc->mFlags & AUDIO_OUTPUT_FLAG_DIRECT) {		if (outputDesc->mFlags & AUDIO_OUTPUT_FLAG_DIRECT) {
	if (format != outputDesc->mFormat) {
	continue;		continue;
	}		}
	} else if (!audio_is_linear_pcm(format)) {		// if a valid format is specified, skip output if not compatible
			if (format != AUDIO_FORMAT_INVALID) {
			if (!audio_is_linear_pcm(format)) {
	continue;		continue;
	}		}
	if (AudioPort::isBetterFormatMatch(		if (AudioPort::isBetterFormatMatch(