am 1b49155c: hal: change sequence of selecting output device (3640a390) · Commits · e / os / android_hardware_qcom_audio

hal/msm8974/platform.c

+34 −34

Original line number	Diff line number	Diff line
		@@ -1716,6 +1716,40 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi
		goto exit;
		}

		if (popcount(devices) == 2) {
		if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADPHONE \|
		AUDIO_DEVICE_OUT_SPEAKER) \|\|
		devices == (AUDIO_DEVICE_OUT_WIRED_HEADSET \|
		AUDIO_DEVICE_OUT_SPEAKER)) {
		snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES;
		} else if (devices == (AUDIO_DEVICE_OUT_LINE \|
		AUDIO_DEVICE_OUT_SPEAKER)) {
		snd_device = SND_DEVICE_OUT_SPEAKER_AND_LINE;
		} else if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADPHONE \|
		AUDIO_DEVICE_OUT_SPEAKER_SAFE) \|\|
		devices == (AUDIO_DEVICE_OUT_WIRED_HEADSET \|
		AUDIO_DEVICE_OUT_SPEAKER_SAFE)) {
		snd_device = SND_DEVICE_OUT_SPEAKER_SAFE_AND_HEADPHONES;
		} else if (devices == (AUDIO_DEVICE_OUT_LINE \|
		AUDIO_DEVICE_OUT_SPEAKER_SAFE)) {
		snd_device = SND_DEVICE_OUT_SPEAKER_SAFE_AND_LINE;
		} else if (devices == (AUDIO_DEVICE_OUT_AUX_DIGITAL \|
		AUDIO_DEVICE_OUT_SPEAKER)) {
		snd_device = SND_DEVICE_OUT_SPEAKER_AND_HDMI;
		} else {
		ALOGE("%s: Invalid combo device(%#x)", __func__, devices);
		goto exit;
		}
		if (snd_device != SND_DEVICE_NONE) {
		goto exit;
		}
		}

		if (popcount(devices) != 1) {
		ALOGE("%s: Invalid output devices(%#x)", __func__, devices);
		goto exit;
		}

		if (voice_is_in_call(adev) \|\| adev->enable_voicerx) {
		if (devices & AUDIO_DEVICE_OUT_WIRED_HEADPHONE \|\|
		devices & AUDIO_DEVICE_OUT_WIRED_HEADSET \|\|
		@@ -1758,40 +1792,6 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi
		}
		}

		if (popcount(devices) == 2) {
		if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADPHONE \|
		AUDIO_DEVICE_OUT_SPEAKER) \|\|
		devices == (AUDIO_DEVICE_OUT_WIRED_HEADSET \|
		AUDIO_DEVICE_OUT_SPEAKER)) {
		snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES;
		} else if (devices == (AUDIO_DEVICE_OUT_LINE \|
		AUDIO_DEVICE_OUT_SPEAKER)) {
		snd_device = SND_DEVICE_OUT_SPEAKER_AND_LINE;
		} else if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADPHONE \|
		AUDIO_DEVICE_OUT_SPEAKER_SAFE) \|\|
		devices == (AUDIO_DEVICE_OUT_WIRED_HEADSET \|
		AUDIO_DEVICE_OUT_SPEAKER_SAFE)) {
		snd_device = SND_DEVICE_OUT_SPEAKER_SAFE_AND_HEADPHONES;
		} else if (devices == (AUDIO_DEVICE_OUT_LINE \|
		AUDIO_DEVICE_OUT_SPEAKER_SAFE)) {
		snd_device = SND_DEVICE_OUT_SPEAKER_SAFE_AND_LINE;
		} else if (devices == (AUDIO_DEVICE_OUT_AUX_DIGITAL \|
		AUDIO_DEVICE_OUT_SPEAKER)) {
		snd_device = SND_DEVICE_OUT_SPEAKER_AND_HDMI;
		} else {
		ALOGE("%s: Invalid combo device(%#x)", __func__, devices);
		goto exit;
		}
		if (snd_device != SND_DEVICE_NONE) {
		goto exit;
		}
		}

		if (popcount(devices) != 1) {
		ALOGE("%s: Invalid output devices(%#x)", __func__, devices);
		goto exit;
		}

		if (devices & AUDIO_DEVICE_OUT_WIRED_HEADPHONE \|\|
		devices & AUDIO_DEVICE_OUT_WIRED_HEADSET) {
		snd_device = SND_DEVICE_OUT_HEADPHONES;