summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPriyesh Bisla2012-09-14 13:25:48 -0500
committerPriyesh Bisla2012-09-14 13:25:48 -0500
commit1ee13139c955b048d5f2348c327f7b4005430fb3 (patch)
treef6d05fcbbf766de3533e0d5d6c9d28ea280f9f4e
parent4748681d9be18cf8a1205e3041c7b11b396a6198 (diff)
downloaddevice-ti-common-open-1ee13139c955b048d5f2348c327f7b4005430fb3.tar.gz
device-ti-common-open-1ee13139c955b048d5f2348c327f7b4005430fb3.tar.xz
device-ti-common-open-1ee13139c955b048d5f2348c327f7b4005430fb3.zip
audio: Enable USB headset mic
Change-Id: If6ea12ed92cafacf61e702571fc1304efbc349da Signed-off-by: Priyesh Bisla <a0271372@ti.com>
-rw-r--r--audio/audio_hw.c16
-rw-r--r--audio/audio_policy.conf2
2 files changed, 9 insertions, 9 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index 70898b4..e2eef24 100644
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -2213,9 +2213,9 @@ static int start_input_stream(struct omap_stream_in *in)
2213 adev->vx_rec_on = true; 2213 adev->vx_rec_on = true;
2214 } 2214 }
2215 2215
2216// if(adev->devices & AUDIO_DEVICE_IN_USB_HEADSET) { 2216 if(adev->devices & AUDIO_DEVICE_IN_USB_HEADSET) {
2217// adev->input_requires_stereo = 0; 2217 adev->input_requires_stereo = 0;
2218// } 2218 }
2219 2219
2220 if (adev->input_requires_stereo && (in->config.channels == 1)) 2220 if (adev->input_requires_stereo && (in->config.channels == 1))
2221 setup_stereo_to_mono_input_remix(in); 2221 setup_stereo_to_mono_input_remix(in);
@@ -2230,11 +2230,11 @@ static int start_input_stream(struct omap_stream_in *in)
2230 if (in->remix_at_driver) 2230 if (in->remix_at_driver)
2231 in->config.channels = in->remix_at_driver->in_chans; 2231 in->config.channels = in->remix_at_driver->in_chans;
2232 2232
2233// if(adev->devices & AUDIO_DEVICE_IN_USB_HEADSET) { 2233 if(adev->devices & AUDIO_DEVICE_IN_USB_HEADSET) {
2234// card = CARD_OMAP_USB; 2234 card = CARD_OMAP_USB;
2235// /*device should be 0 for usb headset capture */ 2235 /*device should be 0 for usb headset capture */
2236// device = PORT_MM; 2236 device = PORT_MM;
2237// } 2237 }
2238 2238
2239 if(adev->devices & AUDIO_DEVICE_IN_FM_RADIO_RX) { 2239 if(adev->devices & AUDIO_DEVICE_IN_FM_RADIO_RX) {
2240 card = CARD_OMAP_DEFAULT; 2240 card = CARD_OMAP_DEFAULT;
diff --git a/audio/audio_policy.conf b/audio/audio_policy.conf
index 9dbf7b9..2781bf1 100644
--- a/audio/audio_policy.conf
+++ b/audio/audio_policy.conf
@@ -35,7 +35,7 @@ audio_hw_modules {
35 sampling_rates 8000|11025|16000|22050|32000|44100|48000 35 sampling_rates 8000|11025|16000|22050|32000|44100|48000
36 channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO 36 channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO
37 formats AUDIO_FORMAT_PCM_16_BIT 37 formats AUDIO_FORMAT_PCM_16_BIT
38 devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_FM_RADIO_RX 38 devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_FM_RADIO_RX|AUDIO_DEVICE_IN_USB_HEADSET
39 } 39 }
40 } 40 }
41 } 41 }