Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcd8ed0d authored by Manu Suresh's avatar Manu Suresh
Browse files

Merge branch '1549-a15-FP6' into 'v3.2-a15' 

FP6: Address USB-C audio playback and recording not working during calls

See merge request e/devices/android_device_fairphone_FP6!13
parents 0f89bd17 ecb006ac

configs/audio/sku_volcano_qssi/audio_policy_configuration_fps.xml

+55 −6
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ SPDX-License-Identifier: BSD-3-Clause-Clear 
                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="hifi_playback" role="source" />

                <mixPort name="spatial output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@@ -220,6 +221,17 @@ SPDX-License-Identifier: BSD-3-Clause-Clear 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000 16000 32000 48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>

                </mixPort>

                <mixPort name="usb_surround_sound" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 88200 96000 176400 192000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK AUDIO_CHANNEL_INDEX_MASK_3 AUDIO_CHANNEL_INDEX_MASK_4 AUDIO_CHANNEL_IN_5POINT1 AUDIO_CHANNEL_INDEX_MASK_6 AUDIO_CHANNEL_INDEX_MASK_8"/>

                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"

                             samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 88200 96000 176400 192000"

                             channelMasks="AUDIO_CHANNEL_IN_5POINT1 AUDIO_CHANNEL_INDEX_MASK_6 AUDIO_CHANNEL_INDEX_MASK_8"/>

                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"

                             samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 88200 96000 176400 192000"

                             channelMasks="AUDIO_CHANNEL_IN_5POINT1 AUDIO_CHANNEL_INDEX_MASK_6 AUDIO_CHANNEL_INDEX_MASK_8"/>

                </mixPort>

                <mixPort name="record_24" role="sink" maxOpenCount="2" maxActiveCount="2">

                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"

                             samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 96000 192000"
@@ -247,6 +259,7 @@ SPDX-License-Identifier: BSD-3-Clause-Clear 
                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK AUDIO_CHANNEL_INDEX_MASK_3"/>



                </mixPort>

                <mixPort name="hifi_input" role="sink" />

            </mixPorts>



            <devicePorts>
@@ -332,6 +345,14 @@ SPDX-License-Identifier: BSD-3-Clause-Clear 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000 16000 32000 48000" channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO"/>

                </devicePort>

                <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100 48000 64000 88200 96000 128000 176400 192000"/>

                </devicePort>

                <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100 48000 64000 88200 96000 128000 176400 192000"/>

                </devicePort>



                <!-- Input devices declaration, i.e. Source DEVICE PORT -->

                <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
@@ -379,6 +400,10 @@ SPDX-License-Identifier: BSD-3-Clause-Clear 
                              stepValueMB="100"/>

                    </gains>

                </devicePort>

                <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">

                </devicePort>

                <devicePort tagName="USB Headset In" type="AUDIO_DEVICE_IN_USB_HEADSET" role="source">

                </devicePort>

		<devicePort tagName="A2DP In" type="AUDIO_DEVICE_IN_BLUETOOTH_A2DP" role="source">

                   <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                            samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
@@ -428,6 +453,10 @@ SPDX-License-Identifier: BSD-3-Clause-Clear 
                       sources="primary output,raw,mmap_no_irq_out,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output,spatial output,Telephony Rx"/>

                <route type="mix" sink="BT SCO Car Kit"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output,spatial output,Telephony Rx"/>

                <route type="mix" sink="USB Device Out"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,hifi_playback,haptics output,Telephony Rx"/>

                <route type="mix" sink="USB Headset Out"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,hifi_playback,haptics output,Telephony Rx"/>

                <route type="mix" sink="Telephony Tx"

                       sources="voice_tx,incall_music_uplink"/>

                <route type="mix" sink="voice_rx"
@@ -435,17 +464,19 @@ SPDX-License-Identifier: BSD-3-Clause-Clear 
                <route type="mix" sink="primary input"

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx,A2DP In,Echo Reference,BLE In,Proxy In,IP In"/>

                <route type="mix" sink="compress-input"

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,BLE In,Proxy In,IP In"/>

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,BLE In,Proxy In,IP In"/>

                <route type="mix" sink="usb_surround_sound"

                       sources="USB Device In,USB Headset In"/>

                <route type="mix" sink="fast input"

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,Proxy In,IP In"/>

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Proxy In,IP In"/>

                <route type="mix" sink="quad mic"

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic"/>

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/>

                <route type="mix" sink="voip_tx"

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,BLE In"/>

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,BLE In"/>

                <route type="mix" sink="record_24"

                       sources="Built-In Mic,Built-In Back Mic,A2DP In,BLE In"/>

                <route type="mix" sink="mmap_no_irq_in"

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic"/>

                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/>

                <route type="mix" sink="BT A2DP Out"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,haptics output,spatial output"/>

                <route type="mix" sink="BT A2DP Headphones"
@@ -456,6 +487,7 @@ SPDX-License-Identifier: BSD-3-Clause-Clear 
                       sources="primary output,raw,mmap_no_irq_out,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output"/>

                <route type="mix" sink="BT BLE Broadcast"

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload"/>

                <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />

            </routes>



        </module>
@@ -483,7 +515,24 @@ SPDX-License-Identifier: BSD-3-Clause-Clear 
        </module> -->



        <!-- Usb Audio HAL -->

        <xi:include href="/vendor/etc/usbv2_audio_policy_configuration.xml"/>

        <module name="usbv2" halVersion="2.0">

            <mixPorts>

                <mixPort name="usb_accessory output" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

            </mixPorts>

            <devicePorts>

                <devicePort tagName="USB Host Out" type="AUDIO_DEVICE_OUT_USB_ACCESSORY" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </devicePort>

            </devicePorts>

            <routes>

                <route type="mix" sink="USB Host Out"

                       sources="usb_accessory output"/>

            </routes>

        </module>



        <!-- Remote Submix Audio HAL -->

        <xi:include href="/vendor/etc/r_submix_audio_policy_configuration.xml"/>

configs/audio/usbv2_audio_policy_configuration.xml

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!-- Copyright (C) 2015 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<!-- USB Audio HAL Audio Policy Configuration file -->



<module name="usbv2" halVersion="2.0">

    <mixPorts>

        <mixPort name="usb_accessory output" role="source">

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                     samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

        </mixPort>

        <mixPort name="usb_device output" role="source"/>

        <mixPort name="usb_device input" role="sink"/>

    </mixPorts>

    <devicePorts>

        <devicePort tagName="USB Host Out" type="AUDIO_DEVICE_OUT_USB_ACCESSORY" role="sink">

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                     samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

        </devicePort>

        <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink"/>

        <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink"/>

        <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source"/>

        <devicePort tagName="USB Headset In" type="AUDIO_DEVICE_IN_USB_HEADSET" role="source"/>

    </devicePorts>

    <routes>

        <route type="mix" sink="USB Host Out"

               sources="usb_accessory output"/>

        <route type="mix" sink="USB Device Out"

               sources="usb_device output"/>

        <route type="mix" sink="USB Headset Out"

               sources="usb_device output"/>

        <route type="mix" sink="usb_device input"

               sources="USB Device In,USB Headset In"/>

    </routes>

</module>

device.mk

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ PRODUCT_COPY_FILES += \ 
    $(LOCAL_PATH)/configs/audio/sku_volcano/resourcemanager_volcano_mtp_fps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_volcano/resourcemanager_volcano_mtp_fps.xml \

    $(LOCAL_PATH)/configs/audio/sku_volcano_qssi/audio_policy_configuration_fps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_volcano_qssi/audio_policy_configuration.xml \

    $(LOCAL_PATH)/configs/audio/sku_volcano_qssi/audio_policy_configuration_fps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_volcano/audio_policy_configuration.xml \

    $(LOCAL_PATH)/configs/audio/usbv2_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usbv2_audio_policy_configuration.xml



PRODUCT_COPY_FILES += \

    frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml \