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

Commit 014c8bc3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Bluetooth le_audio_output: use dynamic format" into tm-dev am: 3328404b 

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



Change-Id: Iae813a2b6e0f06649b314abc644660a63eacce6f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 226cddb4 3328404b

services/audiopolicy/config/bluetooth_with_le_audio_policy_configuration.xml

+1 −11
Original line number Original line Diff line number Diff line
@@ -11,17 +11,7 @@ 
                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

        </mixPort>

        </mixPort>

        <!-- Le Audio Audio Ports -->

        <!-- Le Audio Audio Ports -->

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

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

        <mixPort name="le audio input" role="sink">

        <mixPort name="le audio input" role="sink">

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

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

services/audiopolicy/config/bluetooth_with_le_audio_policy_configuration_7_0.xml

+1 −11
Original line number Original line Diff line number Diff line
@@ -11,17 +11,7 @@ 
                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

        </mixPort>

        </mixPort>

        <!-- Le Audio Audio Ports -->

        <!-- Le Audio Audio Ports -->

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

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

        <mixPort name="le audio input" role="sink">

        <mixPort name="le audio input" role="sink">

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                     samplingRates="8000 16000 24000 32000 44100 48000"

                     samplingRates="8000 16000 24000 32000 44100 48000"