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

Commit 607980a2 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Automerger Merge Worker
Browse files

Merge "Add Bluetooth LE Audio policy configuration" am: cbeee874 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1535002

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30c7e23773a6622ea4b6ed3c0bf99191c11221c6
parents a617c8aa cbeee874

services/audiopolicy/config/audio_policy_configuration_bluetooth_legacy_hal.xml

+3 −0
Original line number Diff line number Diff line
@@ -185,6 +185,9 @@ 
        <!-- Hearing aid Audio HAL -->

        <xi:include href="hearing_aid_audio_policy_configuration.xml"/>



        <!-- Le Audio Audio HAL -->

        <xi:include href="le_audio_policy_configuration.xml"/>



        <!-- MSD Audio HAL (optional) -->

        <xi:include href="msd_audio_policy_configuration.xml"/>

services/audiopolicy/config/bluetooth_audio_policy_configuration.xml

+13 −0
Original line number Diff line number Diff line
@@ -10,6 +10,12 @@ 
                     samplingRates="24000,16000"

                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

        </mixPort>

        <!-- Le Audio Audio Ports -->

        <mixPort name="le audio output" role="source">

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT,AUDIO_FORMAT_PCM_24_BIT,AUDIO_FORMAT_PCM_32_BIT"

                     samplingRates="8000,16000,24000,32000,44100,48000"

                     channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

        </mixPort>

    </mixPorts>

    <devicePorts>

        <!-- A2DP Audio Ports -->
@@ -30,6 +36,9 @@ 
        </devicePort>

        <!-- Hearing AIDs Audio Ports -->

        <devicePort tagName="BT Hearing Aid Out" type="AUDIO_DEVICE_OUT_HEARING_AID" role="sink"/>

        <!-- BLE Audio Ports -->

        <devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/>

        <devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/>

    </devicePorts>

    <routes>

        <route type="mix" sink="BT A2DP Out"
@@ -40,5 +49,9 @@ 
               sources="a2dp output"/>

        <route type="mix" sink="BT Hearing Aid Out"

               sources="hearing aid output"/>

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

               sources="le audio output"/>

        <route type="mix" sink="BLE Speaker Out"

               sources="le audio output"/>

    </routes>

</module>

services/audiopolicy/config/le_audio_policy_configuration.xml

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

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

<module name="bluetooth" halVersion="2.1">

    <mixPorts>

        <mixPort name="le audio output" role="source">

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT,AUDIO_FORMAT_PCM_24_BIT,AUDIO_FORMAT_PCM_32_BIT"

                     samplingRates="8000,16000,24000,32000,44100,48000"

                     channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

        </mixPort>

    </mixPorts>

    <devicePorts>

        <devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/>

        <devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/>

    </devicePorts>

    <routes>

        <route type="mix" sink="BLE Headset Out" sources="le audio output"/>

        <route type="mix" sink="BLE Speaker Out" sources="le audio output"/>

    </routes>

</module>