diff options
| author | Eric Laurent <elaurent@google.com> | 2013-01-31 22:41:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-01-31 22:41:20 +0000 |
| commit | 01a802daf1e87db8c55d542aa08805c5f2a13055 (patch) | |
| tree | 38011ba77f2d72d4b10e6c4f221a94990a78fe1a | |
| parent | cacd2eea9567fc418f9b51f65aa31cb589a62120 (diff) | |
| parent | 55fb017e0a31f45a08c970a3d4a4de8311302839 (diff) | |
| download | device_samsung_tuna-01a802daf1e87db8c55d542aa08805c5f2a13055.zip device_samsung_tuna-01a802daf1e87db8c55d542aa08805c5f2a13055.tar.gz device_samsung_tuna-01a802daf1e87db8c55d542aa08805c5f2a13055.tar.bz2 | |
Merge "audio: added support for dual mic capture."
| -rw-r--r-- | audio/audio_hw.c | 3 | ||||
| -rw-r--r-- | audio/audio_policy.conf | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 66a6da7..c5f1867 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -1341,7 +1341,8 @@ static void select_input_device(struct tuna_audio_device *adev) /* Select front end */ - if ((adev->active_input != 0) && (adev->active_input->aux_channels)) { + if ((adev->active_input != 0) && (adev->active_input->aux_channels || + adev->active_input->main_channels == AUDIO_CHANNEL_IN_FRONT_BACK)) { ALOGV("select input device(): multi-mic configuration main mic %s sub mic %s", main_mic_on ? "ON" : "OFF", sub_mic_on ? "ON" : "OFF"); if (main_mic_on) { diff --git a/audio/audio_policy.conf b/audio/audio_policy.conf index 1012c26..bf387a2 100644 --- a/audio/audio_policy.conf +++ b/audio/audio_policy.conf @@ -47,7 +47,7 @@ audio_hw_modules { inputs { primary { sampling_rates 8000|11025|16000|22050|24000|32000|44100|48000 - channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO + channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO|AUDIO_CHANNEL_IN_FRONT_BACK formats AUDIO_FORMAT_PCM_16_BIT devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_BACK_MIC } |