diff options
| author | David Lin <dtwlin@google.com> | 2017-03-13 09:59:19 -0700 |
|---|---|---|
| committer | David Lin <dtwlin@google.com> | 2017-03-13 09:59:19 -0700 |
| commit | 6016d33534893d9e26b7169158f14a1715fa84ec (patch) | |
| tree | cde948dedba4946fc9bc86947c4e8917de5cdd4a /audio_policy_configuration.xml | |
| parent | 59e812621506fa2877c4cc2dee4efdf1586ee727 (diff) | |
| download | wahoo-6016d33534893d9e26b7169158f14a1715fa84ec.tar.gz | |
Revert "Partial revert "audio: enable usb audio tunnel support""
This reverts commit 1238fe2b24cc9213e6db02617c27a60a01f7f712.
Diffstat (limited to 'audio_policy_configuration.xml')
| -rw-r--r-- | audio_policy_configuration.xml | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/audio_policy_configuration.xml b/audio_policy_configuration.xml index ee411819..0cb59e77 100644 --- a/audio_policy_configuration.xml +++ b/audio_policy_configuration.xml @@ -96,6 +96,9 @@ </devicePort> <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink"> </devicePort> + <!-- TODO: Enable dynamic USB profile --> + <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink"> + </devicePort> <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source"> </devicePort> @@ -107,6 +110,9 @@ </devicePort> <devicePort tagName="Telephony Rx" type="AUDIO_DEVICE_IN_TELEPHONY_RX" role="source"> </devicePort> + <!-- TODO: Enable multi-channel recording --> + <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source"> + </devicePort> </devicePorts> <routes> <route type="mix" sink="Earpiece" @@ -125,10 +131,12 @@ sources="primary output,raw,deep_buffer"/> <route type="mix" sink="BT SCO Car Kit" sources="primary output,raw,deep_buffer"/> + <route type="mix" sink="USB Device Out" + sources="primary output,raw,deep_buffer,compressed_offload"/> <route type="mix" sink="Telephony Tx" sources="voice_tx"/> <route type="mix" sink="primary input" - sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,USB Device In"/> <route type="mix" sink="fast input" sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic"/> <route type="mix" sink="voice_rx" @@ -141,7 +149,24 @@ <xi:include href="a2dp_audio_policy_configuration.xml"/> <!-- Usb Audio HAL --> - <xi:include href="usb_audio_policy_configuration.xml"/> + <module name="usb" halVersion="2.0"> + <mixPorts> + <mixPort name="usb_accessory output" role="source"> + <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" + samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + </mixPort> + </mixPorts> + <devicePorts> + <devicePort tagName="USB Host Out" type="AUDIO_DEVICE_OUT_USB_ACCESSORY" role="sink"> + <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" + samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + </devicePort> + </devicePorts> + <routes> + <route type="mix" sink="USB Host Out" + sources="usb_accessory output"/> + </routes> + </module> <!-- Remote Submix Audio HAL --> <xi:include href="r_submix_audio_policy_configuration.xml"/> |