diff options
author | Nadav Bar <nadavbar@google.com> | 2018-01-07 12:12:01 +0200 |
---|---|---|
committer | Nadav Bar <nadavbar@google.com> | 2018-01-22 13:57:37 +0200 |
commit | b4dcb5d2dab7abf5d8dacd6deedca2099c7acb0b (patch) | |
tree | 365019d533cbaa558f0d242cd6058e7fe5856c66 /audio_policy_configuration.xml | |
parent | 7b07955b89b1edc8b46bc7202c3fc79cc63e8da1 (diff) | |
download | wahoo-b4dcb5d2dab7abf5d8dacd6deedca2099c7acb0b.tar.gz |
Add incall music policy to walleye and taimen
This change adds the incall music mix port to walleye and taimen audio policy oconfiguration.
This change was tested together with a set of additional changes to the
audio framework and the HAL which introduces the ability to
play pcm audio to the uplink stream.
Bug: 69973354.
Test: Tested manually.
Change-Id: Iec4f72d836cf391645c2af891d62da9c2a6f240c
Diffstat (limited to 'audio_policy_configuration.xml')
-rw-r--r-- | audio_policy_configuration.xml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/audio_policy_configuration.xml b/audio_policy_configuration.xml index 07daa6c8..91d790a0 100644 --- a/audio_policy_configuration.xml +++ b/audio_policy_configuration.xml @@ -73,6 +73,12 @@ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> </mixPort> + <mixPort name="incall_music_uplink" role="source" + flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC"> + <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" + samplingRates="8000,16000,48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + </mixPort> <mixPort name="primary input" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT" samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" @@ -150,7 +156,7 @@ <route type="mix" sink="USB Headset Out" sources="primary output,raw,deep_buffer,compressed_offload,hifi_playback,mmap_no_irq_out,voip_rx"/> <route type="mix" sink="Telephony Tx" - sources="voice_tx"/> + sources="voice_tx,incall_music_uplink"/> <route type="mix" sink="primary input" sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> <route type="mix" sink="fast input" |