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

Commit c30aabdc authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Gerrit Code Review
Browse files

Merge changes I7b0f41cb,I1980f890 

* changes:
  le_audio: Correct typo for BLE headset output communication device
  le_audio: Upgrade Bluetooth audio policy for BLE Headset In
parents 0cbbad64 86dcd078

services/audiopolicy/config/bluetooth_audio_policy_configuration.xml

+14 −0
Original line number Diff line number Diff line
@@ -22,6 +22,17 @@ 
                     samplingRates="8000,16000,24000,32000,44100,48000"

                     channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

        </mixPort>

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

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

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

                     channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>

            <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"

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

                     channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>

            <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"

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

                     channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>

        </mixPort>

    </mixPorts>

    <devicePorts>

        <!-- A2DP Audio Ports -->
@@ -49,6 +60,7 @@ 
        -->

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

        <devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/>

    </devicePorts>

    <routes>

        <route type="mix" sink="BT A2DP Out"
@@ -61,6 +73,8 @@ 
               sources="hearing aid output"/>

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

               sources="le audio output"/>

        <route type="mix" sink="le audio input"

               sources="BLE Headset In"/>

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

               sources="le audio output"/>

    </routes>

services/audiopolicy/config/le_audio_policy_configuration.xml

+7 −0
Original line number Diff line number Diff line
@@ -7,13 +7,20 @@ 
                     samplingRates="8000,16000,24000,32000,44100,48000"

                     channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

        </mixPort>

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

            <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_IN_MONO,AUDIO_CHANNEL_IN_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"/>

        <devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/>

    </devicePorts>

    <routes>

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

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

        <route type="mix" sink="le audio input" sources="BLE Headset In"/>

    </routes>

</module>

services/audiopolicy/enginedefault/src/Engine.cpp

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ sp<DeviceDescriptor> Engine::getDeviceForInputSource(audio_source_t inputSource) 
        switch (commDeviceType) {

        case AUDIO_DEVICE_OUT_BLE_HEADSET:

            device = availableDevices.getDevice(

                    AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET, String8(""), AUDIO_FORMAT_DEFAULT);

                    AUDIO_DEVICE_IN_BLE_HEADSET, String8(""), AUDIO_FORMAT_DEFAULT);

            break;

        case AUDIO_DEVICE_OUT_SPEAKER:

            device = availableDevices.getFirstExistingDevice({