Merge "Add incall music to taimen mixer paths"

This commit is contained in:
Nadav Bar
2018-01-22 23:20:50 +00:00
committed by Android (Google) Code Review
2 changed files with 70 additions and 0 deletions

View File

@@ -63,6 +63,7 @@
<usecase name="USECASE_AUDIO_PLAYBACK_MMAP" type="out" id="4" />
<usecase name="USECASE_AUDIO_PLAYBACK_VOIP" type="out" id="16" />
<usecase name="USECASE_AUDIO_RECORD_VOIP" type="in" id="16" />
<usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="27" />
</pcm_ids>
<config_params>
<param key="input_mic_max_count" value="3"/>

View File

@@ -492,6 +492,7 @@
<!-- Incall Music -->
<ctl name="Incall_Music Audio Mixer MultiMedia2" value="0" />
<ctl name="Incall_Music Audio Mixer MultiMedia9" value="0" />
<!-- Incall Music End -->
<!-- compress-voip-call start -->
@@ -2251,4 +2252,72 @@
<path name="incall-rec-uplink-and-downlink" />
</path>
<path name="incall-music-uplink">
<ctl name="Incall_Music Audio Mixer MultiMedia9" value="1" />
</path>
<path name="incall-music-uplink speaker">
<path name="incall-music-uplink" />
</path>
<path name="incall-music-uplink handset">
<path name="incall-music-uplink" />
</path>
<path name="incall-music-uplink handset-hac">
<path name="incall-music-uplink" />
</path>
<path name="incall-music-uplink display-port">
<path name="incall-music-uplink" />
</path>
<path name="incall-music-uplink bt-sco">
<path name="incall-music-uplink" />
</path>
<path name="incall-music-uplink bt-sco-wb">
<path name="incall-music-uplink" />
</path>
<path name="incall-music-uplink speaker-and-display-port">
<path name="incall-music-uplink" />
</path>
<path name="incall-music-uplink afe-proxy">
<path name="incall-music-uplink" />
</path>
<path name="incall-music-uplink usb-headphones">
<path name="incall-music-uplink" />
</path>
<path name="incall-music-uplink usb-headset">
<path name="incall-music-uplink" />
</path>
<path name="incall-music-uplink speaker-and-usb-headphones">
<path name="incall-music-uplink" />
</path>
<path name="incall-music-uplink headphones">
<path name="incall-music-uplink" />
</path>
<path name="incall-music-uplink speaker-and-headphones">
<path name="incall-music-uplink" />
</path>
<path name="incall-music-uplink speaker-and-bt-sco">
<path name="incall-music-uplink" />
</path>
<path name="incall-music-uplink voice-tty-hco-handset">
<path name="incall-music-uplink" />
</path>
<path name="incall-music-uplink voice-tty-vco-usb">
<path name="incall-music-uplink" />
</path>
</mixer>