diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-09-26 00:03:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-26 00:03:03 +0000 |
| commit | a5812aabd43617e0943ceb1115da089df2477db2 (patch) | |
| tree | 1d26690afb0b959709af2aa61ce01650c76a6dad | |
| parent | aff330b2a1e37820b249d641b4b22a95092a108f (diff) | |
| parent | 8c83fe85b6d1257298208de043acece927787c3f (diff) | |
| download | android_hardware_qcom_audio-a5812aabd43617e0943ceb1115da089df2477db2.tar.gz android_hardware_qcom_audio-a5812aabd43617e0943ceb1115da089df2477db2.tar.bz2 android_hardware_qcom_audio-a5812aabd43617e0943ceb1115da089df2477db2.zip | |
am 8c83fe85: Add support for voice recognition on headset use case
* commit '8c83fe85b6d1257298208de043acece927787c3f':
Add support for voice recognition on headset use case
| -rw-r--r-- | hal/msm8974/platform.c | 5 | ||||
| -rw-r--r-- | hal/msm8974/platform.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c index 7078a1dd..134a2d87 100644 --- a/hal/msm8974/platform.c +++ b/hal/msm8974/platform.c @@ -249,6 +249,7 @@ static const char * const device_table[SND_DEVICE_MAX] = { [SND_DEVICE_IN_VOICE_REC_MIC_NS] = "voice-rec-mic", [SND_DEVICE_IN_VOICE_REC_DMIC_STEREO] = "voice-rec-dmic-ef", [SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE] = "voice-rec-dmic-ef-fluence", + [SND_DEVICE_IN_VOICE_REC_HEADSET_MIC] = "headset-mic", [SND_DEVICE_IN_VOICE_RX] = "voice-rx", @@ -334,6 +335,7 @@ static int acdb_device_table[SND_DEVICE_MAX] = { [SND_DEVICE_IN_VOICE_REC_MIC_NS] = 113, [SND_DEVICE_IN_VOICE_REC_DMIC_STEREO] = 35, [SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE] = 43, + [SND_DEVICE_IN_VOICE_REC_HEADSET_MIC] = 8, [SND_DEVICE_IN_VOICE_RX] = 44, @@ -426,6 +428,7 @@ static const struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_REC_MIC_NS)}, {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_REC_DMIC_STEREO)}, {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE)}, + {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_REC_HEADSET_MIC)}, {TO_NAME_INDEX(SND_DEVICE_IN_THREE_MIC)}, {TO_NAME_INDEX(SND_DEVICE_IN_QUAD_MIC)}, @@ -1958,6 +1961,8 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d else snd_device = SND_DEVICE_IN_VOICE_REC_MIC; } + } else if (in_device & AUDIO_DEVICE_IN_WIRED_HEADSET) { + snd_device = SND_DEVICE_IN_VOICE_REC_HEADSET_MIC; } } else if (source == AUDIO_SOURCE_VOICE_COMMUNICATION) { if (out_device & (AUDIO_DEVICE_OUT_SPEAKER | AUDIO_DEVICE_OUT_SPEAKER_SAFE)) diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h index fa43b1df..dcd763a9 100644 --- a/hal/msm8974/platform.h +++ b/hal/msm8974/platform.h @@ -130,6 +130,7 @@ enum { SND_DEVICE_IN_VOICE_REC_MIC_NS, SND_DEVICE_IN_VOICE_REC_DMIC_STEREO, SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE, + SND_DEVICE_IN_VOICE_REC_HEADSET_MIC, SND_DEVICE_IN_VOICE_RX, |