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

Commit e498155b authored by Patty's avatar Patty
Browse files

Parse audio config codec capability for LE devices 

 1. Rename function getHwOffloadEncodingFormatsSupportedForA2DP to
    getHwOffloadFormatsSupportedForBluetoothMedia
 2. Add one parameter for function
    getHwOffloadFormatsSupportedForBluetoothMedia to get the
    supported codec for A2DP encode/decode or LE audio encode/decode
 3. Add function getAudioDeviceOutAllBleSet() to get the audio device
    set for BLE

Tag: #feature
Bug: 203535499
Bug: 150670922
Test: atest BluetoothInstrumentationTests
Change-Id: I9de90c7f61db1f5de848ac66cfc8bd99d27d6cfb
Merged-In: I9de90c7f61db1f5de848ac66cfc8bd99d27d6cfb
parent 6100fd64

media/libaudioclient/AudioSystem.cpp

+5 −3
Original line number Diff line number Diff line
@@ -1960,8 +1960,8 @@ bool AudioSystem::isHapticPlaybackSupported() { 
    return result.value_or(false);

}



status_t AudioSystem::getHwOffloadEncodingFormatsSupportedForA2DP(

        std::vector<audio_format_t>* formats) {

status_t AudioSystem::getHwOffloadFormatsSupportedForBluetoothMedia(

        audio_devices_t device, std::vector<audio_format_t>* formats) {

    if (formats == nullptr) {

        return BAD_VALUE;

    }
@@ -1971,8 +1971,10 @@ status_t AudioSystem::getHwOffloadEncodingFormatsSupportedForA2DP( 
    if (aps == 0) return PERMISSION_DENIED;



    std::vector<media::audio::common::AudioFormat> formatsAidl;

    int32_t deviceAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_devices_t_int32_t(device));



    RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(

            aps->getHwOffloadEncodingFormatsSupportedForA2DP(&formatsAidl)));

            aps->getHwOffloadFormatsSupportedForBluetoothMedia(deviceAidl, &formatsAidl)));

    *formats = VALUE_OR_RETURN_STATUS(

            convertContainer<std::vector<audio_format_t>>(formatsAidl,

                                                          aidl2legacy_AudioFormat_audio_format_t));

media/libaudioclient/aidl/android/media/IAudioPolicyService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ interface IAudioPolicyService { 
    void getReportedSurroundFormats(inout Int count,

                                    out AudioFormat[] formats);



    AudioFormat[] getHwOffloadEncodingFormatsSupportedForA2DP();

    AudioFormat[] getHwOffloadFormatsSupportedForBluetoothMedia(int /* audio_devices_t */ device);



    void setSurroundFormatEnabled(AudioFormat audioFormat, boolean enabled);

media/libaudioclient/include/media/AudioSystem.h

+2 −2
Original line number Diff line number Diff line
@@ -415,8 +415,8 @@ public: 


    static status_t getMicrophones(std::vector<media::MicrophoneInfo> *microphones);



    static status_t getHwOffloadEncodingFormatsSupportedForA2DP(

                                    std::vector<audio_format_t> *formats);

    static status_t getHwOffloadFormatsSupportedForBluetoothMedia(

                                    audio_devices_t device, std::vector<audio_format_t> *formats);



    // numSurroundFormats holds the maximum number of formats and bool value allowed in the array.

    // When numSurroundFormats is 0, surroundFormats and surroundFormatsEnabled will not be

media/libaudiofoundation/AudioContainers.cpp

+7 −0
Original line number Diff line number Diff line
@@ -63,6 +63,13 @@ const DeviceTypeSet& getAudioDeviceInAllUsbSet() { 
    return audioDeviceInAllUsbSet;

}



const DeviceTypeSet& getAudioDeviceOutAllBleSet() {

    static const DeviceTypeSet audioDeviceOutAllBleSet = DeviceTypeSet(

            std::begin(AUDIO_DEVICE_OUT_ALL_BLE_ARRAY),

            std::end(AUDIO_DEVICE_OUT_ALL_BLE_ARRAY));

    return audioDeviceOutAllBleSet;

}



bool deviceTypesToString(const DeviceTypeSet &deviceTypes, std::string &str) {

    if (deviceTypes.empty()) {

        str = "Empty device types";

media/libaudiofoundation/include/media/AudioContainers.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ const DeviceTypeSet& getAudioDeviceOutAllScoSet(); 
const DeviceTypeSet& getAudioDeviceOutAllUsbSet();

const DeviceTypeSet& getAudioDeviceInAllSet();

const DeviceTypeSet& getAudioDeviceInAllUsbSet();

const DeviceTypeSet& getAudioDeviceOutAllBleSet();



template<typename T>

static std::vector<T> Intersection(const std::set<T>& a, const std::set<T>& b) {