diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-08 07:25:00 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-08 07:25:00 +0000 |
| commit | 50385c33439cc8d8afa866c7aeb638fb1a7baf24 (patch) | |
| tree | 3368d30ab76a5788761044915844df81fb891a0b | |
| parent | c490da1782aec5c29e15d4e66236f0a466b8952f (diff) | |
| parent | 3b214bb09477b50626312ff4cba773fdc201fc77 (diff) | |
| download | car-50385c33439cc8d8afa866c7aeb638fb1a7baf24.tar.gz | |
Snap for 4767765 from 3b214bb09477b50626312ff4cba773fdc201fc77 to pi-release
Change-Id: Iab3d9d973e99e5a66cfeede22c00c09afc3aaa69
| -rw-r--r-- | common/config.ini | 1 | ||||
| -rw-r--r-- | emulator/audio/audio_policy_configuration.xml | 18 |
2 files changed, 19 insertions, 0 deletions
diff --git a/common/config.ini b/common/config.ini index 621b581..d126122 100644 --- a/common/config.ini +++ b/common/config.ini @@ -1,3 +1,4 @@ +hw.audioInput=yes hw.lcd.density=120 hw.gpu.enabled=yes hw.camera.back=none diff --git a/emulator/audio/audio_policy_configuration.xml b/emulator/audio/audio_policy_configuration.xml index 30d20f0..eade9ab 100644 --- a/emulator/audio/audio_policy_configuration.xml +++ b/emulator/audio/audio_policy_configuration.xml @@ -59,6 +59,8 @@ <item>bus5_alarm_out</item> <item>bus6_notification_out</item> <item>bus7_system_sound_out</item> + <item>Built-In Mic</item> + <item>Built-In Back Mic</item> <item>bus0_mic1_in</item> <!-- Test input device port for audio patch --> <item>bus1_audio_patch_test_in</item> @@ -113,6 +115,11 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> </mixPort> + <mixPort name="primary input" role="sink"> + <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" + samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" + channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/> + </mixPort> <mixPort name="mixport_bus0_mic1_in" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="48000" @@ -201,6 +208,16 @@ minValueMB="-8400" maxValueMB="4000" defaultValueMB="0" stepValueMB="100"/> </gains> </devicePort> + <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source"> + <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" + samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" + channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/> + </devicePort> + <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source"> + <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" + samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" + channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/> + </devicePort> <devicePort tagName="bus0_mic1_in" type="AUDIO_DEVICE_IN_BUS" role="source" address="bus0_mic1_in"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" @@ -231,6 +248,7 @@ <route type="mix" sink="bus5_alarm_out" sources="mixport_bus5_alarm_out"/> <route type="mix" sink="bus6_notification_out" sources="mixport_bus6_notification_out"/> <route type="mix" sink="bus7_system_sound_out" sources="mixport_bus7_system_sound_out"/> + <route type="mix" sink="primary input" sources="Built-In Mic,Built-In Back Mic"/> <route type="mix" sink="mixport_bus0_mic1_in" sources="bus0_mic1_in"/> <!-- Listed source device ports will be routed to desired sinks via audio patch, |