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

Commit a73556cb authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Gerrit Code Review
Browse files

Merge changes from topic "CAP_AIDL_AUDIO_HAL" into main 

* changes:
  Configurable Audio Policy: migrate settings to AudioAIDL
  Migrate forced config and force use to android.media.audio.common.types
parents 3dc64d70 ad3dce95

media/audioaidlconversion/AidlConversionCppNdk.cpp

+134 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ using media::audio::common::AudioMode; 
using media::audio::common::AudioOffloadInfo;

using media::audio::common::AudioOutputFlags;

using media::audio::common::AudioPlaybackRate;

using media::audio::common::AudioPolicyForcedConfig;

using media::audio::common::AudioPolicyForceUse;

using media::audio::common::AudioPort;

using media::audio::common::AudioPortConfig;

using media::audio::common::AudioPortDeviceExt;
@@ -3317,6 +3319,138 @@ legacy2aidl_audio_microphone_characteristic_t_MicrophoneInfos( 
    return OK;

}



ConversionResult<audio_policy_force_use_t>

aidl2legacy_AudioPolicyForceUse_audio_policy_force_use_t(AudioPolicyForceUse aidl) {

    switch (aidl) {

        case AudioPolicyForceUse::COMMUNICATION:

            return AUDIO_POLICY_FORCE_FOR_COMMUNICATION;

        case AudioPolicyForceUse::MEDIA:

            return AUDIO_POLICY_FORCE_FOR_MEDIA;

        case AudioPolicyForceUse::RECORD:

            return AUDIO_POLICY_FORCE_FOR_RECORD;

        case AudioPolicyForceUse::DOCK:

            return AUDIO_POLICY_FORCE_FOR_DOCK;

        case AudioPolicyForceUse::SYSTEM:

            return AUDIO_POLICY_FORCE_FOR_SYSTEM;

        case AudioPolicyForceUse::HDMI_SYSTEM_AUDIO:

            return AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO;

        case AudioPolicyForceUse::ENCODED_SURROUND:

            return AUDIO_POLICY_FORCE_FOR_ENCODED_SURROUND;

        case AudioPolicyForceUse::VIBRATE_RINGING:

            return AUDIO_POLICY_FORCE_FOR_VIBRATE_RINGING;

    }

    return unexpected(BAD_VALUE);

}



ConversionResult<AudioPolicyForceUse>

legacy2aidl_audio_policy_force_use_t_AudioPolicyForceUse(audio_policy_force_use_t legacy) {

    switch (legacy) {

        case AUDIO_POLICY_FORCE_FOR_COMMUNICATION:

            return AudioPolicyForceUse::COMMUNICATION;

        case AUDIO_POLICY_FORCE_FOR_MEDIA:

            return AudioPolicyForceUse::MEDIA;

        case AUDIO_POLICY_FORCE_FOR_RECORD:

            return AudioPolicyForceUse::RECORD;

        case AUDIO_POLICY_FORCE_FOR_DOCK:

            return AudioPolicyForceUse::DOCK;

        case AUDIO_POLICY_FORCE_FOR_SYSTEM:

            return AudioPolicyForceUse::SYSTEM;

        case AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO:

            return AudioPolicyForceUse::HDMI_SYSTEM_AUDIO;

        case AUDIO_POLICY_FORCE_FOR_ENCODED_SURROUND:

            return AudioPolicyForceUse::ENCODED_SURROUND;

        case AUDIO_POLICY_FORCE_FOR_VIBRATE_RINGING:

            return AudioPolicyForceUse::VIBRATE_RINGING;

        case AUDIO_POLICY_FORCE_USE_CNT:

            break;

    }

    return unexpected(BAD_VALUE);

}



ConversionResult<audio_policy_forced_cfg_t>

aidl2legacy_AudioPolicyForcedConfig_audio_policy_forced_cfg_t(AudioPolicyForcedConfig aidl) {

    switch (aidl) {

        case AudioPolicyForcedConfig::NONE:

            return AUDIO_POLICY_FORCE_NONE;

        case AudioPolicyForcedConfig::SPEAKER:

            return AUDIO_POLICY_FORCE_SPEAKER;

        case AudioPolicyForcedConfig::HEADPHONES:

            return AUDIO_POLICY_FORCE_HEADPHONES;

        case AudioPolicyForcedConfig::BT_SCO:

            return AUDIO_POLICY_FORCE_BT_SCO;

        case AudioPolicyForcedConfig::BT_A2DP:

            return AUDIO_POLICY_FORCE_BT_A2DP;

        case AudioPolicyForcedConfig::WIRED_ACCESSORY:

            return AUDIO_POLICY_FORCE_WIRED_ACCESSORY;

        case AudioPolicyForcedConfig::BT_CAR_DOCK:

            return AUDIO_POLICY_FORCE_BT_CAR_DOCK;

        case AudioPolicyForcedConfig::BT_DESK_DOCK:

            return AUDIO_POLICY_FORCE_BT_DESK_DOCK;

        case AudioPolicyForcedConfig::ANALOG_DOCK:

            return AUDIO_POLICY_FORCE_ANALOG_DOCK;

        case AudioPolicyForcedConfig::DIGITAL_DOCK:

            return AUDIO_POLICY_FORCE_DIGITAL_DOCK;

        case AudioPolicyForcedConfig::NO_BT_A2DP:

            return AUDIO_POLICY_FORCE_NO_BT_A2DP;

        case AudioPolicyForcedConfig::SYSTEM_ENFORCED:

            return AUDIO_POLICY_FORCE_SYSTEM_ENFORCED;

        case AudioPolicyForcedConfig::HDMI_SYSTEM_AUDIO_ENFORCED:

            return AUDIO_POLICY_FORCE_HDMI_SYSTEM_AUDIO_ENFORCED;

        case AudioPolicyForcedConfig::ENCODED_SURROUND_NEVER:

            return AUDIO_POLICY_FORCE_ENCODED_SURROUND_NEVER;

        case AudioPolicyForcedConfig::ENCODED_SURROUND_ALWAYS:

            return AUDIO_POLICY_FORCE_ENCODED_SURROUND_ALWAYS;

        case AudioPolicyForcedConfig::ENCODED_SURROUND_MANUAL:

            return AUDIO_POLICY_FORCE_ENCODED_SURROUND_MANUAL;

        case AudioPolicyForcedConfig::BT_BLE:

            return AUDIO_POLICY_FORCE_BT_BLE;

    }

    return unexpected(BAD_VALUE);

}



ConversionResult<AudioPolicyForcedConfig>

legacy2aidl_audio_policy_forced_cfg_t_AudioPolicyForcedConfig(audio_policy_forced_cfg_t legacy) {

    switch (legacy) {

        case AUDIO_POLICY_FORCE_NONE:

            return AudioPolicyForcedConfig::NONE;

        case AUDIO_POLICY_FORCE_SPEAKER:

            return AudioPolicyForcedConfig::SPEAKER;

        case AUDIO_POLICY_FORCE_HEADPHONES:

            return AudioPolicyForcedConfig::HEADPHONES;

        case AUDIO_POLICY_FORCE_BT_SCO:

            return AudioPolicyForcedConfig::BT_SCO;

        case AUDIO_POLICY_FORCE_BT_A2DP:

            return AudioPolicyForcedConfig::BT_A2DP;

        case AUDIO_POLICY_FORCE_WIRED_ACCESSORY:

            return AudioPolicyForcedConfig::WIRED_ACCESSORY;

        case AUDIO_POLICY_FORCE_BT_CAR_DOCK:

            return AudioPolicyForcedConfig::BT_CAR_DOCK;

        case AUDIO_POLICY_FORCE_BT_DESK_DOCK:

            return AudioPolicyForcedConfig::BT_DESK_DOCK;

        case AUDIO_POLICY_FORCE_ANALOG_DOCK:

            return AudioPolicyForcedConfig::ANALOG_DOCK;

        case AUDIO_POLICY_FORCE_DIGITAL_DOCK:

            return AudioPolicyForcedConfig::DIGITAL_DOCK;

        case AUDIO_POLICY_FORCE_NO_BT_A2DP:

            return AudioPolicyForcedConfig::NO_BT_A2DP;

        case AUDIO_POLICY_FORCE_SYSTEM_ENFORCED:

            return AudioPolicyForcedConfig::SYSTEM_ENFORCED;

        case AUDIO_POLICY_FORCE_HDMI_SYSTEM_AUDIO_ENFORCED:

            return AudioPolicyForcedConfig::HDMI_SYSTEM_AUDIO_ENFORCED;

        case AUDIO_POLICY_FORCE_ENCODED_SURROUND_NEVER:

            return AudioPolicyForcedConfig::ENCODED_SURROUND_NEVER;

        case AUDIO_POLICY_FORCE_ENCODED_SURROUND_ALWAYS:

            return AudioPolicyForcedConfig::ENCODED_SURROUND_ALWAYS;

        case AUDIO_POLICY_FORCE_ENCODED_SURROUND_MANUAL:

            return AudioPolicyForcedConfig::ENCODED_SURROUND_MANUAL;

        case AUDIO_POLICY_FORCE_BT_BLE:

            return AudioPolicyForcedConfig::BT_BLE;

        case AUDIO_POLICY_FORCE_CFG_CNT:

            break;

    }

    return unexpected(BAD_VALUE);

}



}  // namespace android



#undef GET_DEVICE_DESC_CONNECTION

media/audioaidlconversion/include/media/AidlConversionCppNdk-impl.h

+15 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ 
#include PREFIX(android/media/audio/common/AudioMode.h)

#include PREFIX(android/media/audio/common/AudioOffloadInfo.h)

#include PREFIX(android/media/audio/common/AudioOutputFlags.h)

#include PREFIX(android/media/audio/common/AudioPolicyForceUse.h)

#include PREFIX(android/media/audio/common/AudioPolicyForcedConfig.h)

#include PREFIX(android/media/audio/common/AudioPort.h)

#include PREFIX(android/media/audio/common/AudioPortConfig.h)

#include PREFIX(android/media/audio/common/AudioPortExt.h)
@@ -76,6 +78,7 @@ 


#include <system/audio.h>

#include <system/audio_effect.h>

#include <system/audio_policy.h>



#if defined(BACKEND_NDK_IMPL)

namespace aidl {
@@ -454,6 +457,18 @@ legacy2aidl_audio_microphone_characteristic_t_MicrophoneInfos( 
        media::audio::common::MicrophoneInfo* aidlInfo,

        media::audio::common::MicrophoneDynamicInfo* aidlDynamic);



ConversionResult<audio_policy_forced_cfg_t>

aidl2legacy_AudioPolicyForcedConfig_audio_policy_forced_cfg_t(

        media::audio::common::AudioPolicyForcedConfig aidl);

ConversionResult<media::audio::common::AudioPolicyForcedConfig>

legacy2aidl_audio_policy_forced_cfg_t_AudioPolicyForcedConfig(audio_policy_forced_cfg_t legacy);



ConversionResult<audio_policy_force_use_t>

aidl2legacy_AudioPolicyForceUse_audio_policy_force_use_t(

        media::audio::common::AudioPolicyForceUse aidl);

ConversionResult<media::audio::common::AudioPolicyForceUse>

legacy2aidl_audio_policy_force_use_t_AudioPolicyForceUse(audio_policy_force_use_t legacy);



}  // namespace android



#if defined(BACKEND_NDK_IMPL)

media/libaudioclient/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -355,8 +355,6 @@ aidl_interface { 
        "aidl/android/media/AudioMixerBehavior.aidl",

        "aidl/android/media/AudioOffloadMode.aidl",

        "aidl/android/media/AudioPolicyDeviceState.aidl",

        "aidl/android/media/AudioPolicyForceUse.aidl",

        "aidl/android/media/AudioPolicyForcedConfig.aidl",

        "aidl/android/media/AudioProductStrategy.aidl",

        "aidl/android/media/AudioVolumeGroup.aidl",

        "aidl/android/media/DeviceRole.aidl",

media/libaudioclient/AudioSystem.cpp

+4 −2
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ using media::audio::common::AudioFormatDescription; 
using media::audio::common::AudioMMapPolicyInfo;

using media::audio::common::AudioMMapPolicyType;

using media::audio::common::AudioOffloadInfo;

using media::audio::common::AudioPolicyForceUse;

using media::audio::common::AudioPolicyForcedConfig;

using media::audio::common::AudioSource;

using media::audio::common::AudioStreamType;

using media::audio::common::AudioUsage;
@@ -1059,9 +1061,9 @@ audio_policy_forced_cfg_t AudioSystem::getForceUse(audio_policy_force_use_t usag 
    if (aps == 0) return AUDIO_POLICY_FORCE_NONE;



    auto result = [&]() -> ConversionResult<audio_policy_forced_cfg_t> {

        media::AudioPolicyForceUse usageAidl = VALUE_OR_RETURN(

        AudioPolicyForceUse usageAidl = VALUE_OR_RETURN(

                legacy2aidl_audio_policy_force_use_t_AudioPolicyForceUse(usage));

        media::AudioPolicyForcedConfig configAidl;

        AudioPolicyForcedConfig configAidl;

        RETURN_IF_ERROR(statusTFromBinderStatus(

                aps->getForceUse(usageAidl, &configAidl)));

        return aidl2legacy_AudioPolicyForcedConfig_audio_policy_forced_cfg_t(configAidl);

media/libaudioclient/PolicyAidlConversion.cpp

+0 −132
Original line number Diff line number Diff line
@@ -294,138 +294,6 @@ legacy2aidl_audio_policy_dev_state_t_AudioPolicyDeviceState(audio_policy_dev_sta 
    return unexpected(BAD_VALUE);

}



ConversionResult<audio_policy_force_use_t>

aidl2legacy_AudioPolicyForceUse_audio_policy_force_use_t(media::AudioPolicyForceUse aidl) {

    switch (aidl) {

        case media::AudioPolicyForceUse::COMMUNICATION:

            return AUDIO_POLICY_FORCE_FOR_COMMUNICATION;

        case media::AudioPolicyForceUse::MEDIA:

            return AUDIO_POLICY_FORCE_FOR_MEDIA;

        case media::AudioPolicyForceUse::RECORD:

            return AUDIO_POLICY_FORCE_FOR_RECORD;

        case media::AudioPolicyForceUse::DOCK:

            return AUDIO_POLICY_FORCE_FOR_DOCK;

        case media::AudioPolicyForceUse::SYSTEM:

            return AUDIO_POLICY_FORCE_FOR_SYSTEM;

        case media::AudioPolicyForceUse::HDMI_SYSTEM_AUDIO:

            return AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO;

        case media::AudioPolicyForceUse::ENCODED_SURROUND:

            return AUDIO_POLICY_FORCE_FOR_ENCODED_SURROUND;

        case media::AudioPolicyForceUse::VIBRATE_RINGING:

            return AUDIO_POLICY_FORCE_FOR_VIBRATE_RINGING;

    }

    return unexpected(BAD_VALUE);

}



ConversionResult<media::AudioPolicyForceUse>

legacy2aidl_audio_policy_force_use_t_AudioPolicyForceUse(audio_policy_force_use_t legacy) {

    switch (legacy) {

        case AUDIO_POLICY_FORCE_FOR_COMMUNICATION:

            return media::AudioPolicyForceUse::COMMUNICATION;

        case AUDIO_POLICY_FORCE_FOR_MEDIA:

            return media::AudioPolicyForceUse::MEDIA;

        case AUDIO_POLICY_FORCE_FOR_RECORD:

            return media::AudioPolicyForceUse::RECORD;

        case AUDIO_POLICY_FORCE_FOR_DOCK:

            return media::AudioPolicyForceUse::DOCK;

        case AUDIO_POLICY_FORCE_FOR_SYSTEM:

            return media::AudioPolicyForceUse::SYSTEM;

        case AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO:

            return media::AudioPolicyForceUse::HDMI_SYSTEM_AUDIO;

        case AUDIO_POLICY_FORCE_FOR_ENCODED_SURROUND:

            return media::AudioPolicyForceUse::ENCODED_SURROUND;

        case AUDIO_POLICY_FORCE_FOR_VIBRATE_RINGING:

            return media::AudioPolicyForceUse::VIBRATE_RINGING;

        case AUDIO_POLICY_FORCE_USE_CNT:

            break;

    }

    return unexpected(BAD_VALUE);

}



ConversionResult<audio_policy_forced_cfg_t>

aidl2legacy_AudioPolicyForcedConfig_audio_policy_forced_cfg_t(media::AudioPolicyForcedConfig aidl) {

    switch (aidl) {

        case media::AudioPolicyForcedConfig::NONE:

            return AUDIO_POLICY_FORCE_NONE;

        case media::AudioPolicyForcedConfig::SPEAKER:

            return AUDIO_POLICY_FORCE_SPEAKER;

        case media::AudioPolicyForcedConfig::HEADPHONES:

            return AUDIO_POLICY_FORCE_HEADPHONES;

        case media::AudioPolicyForcedConfig::BT_SCO:

            return AUDIO_POLICY_FORCE_BT_SCO;

        case media::AudioPolicyForcedConfig::BT_A2DP:

            return AUDIO_POLICY_FORCE_BT_A2DP;

        case media::AudioPolicyForcedConfig::WIRED_ACCESSORY:

            return AUDIO_POLICY_FORCE_WIRED_ACCESSORY;

        case media::AudioPolicyForcedConfig::BT_CAR_DOCK:

            return AUDIO_POLICY_FORCE_BT_CAR_DOCK;

        case media::AudioPolicyForcedConfig::BT_DESK_DOCK:

            return AUDIO_POLICY_FORCE_BT_DESK_DOCK;

        case media::AudioPolicyForcedConfig::ANALOG_DOCK:

            return AUDIO_POLICY_FORCE_ANALOG_DOCK;

        case media::AudioPolicyForcedConfig::DIGITAL_DOCK:

            return AUDIO_POLICY_FORCE_DIGITAL_DOCK;

        case media::AudioPolicyForcedConfig::NO_BT_A2DP:

            return AUDIO_POLICY_FORCE_NO_BT_A2DP;

        case media::AudioPolicyForcedConfig::SYSTEM_ENFORCED:

            return AUDIO_POLICY_FORCE_SYSTEM_ENFORCED;

        case media::AudioPolicyForcedConfig::HDMI_SYSTEM_AUDIO_ENFORCED:

            return AUDIO_POLICY_FORCE_HDMI_SYSTEM_AUDIO_ENFORCED;

        case media::AudioPolicyForcedConfig::ENCODED_SURROUND_NEVER:

            return AUDIO_POLICY_FORCE_ENCODED_SURROUND_NEVER;

        case media::AudioPolicyForcedConfig::ENCODED_SURROUND_ALWAYS:

            return AUDIO_POLICY_FORCE_ENCODED_SURROUND_ALWAYS;

        case media::AudioPolicyForcedConfig::ENCODED_SURROUND_MANUAL:

            return AUDIO_POLICY_FORCE_ENCODED_SURROUND_MANUAL;

        case media::AudioPolicyForcedConfig::BT_BLE:

            return AUDIO_POLICY_FORCE_BT_BLE;

    }

    return unexpected(BAD_VALUE);

}



ConversionResult<media::AudioPolicyForcedConfig>

legacy2aidl_audio_policy_forced_cfg_t_AudioPolicyForcedConfig(audio_policy_forced_cfg_t legacy) {

    switch (legacy) {

        case AUDIO_POLICY_FORCE_NONE:

            return media::AudioPolicyForcedConfig::NONE;

        case AUDIO_POLICY_FORCE_SPEAKER:

            return media::AudioPolicyForcedConfig::SPEAKER;

        case AUDIO_POLICY_FORCE_HEADPHONES:

            return media::AudioPolicyForcedConfig::HEADPHONES;

        case AUDIO_POLICY_FORCE_BT_SCO:

            return media::AudioPolicyForcedConfig::BT_SCO;

        case AUDIO_POLICY_FORCE_BT_A2DP:

            return media::AudioPolicyForcedConfig::BT_A2DP;

        case AUDIO_POLICY_FORCE_WIRED_ACCESSORY:

            return media::AudioPolicyForcedConfig::WIRED_ACCESSORY;

        case AUDIO_POLICY_FORCE_BT_CAR_DOCK:

            return media::AudioPolicyForcedConfig::BT_CAR_DOCK;

        case AUDIO_POLICY_FORCE_BT_DESK_DOCK:

            return media::AudioPolicyForcedConfig::BT_DESK_DOCK;

        case AUDIO_POLICY_FORCE_ANALOG_DOCK:

            return media::AudioPolicyForcedConfig::ANALOG_DOCK;

        case AUDIO_POLICY_FORCE_DIGITAL_DOCK:

            return media::AudioPolicyForcedConfig::DIGITAL_DOCK;

        case AUDIO_POLICY_FORCE_NO_BT_A2DP:

            return media::AudioPolicyForcedConfig::NO_BT_A2DP;

        case AUDIO_POLICY_FORCE_SYSTEM_ENFORCED:

            return media::AudioPolicyForcedConfig::SYSTEM_ENFORCED;

        case AUDIO_POLICY_FORCE_HDMI_SYSTEM_AUDIO_ENFORCED:

            return media::AudioPolicyForcedConfig::HDMI_SYSTEM_AUDIO_ENFORCED;

        case AUDIO_POLICY_FORCE_ENCODED_SURROUND_NEVER:

            return media::AudioPolicyForcedConfig::ENCODED_SURROUND_NEVER;

        case AUDIO_POLICY_FORCE_ENCODED_SURROUND_ALWAYS:

            return media::AudioPolicyForcedConfig::ENCODED_SURROUND_ALWAYS;

        case AUDIO_POLICY_FORCE_ENCODED_SURROUND_MANUAL:

            return media::AudioPolicyForcedConfig::ENCODED_SURROUND_MANUAL;

        case AUDIO_POLICY_FORCE_BT_BLE:

            return media::AudioPolicyForcedConfig::BT_BLE;

        case AUDIO_POLICY_FORCE_CFG_CNT:

            break;

    }

    return unexpected(BAD_VALUE);

}



ConversionResult<device_role_t>

aidl2legacy_DeviceRole_device_role_t(media::DeviceRole aidl) {

    switch (aidl) {