diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-13 12:22:48 +0000 |
---|---|---|
committer | Cyan_Hsieh <cyanhsieh@google.com> | 2020-05-29 21:22:30 +0800 |
commit | 3b4b885dc8803f1fada927139e968ca1d452ea42 (patch) | |
tree | 1f1e3ac9adec3c21fd318bb2acbbd09cc083ca05 /audio | |
parent | 948da2f4b9cc792d50d48eae56474538a08c84f3 (diff) | |
parent | 0fee5bd3b086e162d6f1c8671710cdaa63b8ee65 (diff) | |
download | redfin-3b4b885dc8803f1fada927139e968ca1d452ea42.tar.gz |
Merge "audio: correct routing order for voip output" into rvc-dev am: 68f60253e9
Change-Id: Ifb5bbbfcd00ecedc825f677213558e2b143f8c7b
Diffstat (limited to 'audio')
-rw-r--r-- | audio/audio_policy_configuration.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml index ef267ca..7a0dbf6 100644 --- a/audio/audio_policy_configuration.xml +++ b/audio/audio_policy_configuration.xml @@ -30,6 +30,11 @@ </attachedDevices> <defaultOutputDevice>Speaker</defaultOutputDevice> <mixPorts> + <mixPort name="voip_rx" role="source" + flags="AUDIO_OUTPUT_FLAG_VOIP_RX"> + <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" + samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + </mixPort> <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> @@ -68,11 +73,6 @@ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> </mixPort> - <mixPort name="voip_rx" role="source" - flags="AUDIO_OUTPUT_FLAG_VOIP_RX"> - <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" |