diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2010-11-11 09:43:25 -0800 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2011-01-20 12:06:07 -0800 |
| commit | 39c0d4c031d479a679900cb540253f42747cb810 (patch) | |
| tree | 2104dada7ae1cd90c17a5cabd352cc768e17bd36 | |
| parent | ad47fcaa744f72cd34562730364916b6203535e0 (diff) | |
| download | msm7k-39c0d4c031d479a679900cb540253f42747cb810.tar.gz | |
do not merge bug 3370834 Cherrypick from master CL 79327android-sdk-tools_r12android-sdk-adt_r12android-sdk-2.3.4_r1android-cts-2.3_r5android-cts-2.3_r4android-cts-2.3_r3android-cts-2.3_r2android-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10android-2.3.7_r1android-2.3.6_r1android-2.3.6_r0.9android-2.3.5_r1android-2.3.4_r1android-2.3.4_r0.9android-2.3.3_r1aandroid-2.3.3_r1.1android-2.3.3_r1gingerbread-releasegingerbread-mr4-releasegingerbread
Use input source to determine whether voice reco mode is enabled.
Change-Id: I1efe64904b19575b590ce4b83f44d18b7d064f6b
| -rw-r--r-- | libaudio-qsd8k/AudioHardware.cpp | 16 | ||||
| -rw-r--r-- | libaudio-qsd8k/AudioHardware.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libaudio-qsd8k/AudioHardware.cpp b/libaudio-qsd8k/AudioHardware.cpp index f6cfc9d..9773413 100644 --- a/libaudio-qsd8k/AudioHardware.cpp +++ b/libaudio-qsd8k/AudioHardware.cpp @@ -36,6 +36,7 @@ #include "AudioHardware.h" #include <media/AudioRecord.h> +#include <media/mediarecorder.h> extern "C" { #include "msm_audio.h" @@ -1968,15 +1969,16 @@ status_t AudioHardware::AudioStreamInMSM72xx::setParameters(const String8& keyVa AudioParameter param = AudioParameter(keyValuePairs); status_t status = NO_ERROR; int device; - String8 key = String8(KEY_A1026_VR_MODE); - int enabled; + String8 key = String8(AudioParameter::keyInputSource); + int source; LOGV("AudioStreamInMSM72xx::setParameters() %s", keyValuePairs.string()); - // reading voice recognition mode parameter - if (param.getInt(key, enabled) == NO_ERROR) { - LOGV("set vr_mode_enabled to %d", enabled); - vr_mode_change = (vr_mode_enabled != enabled); - vr_mode_enabled = enabled; + // reading input source for voice recognition mode parameter + if (param.getInt(key, source) == NO_ERROR) { + LOGV("set input source %d", source); + int uses_vr = (source == AUDIO_SOURCE_VOICE_RECOGNITION); + vr_mode_change = (vr_mode_enabled != uses_vr); + vr_mode_enabled = uses_vr; param.remove(key); } diff --git a/libaudio-qsd8k/AudioHardware.h b/libaudio-qsd8k/AudioHardware.h index a911a97..e961ede 100644 --- a/libaudio-qsd8k/AudioHardware.h +++ b/libaudio-qsd8k/AudioHardware.h @@ -103,8 +103,6 @@ namespace android { #define RX_IIR_ENABLE 0x0004 #define RX_IIR_DISABLE 0x0000 -#define KEY_A1026_VR_MODE "vr_mode" - #define MOD_PLAY 1 #define MOD_REC 2 |