Snap for 7343892 from cf879c5b96
to tm-release
Change-Id: I439b2109b339193d2c0f6378f41d025349436f66
This commit is contained in:
commit
25e56111c6
28 changed files with 170 additions and 42 deletions
|
@ -9,7 +9,6 @@
|
|||
<library name="loudness_enhancer" path="libldnhncr.so"/>
|
||||
<library name="proxy" path="libeffectproxy.so"/>
|
||||
<library name="offload_effect" path="liboffloadeffect.so"/>
|
||||
<library name="audio_pre_process" path="libdsp_aecns.so"/>
|
||||
<library name="haptic_generator" path="libhapticgenerator.so"/>
|
||||
</libraries>
|
||||
<effects>
|
||||
|
@ -48,8 +47,8 @@
|
|||
</effectProxy>
|
||||
<effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>
|
||||
<effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>
|
||||
<effect name="aec" library="audio_pre_process" uuid="28c28780-ec8b-48b6-8590-8c84557d797d"/>
|
||||
<effect name="ns" library="audio_pre_process" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
|
||||
<effect name="aec" library="offload_effect" uuid="28c28780-ec8b-48b6-8590-8c84557d797d"/>
|
||||
<effect name="ns" library="offload_effect" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
|
||||
<effect name="haptic_generator" library="haptic_generator" uuid="97c4acd1-8b82-4f2f-832e-c2fe5d7a9931"/>
|
||||
</effects>
|
||||
<postprocess>
|
||||
|
|
|
@ -115,7 +115,7 @@
|
|||
<!-- for output with AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST, 4 * 10ms buffer -->
|
||||
<usecase id="UC_LOW_LATENCY_PLAYBACK" dev1="1" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
|
||||
<!-- for output with AUDIO_OUTPUT_FLAG_MMAP_NOIRQ, 80 periods * 48 frames/period(=1ms w/ 48k sample rate) * 4 bytes/frame = 15360 bytes -->
|
||||
<usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="80"/>
|
||||
<usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="80"/>
|
||||
<!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 4 * 20ms buffer -->
|
||||
<usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
|
||||
<!-- dev1: voice-call downlink dev2: voice-clal uplink -->
|
||||
|
@ -131,6 +131,8 @@
|
|||
<usecase id="UC_HOSTLESS_UL" dev1="15"/>
|
||||
<!-- for VOIP input, 4 * 10ms buffer -->
|
||||
<usecase id="UC_VOIP_RECORD" dev1="17" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
|
||||
<!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 480 periods * 1ms buffer,32-bit,2 ch, buffer size 92160 bytes -->
|
||||
<usecase id="UC_MMAP_RECORD" dev1="9" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="240"/>
|
||||
</usecase_attr>
|
||||
|
||||
<dsp_latency>
|
||||
|
|
|
@ -48,11 +48,13 @@
|
|||
samplingRates="8000 16000 24000 32000 44100 48000"
|
||||
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
|
||||
</mixPort>
|
||||
<!-- TODO(186720581): revert this change when b/178431048 is fixed
|
||||
<mixPort name="haptic" role="source">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000"
|
||||
channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A" />
|
||||
</mixPort>
|
||||
-->
|
||||
<mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||
|
@ -102,6 +104,11 @@
|
|||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
|
||||
</mixPort>
|
||||
<mixPort name="mmap_no_irq_in" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
|
||||
samplingRates="48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
|
||||
</mixPort>
|
||||
</mixPorts>
|
||||
<devicePorts>
|
||||
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
|
||||
|
@ -164,27 +171,27 @@
|
|||
<!-- route declaration, i.e. list all available sources for a given sink -->
|
||||
<routes>
|
||||
<route type="mix" sink="Speaker"
|
||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="Speaker Safe"
|
||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="Earpiece"
|
||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="BT A2DP Out"
|
||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="BT A2DP Headphones"
|
||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="BT A2DP Speaker"
|
||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="USB Device Out"
|
||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="USB Headset Out"
|
||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="BT SCO"
|
||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="BT SCO Headset"
|
||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="BT SCO Car Kit"
|
||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
|
||||
<route type="mix" sink="primary input"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||
|
@ -194,6 +201,8 @@
|
|||
<route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
|
||||
<route type="mix" sink="voip_tx"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||
<route type="mix" sink="mmap_no_irq_in"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In"/>
|
||||
</routes>
|
||||
</module>
|
||||
<!-- Bluetooth Audio HAL -->
|
||||
|
|
|
@ -102,6 +102,11 @@
|
|||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
|
||||
</mixPort>
|
||||
<mixPort name="mmap_no_irq_in" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
|
||||
samplingRates="48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
|
||||
</mixPort>
|
||||
</mixPorts>
|
||||
<devicePorts>
|
||||
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
|
||||
|
@ -173,6 +178,8 @@
|
|||
<route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
|
||||
<route type="mix" sink="voip_tx"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||
<route type="mix" sink="mmap_no_irq_in"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In"/>
|
||||
</routes>
|
||||
</module>
|
||||
<!-- Bluetooth Audio HAL -->
|
||||
|
|
|
@ -102,6 +102,11 @@
|
|||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
|
||||
</mixPort>
|
||||
<mixPort name="mmap_no_irq_in" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
|
||||
samplingRates="48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
|
||||
</mixPort>
|
||||
</mixPorts>
|
||||
<devicePorts>
|
||||
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
|
||||
|
@ -173,6 +178,8 @@
|
|||
<route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
|
||||
<route type="mix" sink="voip_tx"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||
<route type="mix" sink="mmap_no_irq_in"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In"/>
|
||||
</routes>
|
||||
</module>
|
||||
<!-- A2dp Audio HAL -->
|
||||
|
|
|
@ -611,6 +611,15 @@
|
|||
<ctl name="Incall Capture Stream2" value="UL_DL"/>
|
||||
</path>
|
||||
|
||||
<path name="mmap-recordC">
|
||||
<ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1"/>
|
||||
</path>
|
||||
|
||||
<path name="mmap-recordC usb-headset-mic">
|
||||
<ctl name="Audio Capture Mic Source" value="USB_MIC"/>
|
||||
<ctl name="EP2 TX Mixer USB_TX" value="1"/>
|
||||
</path>
|
||||
|
||||
<!-- codec setting -->>
|
||||
<!-- Rx device -->
|
||||
<path name="handset">
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
<library name="loudness_enhancer" path="libldnhncr.so"/>
|
||||
<library name="proxy" path="libeffectproxy.so"/>
|
||||
<library name="offload_effect" path="liboffloadeffect.so"/>
|
||||
<library name="audio_pre_process" path="libdsp_aecns.so"/>
|
||||
<library name="haptic_generator" path="libhapticgenerator.so"/>
|
||||
</libraries>
|
||||
<effects>
|
||||
|
@ -48,8 +47,8 @@
|
|||
</effectProxy>
|
||||
<effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>
|
||||
<effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>
|
||||
<effect name="aec" library="audio_pre_process" uuid="28c28780-ec8b-48b6-8590-8c84557d797d"/>
|
||||
<effect name="ns" library="audio_pre_process" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
|
||||
<effect name="aec" library="offload_effect" uuid="28c28780-ec8b-48b6-8590-8c84557d797d"/>
|
||||
<effect name="ns" library="offload_effect" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
|
||||
<effect name="haptic_generator" library="haptic_generator" uuid="97c4acd1-8b82-4f2f-832e-c2fe5d7a9931"/>
|
||||
</effects>
|
||||
<postprocess>
|
||||
|
|
|
@ -115,7 +115,7 @@
|
|||
<!-- for output with AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST, 4 * 10ms buffer -->
|
||||
<usecase id="UC_LOW_LATENCY_PLAYBACK" dev1="1" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
|
||||
<!-- for output with AUDIO_OUTPUT_FLAG_MMAP_NOIRQ, 80 periods * 48 frames/period(=1ms w/ 48k sample rate) * 4 bytes/frame = 15360 bytes -->
|
||||
<usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="80"/>
|
||||
<usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="80"/>
|
||||
<!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 4 * 20ms buffer -->
|
||||
<usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
|
||||
<!-- dev1: voice-call downlink dev2: voice-clal uplink -->
|
||||
|
@ -131,6 +131,8 @@
|
|||
<usecase id="UC_HOSTLESS_UL" dev1="15"/>
|
||||
<!-- for VOIP input, 4 * 10ms buffer -->
|
||||
<usecase id="UC_VOIP_RECORD" dev1="17" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
|
||||
<!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 480 periods * 1ms buffer,32-bit,2 ch, buffer size 92160 bytes -->
|
||||
<usecase id="UC_MMAP_RECORD" dev1="9" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="240"/>
|
||||
</usecase_attr>
|
||||
|
||||
<dsp_latency>
|
||||
|
|
|
@ -48,11 +48,13 @@
|
|||
samplingRates="8000 16000 24000 32000 44100 48000"
|
||||
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
|
||||
</mixPort>
|
||||
<!-- TODO(186720581): revert this change when b/178431048 is fixed
|
||||
<mixPort name="haptic" role="source">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000"
|
||||
channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A" />
|
||||
</mixPort>
|
||||
-->
|
||||
<mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||
|
@ -102,6 +104,11 @@
|
|||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
|
||||
</mixPort>
|
||||
<mixPort name="mmap_no_irq_in" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
|
||||
samplingRates="48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
|
||||
</mixPort>
|
||||
</mixPorts>
|
||||
<devicePorts>
|
||||
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
|
||||
|
@ -164,27 +171,27 @@
|
|||
<!-- route declaration, i.e. list all available sources for a given sink -->
|
||||
<routes>
|
||||
<route type="mix" sink="Speaker"
|
||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="Speaker Safe"
|
||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="Earpiece"
|
||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="BT A2DP Out"
|
||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="BT A2DP Headphones"
|
||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="BT A2DP Speaker"
|
||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="USB Device Out"
|
||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="USB Headset Out"
|
||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="BT SCO"
|
||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="BT SCO Headset"
|
||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="BT SCO Car Kit"
|
||||
sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
|
||||
<route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
|
||||
<route type="mix" sink="primary input"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||
|
@ -194,6 +201,8 @@
|
|||
<route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
|
||||
<route type="mix" sink="voip_tx"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||
<route type="mix" sink="mmap_no_irq_in"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In"/>
|
||||
</routes>
|
||||
</module>
|
||||
<!-- Bluetooth Audio HAL -->
|
||||
|
|
|
@ -102,6 +102,11 @@
|
|||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
|
||||
</mixPort>
|
||||
<mixPort name="mmap_no_irq_in" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
|
||||
samplingRates="48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
|
||||
</mixPort>
|
||||
</mixPorts>
|
||||
<devicePorts>
|
||||
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
|
||||
|
@ -173,6 +178,8 @@
|
|||
<route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
|
||||
<route type="mix" sink="voip_tx"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||
<route type="mix" sink="mmap_no_irq_in"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In"/>
|
||||
</routes>
|
||||
</module>
|
||||
<!-- Bluetooth Audio HAL -->
|
||||
|
|
|
@ -102,6 +102,11 @@
|
|||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
|
||||
</mixPort>
|
||||
<mixPort name="mmap_no_irq_in" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
|
||||
samplingRates="48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
|
||||
</mixPort>
|
||||
</mixPorts>
|
||||
<devicePorts>
|
||||
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
|
||||
|
@ -173,6 +178,8 @@
|
|||
<route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
|
||||
<route type="mix" sink="voip_tx"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||
<route type="mix" sink="mmap_no_irq_in"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In"/>
|
||||
</routes>
|
||||
</module>
|
||||
<!-- A2dp Audio HAL -->
|
||||
|
|
|
@ -638,6 +638,15 @@
|
|||
<ctl name="Incall Capture Stream2" value="UL_DL"/>
|
||||
</path>
|
||||
|
||||
<path name="mmap-recordC">
|
||||
<ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1"/>
|
||||
</path>
|
||||
|
||||
<path name="mmap-recordC usb-headset-mic">
|
||||
<ctl name="Audio Capture Mic Source" value="USB_MIC"/>
|
||||
<ctl name="EP2 TX Mixer USB_TX" value="1"/>
|
||||
</path>
|
||||
|
||||
<!-- codec setting -->>
|
||||
<!-- Rx device -->
|
||||
<path name="handset">
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
<library name="loudness_enhancer" path="libldnhncr.so"/>
|
||||
<library name="proxy" path="libeffectproxy.so"/>
|
||||
<library name="offload_effect" path="liboffloadeffect.so"/>
|
||||
<library name="audio_pre_process" path="libdsp_aecns.so"/>
|
||||
<library name="haptic_generator" path="libhapticgenerator.so"/>
|
||||
</libraries>
|
||||
<effects>
|
||||
|
@ -48,8 +47,8 @@
|
|||
</effectProxy>
|
||||
<effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>
|
||||
<effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>
|
||||
<effect name="aec" library="audio_pre_process" uuid="28c28780-ec8b-48b6-8590-8c84557d797d"/>
|
||||
<effect name="ns" library="audio_pre_process" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
|
||||
<effect name="aec" library="offload_effect" uuid="28c28780-ec8b-48b6-8590-8c84557d797d"/>
|
||||
<effect name="ns" library="offload_effect" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
|
||||
<effect name="haptic_generator" library="haptic_generator" uuid="97c4acd1-8b82-4f2f-832e-c2fe5d7a9931"/>
|
||||
</effects>
|
||||
<postprocess>
|
||||
|
|
|
@ -115,7 +115,7 @@
|
|||
<!-- for output with AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST, 4 * 10ms buffer -->
|
||||
<usecase id="UC_LOW_LATENCY_PLAYBACK" dev1="1" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
|
||||
<!-- for output with AUDIO_OUTPUT_FLAG_MMAP_NOIRQ, 80 periods * 48 frames/period(=1ms w/ 48k sample rate) * 4 bytes/frame = 15360 bytes -->
|
||||
<usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="80"/>
|
||||
<usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="80"/>
|
||||
<!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 4 * 20ms buffer -->
|
||||
<usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
|
||||
<!-- dev1: voice-call downlink dev2: voice-clal uplink -->
|
||||
|
@ -131,6 +131,8 @@
|
|||
<usecase id="UC_HOSTLESS_UL" dev1="15"/>
|
||||
<!-- for VOIP input, 4 * 10ms buffer -->
|
||||
<usecase id="UC_VOIP_RECORD" dev1="17" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
|
||||
<!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 480 periods * 1ms buffer,32-bit,2 ch, buffer size 92160 bytes -->
|
||||
<usecase id="UC_MMAP_RECORD" dev1="9" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="240"/>
|
||||
</usecase_attr>
|
||||
|
||||
<dsp_latency>
|
||||
|
|
|
@ -102,6 +102,11 @@
|
|||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
|
||||
</mixPort>
|
||||
<mixPort name="mmap_no_irq_in" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
|
||||
samplingRates="48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
|
||||
</mixPort>
|
||||
</mixPorts>
|
||||
<devicePorts>
|
||||
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
|
||||
|
@ -194,6 +199,8 @@
|
|||
<route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
|
||||
<route type="mix" sink="voip_tx"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||
<route type="mix" sink="mmap_no_irq_in"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In"/>
|
||||
</routes>
|
||||
</module>
|
||||
<!-- Bluetooth Audio HAL -->
|
||||
|
|
|
@ -102,6 +102,11 @@
|
|||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
|
||||
</mixPort>
|
||||
<mixPort name="mmap_no_irq_in" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
|
||||
samplingRates="48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
|
||||
</mixPort>
|
||||
</mixPorts>
|
||||
<devicePorts>
|
||||
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
|
||||
|
@ -173,6 +178,8 @@
|
|||
<route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
|
||||
<route type="mix" sink="voip_tx"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||
<route type="mix" sink="mmap_no_irq_in"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In"/>
|
||||
</routes>
|
||||
</module>
|
||||
<!-- Bluetooth Audio HAL -->
|
||||
|
|
|
@ -102,6 +102,11 @@
|
|||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
|
||||
</mixPort>
|
||||
<mixPort name="mmap_no_irq_in" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
|
||||
samplingRates="48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
|
||||
</mixPort>
|
||||
</mixPorts>
|
||||
<devicePorts>
|
||||
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
|
||||
|
@ -173,6 +178,8 @@
|
|||
<route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
|
||||
<route type="mix" sink="voip_tx"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||
<route type="mix" sink="mmap_no_irq_in"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In"/>
|
||||
</routes>
|
||||
</module>
|
||||
<!-- A2dp Audio HAL -->
|
||||
|
|
|
@ -586,6 +586,15 @@
|
|||
<ctl name="Incall Capture Stream2" value="UL_DL"/>
|
||||
</path>
|
||||
|
||||
<path name="mmap-recordC">
|
||||
<ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1"/>
|
||||
</path>
|
||||
|
||||
<path name="mmap-recordC usb-headset-mic">
|
||||
<ctl name="Audio Capture Mic Source" value="USB_MIC"/>
|
||||
<ctl name="EP2 TX Mixer USB_TX" value="1"/>
|
||||
</path>
|
||||
|
||||
<!-- codec setting -->>
|
||||
<!-- Rx device -->
|
||||
<path name="handset">
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
<library name="loudness_enhancer" path="libldnhncr.so"/>
|
||||
<library name="proxy" path="libeffectproxy.so"/>
|
||||
<library name="offload_effect" path="liboffloadeffect.so"/>
|
||||
<library name="audio_pre_process" path="libdsp_aecns.so"/>
|
||||
<library name="haptic_generator" path="libhapticgenerator.so"/>
|
||||
</libraries>
|
||||
<effects>
|
||||
|
@ -48,8 +47,8 @@
|
|||
</effectProxy>
|
||||
<effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>
|
||||
<effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>
|
||||
<effect name="aec" library="audio_pre_process" uuid="28c28780-ec8b-48b6-8590-8c84557d797d"/>
|
||||
<effect name="ns" library="audio_pre_process" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
|
||||
<effect name="aec" library="offload_effect" uuid="28c28780-ec8b-48b6-8590-8c84557d797d"/>
|
||||
<effect name="ns" library="offload_effect" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
|
||||
<effect name="haptic_generator" library="haptic_generator" uuid="97c4acd1-8b82-4f2f-832e-c2fe5d7a9931"/>
|
||||
</effects>
|
||||
<postprocess>
|
||||
|
|
|
@ -115,7 +115,7 @@
|
|||
<!-- for output with AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST, 4 * 10ms buffer -->
|
||||
<usecase id="UC_LOW_LATENCY_PLAYBACK" dev1="1" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
|
||||
<!-- for output with AUDIO_OUTPUT_FLAG_MMAP_NOIRQ, 80 periods * 48 frames/period(=1ms w/ 48k sample rate) * 4 bytes/frame = 15360 bytes -->
|
||||
<usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="80"/>
|
||||
<usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="80"/>
|
||||
<!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 4 * 20ms buffer -->
|
||||
<usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
|
||||
<!-- dev1: voice-call downlink dev2: voice-clal uplink -->
|
||||
|
@ -131,6 +131,8 @@
|
|||
<usecase id="UC_HOSTLESS_UL" dev1="15"/>
|
||||
<!-- for VOIP input, 4 * 10ms buffer -->
|
||||
<usecase id="UC_VOIP_RECORD" dev1="17" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
|
||||
<!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 480 periods * 1ms buffer,32-bit,2 ch, buffer size 92160 bytes -->
|
||||
<usecase id="UC_MMAP_RECORD" dev1="9" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="240"/>
|
||||
</usecase_attr>
|
||||
|
||||
<dsp_latency>
|
||||
|
|
|
@ -97,6 +97,11 @@
|
|||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
|
||||
</mixPort>
|
||||
<mixPort name="mmap_no_irq_in" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
|
||||
samplingRates="48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
|
||||
</mixPort>
|
||||
</mixPorts>
|
||||
<devicePorts>
|
||||
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
|
||||
|
@ -168,6 +173,8 @@
|
|||
<route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
|
||||
<route type="mix" sink="voip_tx"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||
<route type="mix" sink="mmap_no_irq_in"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In"/>
|
||||
</routes>
|
||||
</module>
|
||||
<!-- Bluetooth Audio HAL -->
|
||||
|
|
|
@ -97,6 +97,11 @@
|
|||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
|
||||
</mixPort>
|
||||
<mixPort name="mmap_no_irq_in" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
|
||||
samplingRates="48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
|
||||
</mixPort>
|
||||
</mixPorts>
|
||||
<devicePorts>
|
||||
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
|
||||
|
@ -168,6 +173,8 @@
|
|||
<route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
|
||||
<route type="mix" sink="voip_tx"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||
<route type="mix" sink="mmap_no_irq_in"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In"/>
|
||||
</routes>
|
||||
</module>
|
||||
<!-- Bluetooth Audio HAL -->
|
||||
|
|
|
@ -97,6 +97,11 @@
|
|||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
|
||||
</mixPort>
|
||||
<mixPort name="mmap_no_irq_in" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
|
||||
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
|
||||
samplingRates="48000"
|
||||
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
|
||||
</mixPort>
|
||||
</mixPorts>
|
||||
<devicePorts>
|
||||
<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
|
||||
|
@ -168,6 +173,8 @@
|
|||
<route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
|
||||
<route type="mix" sink="voip_tx"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
|
||||
<route type="mix" sink="mmap_no_irq_in"
|
||||
sources="Built-In Mic,USB Device In,USB Headset In"/>
|
||||
</routes>
|
||||
</module>
|
||||
<!-- A2dp Audio HAL -->
|
||||
|
|
|
@ -689,6 +689,15 @@
|
|||
<ctl name="Incall Capture Stream2" value="UL_DL"/>
|
||||
</path>
|
||||
|
||||
<path name="mmap-recordC">
|
||||
<ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1"/>
|
||||
</path>
|
||||
|
||||
<path name="mmap-recordC usb-headset-mic">
|
||||
<ctl name="Audio Capture Mic Source" value="USB_MIC"/>
|
||||
<ctl name="EP2 TX Mixer USB_TX" value="1"/>
|
||||
</path>
|
||||
|
||||
<!-- codec setting -->>
|
||||
<!-- Rx device -->
|
||||
<path name="handset">
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Raven/Oriole specific init.rc
|
||||
|
||||
on init && property:ro.build.flavor=factory_${ro.hardware}-userdebug
|
||||
on init && property:ro.vendor.factory=1
|
||||
import /vendor/etc/init/hw/init.factory.rc
|
||||
|
||||
on early-boot
|
||||
|
|
|
@ -181,7 +181,7 @@
|
|||
<item name="wifi.controller.rx">98</item>
|
||||
<!-- Tx current for wifi radio in mA-->
|
||||
<item name="wifi.controller.tx">470</item>
|
||||
<!-- Operating volatage for wifi radio in mV.-->
|
||||
<!-- Operating voltage for wifi radio in mV.-->
|
||||
<item name="wifi.controller.voltage">3700</item>
|
||||
</device>
|
||||
|
||||
|
|
|
@ -181,7 +181,7 @@
|
|||
<item name="wifi.controller.rx">98</item>
|
||||
<!-- Tx current for wifi radio in mA-->
|
||||
<item name="wifi.controller.tx">470</item>
|
||||
<!-- Operating volatage for wifi radio in mV.-->
|
||||
<!-- Operating voltage for wifi radio in mV.-->
|
||||
<item name="wifi.controller.voltage">3700</item>
|
||||
</device>
|
||||
|
||||
|
|
|
@ -177,7 +177,7 @@
|
|||
<item name="wifi.controller.rx">118</item>
|
||||
<!-- Tx current for wifi radio in mA-->
|
||||
<item name="wifi.controller.tx">331</item>
|
||||
<!-- Operating volatage for wifi radio in mV.-->
|
||||
<!-- Operating voltage for wifi radio in mV.-->
|
||||
<item name="wifi.controller.voltage">3700</item>
|
||||
</device>
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue