Add incall music to walleye mixer paths

This change adds the paths for walleye for the incall music
use case. The path is which is used is incall-music-uplink.
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: Ic7f3306ba9068daf4f455a627fddb273b04a73ea
This commit is contained in:
Nadav Bar
2018-01-07 12:16:58 +02:00
parent 305d4c06b9
commit 6d56be2343
2 changed files with 75 additions and 0 deletions

View File

@@ -75,6 +75,7 @@
<usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" 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

@@ -494,6 +494,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 -->
@@ -2111,4 +2112,77 @@
<ctl name="BT SampleRate" value="KHZ_16" />
<path name="audio-record-voip bt-sco" />
</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 speaker-and-bt-a2dp">
<path name="incall-music-uplink" />
</path>
<path name="incall-music-uplink bt-a2dp">
<path name="incall-music-uplink" />
</path>
</mixer>