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

Commit f5a3c7c4 authored by Atneya Nair's avatar Atneya Nair Committed by Android (Google) Code Review
Browse files

Merge changes I22ffe28a,I4587e350,I3f1ad6e8 

* changes:
  Rename AudioPatch to AudioPatchFw
  Rename AudioPort to AudioPortFw
  Rename AudioPortConfig to AudioPortConfigFw
parents 546a0444 3afdbd14

media/libaudioclient/AidlConversion.cpp

+9 −9
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ status_t legacy2aidl_AudioPortExt( 
}



ConversionResult<audio_port_config> aidl2legacy_AudioPortConfig_audio_port_config(

        const media::AudioPortConfig& aidl) {

        const media::AudioPortConfigFw& aidl) {

    audio_port_config legacy{};

    legacy.id = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_port_handle_t(aidl.hal.id));

    legacy.role = VALUE_OR_RETURN(aidl2legacy_AudioPortRole_audio_port_role_t(aidl.sys.role));
@@ -457,9 +457,9 @@ ConversionResult<audio_port_config> aidl2legacy_AudioPortConfig_audio_port_confi 
    return legacy;

}



ConversionResult<media::AudioPortConfig> legacy2aidl_audio_port_config_AudioPortConfig(

ConversionResult<media::AudioPortConfigFw> legacy2aidl_audio_port_config_AudioPortConfig(

        const audio_port_config& legacy) {

    media::AudioPortConfig aidl;

    media::AudioPortConfigFw aidl;

    aidl.hal.id = VALUE_OR_RETURN(legacy2aidl_audio_port_handle_t_int32_t(legacy.id));

    aidl.sys.role = VALUE_OR_RETURN(legacy2aidl_audio_port_role_t_AudioPortRole(legacy.role));

    aidl.sys.type = VALUE_OR_RETURN(legacy2aidl_audio_port_type_t_AudioPortType(legacy.type));
@@ -492,7 +492,7 @@ ConversionResult<media::AudioPortConfig> legacy2aidl_audio_port_config_AudioPort 
}



ConversionResult<struct audio_patch> aidl2legacy_AudioPatch_audio_patch(

        const media::AudioPatch& aidl) {

        const media::AudioPatchFw& aidl) {

    struct audio_patch legacy;

    legacy.id = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_patch_handle_t(aidl.id));

    legacy.num_sinks = VALUE_OR_RETURN(convertIntegral<unsigned int>(aidl.sinks.size()));
@@ -514,9 +514,9 @@ ConversionResult<struct audio_patch> aidl2legacy_AudioPatch_audio_patch( 
    return legacy;

}



ConversionResult<media::AudioPatch> legacy2aidl_audio_patch_AudioPatch(

ConversionResult<media::AudioPatchFw> legacy2aidl_audio_patch_AudioPatch(

        const struct audio_patch& legacy) {

    media::AudioPatch aidl;

    media::AudioPatchFw aidl;

    aidl.id = VALUE_OR_RETURN(legacy2aidl_audio_patch_handle_t_int32_t(legacy.id));



    if (legacy.num_sinks > AUDIO_PATCH_PORTS_MAX) {
@@ -930,7 +930,7 @@ status_t legacy2aidl_AudioPortExt( 
}



ConversionResult<audio_port_v7>

aidl2legacy_AudioPort_audio_port_v7(const media::AudioPort& aidl) {

aidl2legacy_AudioPort_audio_port_v7(const media::AudioPortFw& aidl) {

    audio_port_v7 legacy;

    legacy.id = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_port_handle_t(aidl.hal.id));

    legacy.role = VALUE_OR_RETURN(aidl2legacy_AudioPortRole_audio_port_role_t(aidl.sys.role));
@@ -975,9 +975,9 @@ aidl2legacy_AudioPort_audio_port_v7(const media::AudioPort& aidl) { 
    return legacy;

}



ConversionResult<media::AudioPort>

ConversionResult<media::AudioPortFw>

legacy2aidl_audio_port_v7_AudioPort(const audio_port_v7& legacy) {

    media::AudioPort aidl;

    media::AudioPortFw aidl;

    aidl.hal.id = VALUE_OR_RETURN(legacy2aidl_audio_port_handle_t_int32_t(legacy.id));

    aidl.sys.role = VALUE_OR_RETURN(legacy2aidl_audio_port_role_t_AudioPortRole(legacy.role));

    aidl.sys.type = VALUE_OR_RETURN(legacy2aidl_audio_port_type_t_AudioPortType(legacy.type));

media/libaudioclient/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -287,11 +287,11 @@ aidl_interface { 
        "aidl/android/media/AudioHalVersion.aidl",

        "aidl/android/media/AudioIoConfigEvent.aidl",

        "aidl/android/media/AudioIoDescriptor.aidl",

        "aidl/android/media/AudioPatch.aidl",

        "aidl/android/media/AudioPatchFw.aidl",

        "aidl/android/media/AudioPlaybackRate.aidl",

        "aidl/android/media/AudioPort.aidl",

        "aidl/android/media/AudioPortFw.aidl",

        "aidl/android/media/AudioPortSys.aidl",

        "aidl/android/media/AudioPortConfig.aidl",

        "aidl/android/media/AudioPortConfigFw.aidl",

        "aidl/android/media/AudioPortConfigSys.aidl",

        "aidl/android/media/AudioPortDeviceExtSys.aidl",

        "aidl/android/media/AudioPortExtSys.aidl",

media/libaudioclient/AudioSystem.cpp

+6 −6
Original line number Diff line number Diff line
@@ -1551,7 +1551,7 @@ status_t AudioSystem::listAudioPorts(audio_port_role_t role, 
            legacy2aidl_audio_port_type_t_AudioPortType(type));

    Int numPortsAidl;

    numPortsAidl.value = VALUE_OR_RETURN_STATUS(convertIntegral<int32_t>(*num_ports));

    std::vector<media::AudioPort> portsAidl;

    std::vector<media::AudioPortFw> portsAidl;

    int32_t generationAidl;



    RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
@@ -1570,7 +1570,7 @@ status_t AudioSystem::getAudioPort(struct audio_port_v7* port) { 
    const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();

    if (aps == 0) return PERMISSION_DENIED;



    media::AudioPort portAidl;

    media::AudioPortFw portAidl;

    RETURN_STATUS_IF_ERROR(

            statusTFromBinderStatus(aps->getAudioPort(port->id, &portAidl)));

    *port = VALUE_OR_RETURN_STATUS(aidl2legacy_AudioPort_audio_port_v7(portAidl));
@@ -1586,7 +1586,7 @@ status_t AudioSystem::createAudioPatch(const struct audio_patch* patch, 
    const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();

    if (aps == 0) return PERMISSION_DENIED;



    media::AudioPatch patchAidl = VALUE_OR_RETURN_STATUS(

    media::AudioPatchFw patchAidl = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_patch_AudioPatch(*patch));

    int32_t handleAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_patch_handle_t_int32_t(*handle));

    RETURN_STATUS_IF_ERROR(
@@ -1617,7 +1617,7 @@ status_t AudioSystem::listAudioPatches(unsigned int* num_patches, 


    Int numPatchesAidl;

    numPatchesAidl.value = VALUE_OR_RETURN_STATUS(convertIntegral<int32_t>(*num_patches));

    std::vector<media::AudioPatch> patchesAidl;

    std::vector<media::AudioPatchFw> patchesAidl;

    int32_t generationAidl;



    RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
@@ -1637,7 +1637,7 @@ status_t AudioSystem::setAudioPortConfig(const struct audio_port_config* config) 
    const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();

    if (aps == 0) return PERMISSION_DENIED;



    media::AudioPortConfig configAidl = VALUE_OR_RETURN_STATUS(

    media::AudioPortConfigFw configAidl = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_port_config_AudioPortConfig(*config));

    return statusTFromBinderStatus(aps->setAudioPortConfig(configAidl));

}
@@ -1858,7 +1858,7 @@ status_t AudioSystem::startAudioSource(const struct audio_port_config* source, 
    const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();

    if (aps == 0) return PERMISSION_DENIED;



    media::AudioPortConfig sourceAidl = VALUE_OR_RETURN_STATUS(

    media::AudioPortConfigFw sourceAidl = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_port_config_AudioPortConfig(*source));

    media::AudioAttributesInternal attributesAidl = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_attributes_t_AudioAttributesInternal(*attributes));

media/libaudioclient/IAudioFlinger.cpp

+14 −12
Original line number Diff line number Diff line
@@ -679,8 +679,9 @@ status_t AudioFlingerClientAdapter::setLowRamDevice(bool isLowRamDevice, int64_t 
}



status_t AudioFlingerClientAdapter::getAudioPort(struct audio_port_v7* port) {

    media::AudioPort portAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_port_v7_AudioPort(*port));

    media::AudioPort aidlRet;

    media::AudioPortFw portAidl = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_port_v7_AudioPort(*port));

    media::AudioPortFw aidlRet;

    RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(

            mDelegate->getAudioPort(portAidl, &aidlRet)));

    *port = VALUE_OR_RETURN_STATUS(aidl2legacy_AudioPort_audio_port_v7(aidlRet));
@@ -689,7 +690,8 @@ status_t AudioFlingerClientAdapter::getAudioPort(struct audio_port_v7* port) { 


status_t AudioFlingerClientAdapter::createAudioPatch(const struct audio_patch* patch,

                                                     audio_patch_handle_t* handle) {

    media::AudioPatch patchAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_patch_AudioPatch(*patch));

    media::AudioPatchFw patchAidl = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_patch_AudioPatch(*patch));

    int32_t aidlRet = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_patch_handle_t_int32_t(

                    AUDIO_PATCH_HANDLE_NONE));

    if (handle != nullptr) {
@@ -710,7 +712,7 @@ status_t AudioFlingerClientAdapter::releaseAudioPatch(audio_patch_handle_t handl 


status_t AudioFlingerClientAdapter::listAudioPatches(unsigned int* num_patches,

                                                     struct audio_patch* patches) {

    std::vector<media::AudioPatch> aidlRet;

    std::vector<media::AudioPatchFw> aidlRet;

    int32_t maxPatches = VALUE_OR_RETURN_STATUS(convertIntegral<int32_t>(*num_patches));

    RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(

            mDelegate->listAudioPatches(maxPatches, &aidlRet)));
@@ -720,7 +722,7 @@ status_t AudioFlingerClientAdapter::listAudioPatches(unsigned int* num_patches, 
}



status_t AudioFlingerClientAdapter::setAudioPortConfig(const struct audio_port_config* config) {

    media::AudioPortConfig configAidl = VALUE_OR_RETURN_STATUS(

    media::AudioPortConfigFw configAidl = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_port_config_AudioPortConfig(*config));

    return statusTFromBinderStatus(mDelegate->setAudioPortConfig(configAidl));

}
@@ -818,7 +820,7 @@ int32_t AudioFlingerClientAdapter::getAAudioHardwareBurstMinUsec() { 


status_t AudioFlingerClientAdapter::setDeviceConnectedState(

        const struct audio_port_v7 *port, bool connected) {

    media::AudioPort aidlPort = VALUE_OR_RETURN_STATUS(

    media::AudioPortFw aidlPort = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_port_v7_AudioPort(*port));

    return statusTFromBinderStatus(mDelegate->setDeviceConnectedState(aidlPort, connected));

}
@@ -1230,15 +1232,15 @@ Status AudioFlingerServerAdapter::setLowRamDevice(bool isLowRamDevice, int64_t t 
    return Status::fromStatusT(mDelegate->setLowRamDevice(isLowRamDevice, totalMemory));

}



Status AudioFlingerServerAdapter::getAudioPort(const media::AudioPort& port,

                                               media::AudioPort* _aidl_return) {

Status AudioFlingerServerAdapter::getAudioPort(const media::AudioPortFw& port,

                                               media::AudioPortFw* _aidl_return) {

    audio_port_v7 portLegacy = VALUE_OR_RETURN_BINDER(aidl2legacy_AudioPort_audio_port_v7(port));

    RETURN_BINDER_IF_ERROR(mDelegate->getAudioPort(&portLegacy));

    *_aidl_return = VALUE_OR_RETURN_BINDER(legacy2aidl_audio_port_v7_AudioPort(portLegacy));

    return Status::ok();

}



Status AudioFlingerServerAdapter::createAudioPatch(const media::AudioPatch& patch,

Status AudioFlingerServerAdapter::createAudioPatch(const media::AudioPatchFw& patch,

                                                   int32_t* _aidl_return) {

    audio_patch patchLegacy = VALUE_OR_RETURN_BINDER(aidl2legacy_AudioPatch_audio_patch(patch));

    audio_patch_handle_t handleLegacy = VALUE_OR_RETURN_BINDER(
@@ -1255,7 +1257,7 @@ Status AudioFlingerServerAdapter::releaseAudioPatch(int32_t handle) { 
}



Status AudioFlingerServerAdapter::listAudioPatches(int32_t maxCount,

                            std::vector<media::AudioPatch>* _aidl_return) {

                            std::vector<media::AudioPatchFw>* _aidl_return) {

    unsigned int count = VALUE_OR_RETURN_BINDER(convertIntegral<unsigned int>(maxCount));

    count = std::min(count, static_cast<unsigned int>(MAX_ITEMS_PER_LIST));

    std::unique_ptr<audio_patch[]> patchesLegacy(new audio_patch[count]);
@@ -1267,7 +1269,7 @@ Status AudioFlingerServerAdapter::listAudioPatches(int32_t maxCount, 
    return Status::ok();

}



Status AudioFlingerServerAdapter::setAudioPortConfig(const media::AudioPortConfig& config) {

Status AudioFlingerServerAdapter::setAudioPortConfig(const media::AudioPortConfigFw& config) {

    audio_port_config configLegacy = VALUE_OR_RETURN_BINDER(

            aidl2legacy_AudioPortConfig_audio_port_config(config));

    return Status::fromStatusT(mDelegate->setAudioPortConfig(&configLegacy));
@@ -1347,7 +1349,7 @@ Status AudioFlingerServerAdapter::getAAudioHardwareBurstMinUsec(int32_t* _aidl_r 
}



Status AudioFlingerServerAdapter::setDeviceConnectedState(

        const media::AudioPort& port, bool connected) {

        const media::AudioPortFw& port, bool connected) {

    audio_port_v7 portLegacy = VALUE_OR_RETURN_BINDER(aidl2legacy_AudioPort_audio_port_v7(port));

    return Status::fromStatusT(mDelegate->setDeviceConnectedState(&portLegacy, connected));

}

media/libaudioclient/aidl/android/media/AudioIoDescriptor.aidl

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package android.media;



import android.media.AudioPatch;

import android.media.AudioPatchFw;

import android.media.audio.common.AudioChannelLayout;

import android.media.audio.common.AudioFormatDescription;
@@ -26,7 +26,7 @@ import android.media.audio.common.AudioFormatDescription; 
parcelable AudioIoDescriptor {

    /** Interpreted as audio_io_handle_t. */

    int ioHandle;

    AudioPatch patch;

    AudioPatchFw patch;

    boolean isInput;

    int samplingRate;

    AudioFormatDescription format;