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

Commit 840f8a13 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:...

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

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



Change-Id: Idc850845aacfb11175653c541b362ccc121a45a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6887de0d 2dbe151b
Loading
Loading
Loading
Loading
+1 −11
Original line number Diff line number Diff line
@@ -11,17 +11,7 @@
                     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>
        <mixPort name="le audio output" role="source"/>
        <mixPort name="le audio input" role="sink">
            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                     samplingRates="8000,16000,24000,32000,44100,48000"
+1 −11
Original line number Diff line number Diff line
@@ -11,17 +11,7 @@
                     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>
        <mixPort name="le audio output" role="source" />
        <mixPort name="le audio input" role="sink">
            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                     samplingRates="8000 16000 24000 32000 44100 48000"