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

Commit a492bbee authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge "Update BT audio policy configuration" am: 210105af am: b6388913 am: 505f0a49 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifdde9be5d3ba9a5b8f465634f071ed2fe18f4496
parents 9b9fd940 505f0a49

services/audiopolicy/config/bluetooth_audio_policy_configuration.xml

+11 −1
Original line number Diff line number Diff line
@@ -12,7 +12,13 @@ 
        </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"

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                     channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

            <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"

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

                     channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

            <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"

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

                     channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

        </mixPort>
@@ -37,6 +43,10 @@ 
        <!-- Hearing AIDs Audio Ports -->

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

        <!-- BLE Audio Ports -->

        <!-- Note that these device types are not valid in HAL versions < 7. Any device

             running pre-V7 HAL and using this file will not pass VTS. Need to use

             bluetooth_audio_policy_configuration_7_0.xml instead.

        -->

        <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>

services/audiopolicy/config/bluetooth_audio_policy_configuration_7_0.xml

+19 −0
Original line number Diff line number Diff line
@@ -10,6 +10,18 @@ 
                     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"

                     samplingRates="8000 16000 24000 32000 44100 48000"

                     channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO"/>

            <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"

                     samplingRates="8000 16000 24000 32000 44100 48000"

                     channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO"/>

            <profile name="" format="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 +42,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 +55,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>