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

Commit 4e464707 authored by Aniket Kumar Lata's avatar Aniket Kumar Lata Committed by Eric Laurent
Browse files

audiopolicy: Add support for hybrid mode on A2DP 

Add support in AudioPolicyManager to select a module,
device or output based on device type and codec.
Implement hybrid mode with A2DP which enables runtime
switching between HALs for A2DP based on offload support
for specific A2DP codecs.
Optimize A2DP active device change and device config
change in AudioPolicyManager.

Bug: 111812273
Test: make
Change-Id: I246d71dd08bacbca6ed9b0012e7d7698bd8a0953
parent fa66483a

media/libaudioclient/AudioSystem.cpp

+6 −4
Original line number Diff line number Diff line
@@ -784,7 +784,8 @@ const sp<IAudioPolicyService> AudioSystem::get_audio_policy_service() 
status_t AudioSystem::setDeviceConnectionState(audio_devices_t device,

                                               audio_policy_dev_state_t state,

                                               const char *device_address,

                                               const char *device_name)

                                               const char *device_name,

                                               audio_format_t encodedFormat)

{

    const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();

    const char *address = "";
@@ -798,7 +799,7 @@ status_t AudioSystem::setDeviceConnectionState(audio_devices_t device, 
    if (device_name != NULL) {

        name = device_name;

    }

    return aps->setDeviceConnectionState(device, state, address, name);

    return aps->setDeviceConnectionState(device, state, address, name, encodedFormat);

}



audio_policy_dev_state_t AudioSystem::getDeviceConnectionState(audio_devices_t device,
@@ -812,7 +813,8 @@ audio_policy_dev_state_t AudioSystem::getDeviceConnectionState(audio_devices_t d 


status_t AudioSystem::handleDeviceConfigChange(audio_devices_t device,

                                               const char *device_address,

                                               const char *device_name)

                                               const char *device_name,

                                               audio_format_t encodedFormat)

{

    const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();

    const char *address = "";
@@ -826,7 +828,7 @@ status_t AudioSystem::handleDeviceConfigChange(audio_devices_t device, 
    if (device_name != NULL) {

        name = device_name;

    }

    return aps->handleDeviceConfigChange(device, address, name);

    return aps->handleDeviceConfigChange(device, address, name, encodedFormat);

}



status_t AudioSystem::setPhoneState(audio_mode_t state)

media/libaudioclient/IAudioPolicyService.cpp

+13 −4
Original line number Diff line number Diff line
@@ -108,7 +108,8 @@ public: 
                                    audio_devices_t device,

                                    audio_policy_dev_state_t state,

                                    const char *device_address,

                                    const char *device_name)

                                    const char *device_name,

                                    audio_format_t encodedFormat)

    {

        Parcel data, reply;

        data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor());
@@ -116,6 +117,7 @@ public: 
        data.writeInt32(static_cast <uint32_t>(state));

        data.writeCString(device_address);

        data.writeCString(device_name);

        data.writeInt32(static_cast <uint32_t>(encodedFormat));

        remote()->transact(SET_DEVICE_CONNECTION_STATE, data, &reply);

        return static_cast <status_t> (reply.readInt32());

    }
@@ -134,13 +136,15 @@ public: 


    virtual status_t handleDeviceConfigChange(audio_devices_t device,

                                              const char *device_address,

                                              const char *device_name)

                                              const char *device_name,

                                              audio_format_t encodedFormat)

    {

        Parcel data, reply;

        data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor());

        data.writeInt32(static_cast <uint32_t>(device));

        data.writeCString(device_address);

        data.writeCString(device_name);

        data.writeInt32(static_cast <uint32_t>(encodedFormat));

        remote()->transact(HANDLE_DEVICE_CONFIG_CHANGE, data, &reply);

        return static_cast <status_t> (reply.readInt32());

    }
@@ -1121,6 +1125,7 @@ status_t BnAudioPolicyService::onTransact( 
                    static_cast <audio_policy_dev_state_t>(data.readInt32());

            const char *device_address = data.readCString();

            const char *device_name = data.readCString();

            audio_format_t codecFormat = static_cast <audio_format_t>(data.readInt32());

            if (device_address == nullptr || device_name == nullptr) {

                ALOGE("Bad Binder transaction: SET_DEVICE_CONNECTION_STATE for device %u", device);

                reply->writeInt32(static_cast<int32_t> (BAD_VALUE));
@@ -1128,7 +1133,8 @@ status_t BnAudioPolicyService::onTransact( 
                reply->writeInt32(static_cast<uint32_t> (setDeviceConnectionState(device,

                                                                                  state,

                                                                                  device_address,

                                                                                  device_name)));

                                                                                  device_name,

                                                                                  codecFormat)));

            }

            return NO_ERROR;

        } break;
@@ -1154,13 +1160,16 @@ status_t BnAudioPolicyService::onTransact( 
                    static_cast <audio_devices_t>(data.readInt32());

            const char *device_address = data.readCString();

            const char *device_name = data.readCString();

            audio_format_t codecFormat =

                    static_cast <audio_format_t>(data.readInt32());

            if (device_address == nullptr || device_name == nullptr) {

                ALOGE("Bad Binder transaction: HANDLE_DEVICE_CONFIG_CHANGE for device %u", device);

                reply->writeInt32(static_cast<int32_t> (BAD_VALUE));

            } else {

                reply->writeInt32(static_cast<uint32_t> (handleDeviceConfigChange(device,

                                                                                  device_address,

                                                                                  device_name)));

                                                                                  device_name,

                                                                                  codecFormat)));

            }

            return NO_ERROR;

        } break;

media/libaudioclient/include/media/AudioSystem.h

+4 −2
Original line number Diff line number Diff line
@@ -209,12 +209,14 @@ public: 
    // IAudioPolicyService interface (see AudioPolicyInterface for method descriptions)

    //

    static status_t setDeviceConnectionState(audio_devices_t device, audio_policy_dev_state_t state,

                                             const char *device_address, const char *device_name);

                                             const char *device_address, const char *device_name,

                                             audio_format_t encodedFormat);

    static audio_policy_dev_state_t getDeviceConnectionState(audio_devices_t device,

                                                                const char *device_address);

    static status_t handleDeviceConfigChange(audio_devices_t device,

                                             const char *device_address,

                                             const char *device_name);

                                             const char *device_name,

                                             audio_format_t encodedFormat);

    static status_t setPhoneState(audio_mode_t state);

    static status_t setForceUse(audio_policy_force_use_t usage, audio_policy_forced_cfg_t config);

    static audio_policy_forced_cfg_t getForceUse(audio_policy_force_use_t usage);

media/libaudioclient/include/media/IAudioPolicyService.h

+4 −2
Original line number Diff line number Diff line
@@ -44,12 +44,14 @@ public: 
    virtual status_t setDeviceConnectionState(audio_devices_t device,

                                              audio_policy_dev_state_t state,

                                              const char *device_address,

                                              const char *device_name) = 0;

                                              const char *device_name,

                                              audio_format_t encodedFormat) = 0;

    virtual audio_policy_dev_state_t getDeviceConnectionState(audio_devices_t device,

                                                                  const char *device_address) = 0;

    virtual status_t handleDeviceConfigChange(audio_devices_t device,

                                              const char *device_address,

                                              const char *device_name) = 0;

                                              const char *device_name,

                                              audio_format_t encodedFormat) = 0;

    virtual status_t setPhoneState(audio_mode_t state) = 0;

    virtual status_t setForceUse(audio_policy_force_use_t usage,

                                    audio_policy_forced_cfg_t config) = 0;

services/audiopolicy/AudioPolicyInterface.h

+4 −2
Original line number Diff line number Diff line
@@ -75,14 +75,16 @@ public: 
    virtual status_t setDeviceConnectionState(audio_devices_t device,

                                              audio_policy_dev_state_t state,

                                              const char *device_address,

                                              const char *device_name) = 0;

                                              const char *device_name,

                                              audio_format_t encodedFormat) = 0;

    // retrieve a device connection status

    virtual audio_policy_dev_state_t getDeviceConnectionState(audio_devices_t device,

                                                                          const char *device_address) = 0;

    // indicate a change in device configuration

    virtual status_t handleDeviceConfigChange(audio_devices_t device,

                                              const char *device_address,

                                              const char *device_name) = 0;

                                              const char *device_name,

                                              audio_format_t encodedFormat) = 0;

    // indicate a change in phone state. Valid phones states are defined by audio_mode_t

    virtual void setPhoneState(audio_mode_t state) = 0;

    // force using a specific device category for the specified usage