Merge "taimen: voip rx controls" into oc-dr1-dev

am: 75c65a0488

Change-Id: I1f532bf25562591c18af8cecc6bd17cbdb3f4cc8
This commit is contained in:
Thierry Strudel
2017-06-15 05:39:02 +00:00
committed by android-build-merger
2 changed files with 64 additions and 9 deletions

View File

@@ -52,6 +52,8 @@
<usecase name="USECASE_VOICEMMODE2_CALL" type="out" id="19" />
<usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" id="18" />
<usecase name="USECASE_AUDIO_PLAYBACK_MMAP" type="out" id="18" />
<usecase name="USECASE_AUDIO_PLAYBACK_VOIP" type="out" id="16" />
<usecase name="USECASE_AUDIO_RECORD_VOIP" type="in" id="16" />
</pcm_ids>
<config_params>
<param key="input_mic_max_count" value="3"/>
@@ -71,10 +73,10 @@
<device name="SND_DEVICE_OUT_VOICE_HANDSET_TMUS" backend="handset" interface="QUAT_MI2S_RX"/>
</backend_names>
<app_types>
<app uc_type="PCM_PLAYBACK" bit_width="16" id="69936" max_rate="96000" />
<app uc_type="PCM_PLAYBACK" bit_width="24" id="69940" max_rate="192000" />
<app uc_type="PCM_CAPTURE" bit_width="16" id="69938" max_rate="96000" />
<app uc_type="PCM_CAPTURE" bit_width="24" id="69940" max_rate="96000" />
<app uc_type="PCM_PLAYBACK" mode="default" bit_width="16" id="69936" max_rate="96000" />
<app uc_type="PCM_PLAYBACK" mode="default" bit_width="24" id="69940" max_rate="192000" />
<app uc_type="PCM_CAPTURE" mode="default" bit_width="16" id="69938" max_rate="96000" />
<app uc_type="PCM_CAPTURE" mode="default" bit_width="24" id="69940" max_rate="96000" />
</app_types>
</audio_platform_info>

View File

@@ -400,7 +400,7 @@
<ctl name="SLIMBUS_0_RX Port Mixer SLIM_7_TX" value="0" />
<!-- HFP end -->
<!-- echo reference -->
<ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />
<ctl name="AUDIO_REF_EC_UL10 MUX" value="None" />
<!-- usb headset -->
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="0" />
@@ -606,19 +606,19 @@
<!-- These are audio route (FE to BE) specific mixer settings -->
<path name="echo-reference">
<ctl name="AUDIO_REF_EC_UL1 MUX" value="QUAT_MI2S_TX" />
<ctl name="AUDIO_REF_EC_UL10 MUX" value="QUAT_MI2S_TX" />
</path>
<path name="echo-reference speaker">
<ctl name="AUDIO_REF_EC_UL1 MUX" value="QUAT_MI2S_TX" />
<ctl name="AUDIO_REF_EC_UL10 MUX" value="QUAT_MI2S_TX" />
</path>
<path name="echo-reference handset">
<ctl name="AUDIO_REF_EC_UL1 MUX" value="QUAT_MI2S_TX" />
<ctl name="AUDIO_REF_EC_UL10 MUX" value="QUAT_MI2S_TX" />
</path>
<path name="echo-reference headphones">
<ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_6_RX" />
<ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_6_RX" />
</path>
<path name="deep-buffer-playback">
@@ -1871,6 +1871,59 @@
<path name="voice-tx">
</path>
<!-- VoIP Rx settings -->
<path name="audio-playback-voip">
<ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia10" value="1" />
</path>
<path name="audio-playback-voip speaker">
<ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia10" value="1" />
</path>
<path name="audio-playback-voip handset">
<ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia10" value="1" />
</path>
<path name="audio-playback-voip bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="1" />
</path>
<path name="audio-playback-voip bt-sco-wb">
<ctl name="BT SampleRate" value="KHZ_16" />
<path name="audio-playback-voip bt-sco" />
</path>
<path name="audio-playback-voip afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="1" />
</path>
<path name="audio-playback-voip usb-headphones">
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
</path>
<path name="audio-playback-voip usb-headset">
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia10" value="1" />
</path>
<!-- VoIP Tx settings -->
<path name="audio-record-voip">
<ctl name="MultiMedia10 Mixer SLIM_0_TX" value="1" />
</path>
<path name="audio-record-voip usb-headset-mic">
<ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="1" />
</path>
<path name="audio-record-voip bt-sco">
<ctl name="MultiMedia10 Mixer SLIM_7_TX" value="1" />
</path>
<path name="audio-record-voip bt-sco-wb">
<ctl name="BT SampleRate" value="KHZ_16" />
<path name="audio-record-voip bt-sco" />
</path>
<!-- voip loopback -->
<path name="voip-loopback">
<ctl name="QUAT_MI2S_RX_Voice Mixer Voip" value="1" />