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

Commit 87227251 authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

Match conversion function names to type names 

Update the names of conversion functions for AudioPatchFw,
AudioPortFw, and AudioPortConfigFw to reflect changes in
the names of these types. Besides consistenty, this allows
avoiding ambiguity when providing converters for vintf-stable
types.

Bug: 205884982
Test: m
Change-Id: I10b52b1e454ba0f763db83a28657be2a08c7a50f
parent b6c50a3b

media/libaudioclient/AidlConversion.cpp

+14 −14
Original line number Original line Diff line number Diff line
@@ -416,7 +416,7 @@ status_t legacy2aidl_AudioPortExt( 
    LOG_ALWAYS_FATAL("Shouldn't get here"); // with -Werror,-Wswitch may compile-time fail

    LOG_ALWAYS_FATAL("Shouldn't get here"); // with -Werror,-Wswitch may compile-time fail

}

}





ConversionResult<audio_port_config> aidl2legacy_AudioPortConfig_audio_port_config(

ConversionResult<audio_port_config> aidl2legacy_AudioPortConfigFw_audio_port_config(

        const media::AudioPortConfigFw& aidl) {

        const media::AudioPortConfigFw& aidl) {

    audio_port_config legacy{};

    audio_port_config legacy{};

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

    legacy.id = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_port_handle_t(aidl.hal.id));
@@ -457,7 +457,7 @@ ConversionResult<audio_port_config> aidl2legacy_AudioPortConfig_audio_port_confi 
    return legacy;

    return legacy;

}

}





ConversionResult<media::AudioPortConfigFw> legacy2aidl_audio_port_config_AudioPortConfig(

ConversionResult<media::AudioPortConfigFw> legacy2aidl_audio_port_config_AudioPortConfigFw(

        const audio_port_config& legacy) {

        const audio_port_config& legacy) {

    media::AudioPortConfigFw aidl;

    media::AudioPortConfigFw aidl;

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

    aidl.hal.id = VALUE_OR_RETURN(legacy2aidl_audio_port_handle_t_int32_t(legacy.id));
@@ -491,7 +491,7 @@ ConversionResult<media::AudioPortConfigFw> legacy2aidl_audio_port_config_AudioPo 
    return aidl;

    return aidl;

}

}





ConversionResult<struct audio_patch> aidl2legacy_AudioPatch_audio_patch(

ConversionResult<struct audio_patch> aidl2legacy_AudioPatchFw_audio_patch(

        const media::AudioPatchFw& aidl) {

        const media::AudioPatchFw& aidl) {

    struct audio_patch legacy;

    struct audio_patch legacy;

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

    legacy.id = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_patch_handle_t(aidl.id));
@@ -501,7 +501,7 @@ ConversionResult<struct audio_patch> aidl2legacy_AudioPatch_audio_patch( 
    }

    }

    for (size_t i = 0; i < legacy.num_sinks; ++i) {

    for (size_t i = 0; i < legacy.num_sinks; ++i) {

        legacy.sinks[i] =

        legacy.sinks[i] =

                VALUE_OR_RETURN(aidl2legacy_AudioPortConfig_audio_port_config(aidl.sinks[i]));

                VALUE_OR_RETURN(aidl2legacy_AudioPortConfigFw_audio_port_config(aidl.sinks[i]));

    }

    }

    legacy.num_sources = VALUE_OR_RETURN(convertIntegral<unsigned int>(aidl.sources.size()));

    legacy.num_sources = VALUE_OR_RETURN(convertIntegral<unsigned int>(aidl.sources.size()));

    if (legacy.num_sources > AUDIO_PATCH_PORTS_MAX) {

    if (legacy.num_sources > AUDIO_PATCH_PORTS_MAX) {
@@ -509,12 +509,12 @@ ConversionResult<struct audio_patch> aidl2legacy_AudioPatch_audio_patch( 
    }

    }

    for (size_t i = 0; i < legacy.num_sources; ++i) {

    for (size_t i = 0; i < legacy.num_sources; ++i) {

        legacy.sources[i] =

        legacy.sources[i] =

                VALUE_OR_RETURN(aidl2legacy_AudioPortConfig_audio_port_config(aidl.sources[i]));

                VALUE_OR_RETURN(aidl2legacy_AudioPortConfigFw_audio_port_config(aidl.sources[i]));

    }

    }

    return legacy;

    return legacy;

}

}





ConversionResult<media::AudioPatchFw> legacy2aidl_audio_patch_AudioPatch(

ConversionResult<media::AudioPatchFw> legacy2aidl_audio_patch_AudioPatchFw(

        const struct audio_patch& legacy) {

        const struct audio_patch& legacy) {

    media::AudioPatchFw aidl;

    media::AudioPatchFw aidl;

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

    aidl.id = VALUE_OR_RETURN(legacy2aidl_audio_patch_handle_t_int32_t(legacy.id));
@@ -524,14 +524,14 @@ ConversionResult<media::AudioPatchFw> legacy2aidl_audio_patch_AudioPatch( 
    }

    }

    for (unsigned int i = 0; i < legacy.num_sinks; ++i) {

    for (unsigned int i = 0; i < legacy.num_sinks; ++i) {

        aidl.sinks.push_back(

        aidl.sinks.push_back(

                VALUE_OR_RETURN(legacy2aidl_audio_port_config_AudioPortConfig(legacy.sinks[i])));

                VALUE_OR_RETURN(legacy2aidl_audio_port_config_AudioPortConfigFw(legacy.sinks[i])));

    }

    }

    if (legacy.num_sources > AUDIO_PATCH_PORTS_MAX) {

    if (legacy.num_sources > AUDIO_PATCH_PORTS_MAX) {

        return unexpected(BAD_VALUE);

        return unexpected(BAD_VALUE);

    }

    }

    for (unsigned int i = 0; i < legacy.num_sources; ++i) {

    for (unsigned int i = 0; i < legacy.num_sources; ++i) {

        aidl.sources.push_back(

        aidl.sources.push_back(

                VALUE_OR_RETURN(legacy2aidl_audio_port_config_AudioPortConfig(legacy.sources[i])));

                VALUE_OR_RETURN(legacy2aidl_audio_port_config_AudioPortConfigFw(legacy.sources[i])));

    }

    }

    return aidl;

    return aidl;

}

}
@@ -541,7 +541,7 @@ ConversionResult<sp<AudioIoDescriptor>> aidl2legacy_AudioIoDescriptor_AudioIoDes 
    const audio_io_handle_t io_handle = VALUE_OR_RETURN(

    const audio_io_handle_t io_handle = VALUE_OR_RETURN(

            aidl2legacy_int32_t_audio_io_handle_t(aidl.ioHandle));

            aidl2legacy_int32_t_audio_io_handle_t(aidl.ioHandle));

    const struct audio_patch patch = VALUE_OR_RETURN(

    const struct audio_patch patch = VALUE_OR_RETURN(

            aidl2legacy_AudioPatch_audio_patch(aidl.patch));

            aidl2legacy_AudioPatchFw_audio_patch(aidl.patch));

    const bool isInput = aidl.isInput;

    const bool isInput = aidl.isInput;

    const uint32_t sampling_rate = VALUE_OR_RETURN(convertIntegral<uint32_t>(aidl.samplingRate));

    const uint32_t sampling_rate = VALUE_OR_RETURN(convertIntegral<uint32_t>(aidl.samplingRate));

    const audio_format_t format = VALUE_OR_RETURN(

    const audio_format_t format = VALUE_OR_RETURN(
@@ -561,7 +561,7 @@ ConversionResult<media::AudioIoDescriptor> legacy2aidl_AudioIoDescriptor_AudioIo 
        const sp<AudioIoDescriptor>& legacy) {

        const sp<AudioIoDescriptor>& legacy) {

    media::AudioIoDescriptor aidl;

    media::AudioIoDescriptor aidl;

    aidl.ioHandle = VALUE_OR_RETURN(legacy2aidl_audio_io_handle_t_int32_t(legacy->getIoHandle()));

    aidl.ioHandle = VALUE_OR_RETURN(legacy2aidl_audio_io_handle_t_int32_t(legacy->getIoHandle()));

    aidl.patch = VALUE_OR_RETURN(legacy2aidl_audio_patch_AudioPatch(legacy->getPatch()));

    aidl.patch = VALUE_OR_RETURN(legacy2aidl_audio_patch_AudioPatchFw(legacy->getPatch()));

    aidl.isInput = legacy->getIsInput();

    aidl.isInput = legacy->getIsInput();

    aidl.samplingRate = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy->getSamplingRate()));

    aidl.samplingRate = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy->getSamplingRate()));

    aidl.format = VALUE_OR_RETURN(

    aidl.format = VALUE_OR_RETURN(
@@ -930,7 +930,7 @@ status_t legacy2aidl_AudioPortExt( 
}

}





ConversionResult<audio_port_v7>

ConversionResult<audio_port_v7>

aidl2legacy_AudioPort_audio_port_v7(const media::AudioPortFw& aidl) {

aidl2legacy_AudioPortFw_audio_port_v7(const media::AudioPortFw& aidl) {

    audio_port_v7 legacy;

    audio_port_v7 legacy;

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

    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));

    legacy.role = VALUE_OR_RETURN(aidl2legacy_AudioPortRole_audio_port_role_t(aidl.sys.role));
@@ -969,14 +969,14 @@ aidl2legacy_AudioPort_audio_port_v7(const media::AudioPortFw& aidl) { 
    legacy.num_gains = aidl.hal.gains.size();

    legacy.num_gains = aidl.hal.gains.size();





    legacy.active_config = VALUE_OR_RETURN(

    legacy.active_config = VALUE_OR_RETURN(

            aidl2legacy_AudioPortConfig_audio_port_config(aidl.sys.activeConfig));

            aidl2legacy_AudioPortConfigFw_audio_port_config(aidl.sys.activeConfig));

    legacy.ext = VALUE_OR_RETURN(

    legacy.ext = VALUE_OR_RETURN(

            aidl2legacy_AudioPortExt_audio_port_v7_ext(aidl.hal.ext, aidl.sys.type, aidl.sys.ext));

            aidl2legacy_AudioPortExt_audio_port_v7_ext(aidl.hal.ext, aidl.sys.type, aidl.sys.ext));

    return legacy;

    return legacy;

}

}





ConversionResult<media::AudioPortFw>

ConversionResult<media::AudioPortFw>

legacy2aidl_audio_port_v7_AudioPort(const audio_port_v7& legacy) {

legacy2aidl_audio_port_v7_AudioPortFw(const audio_port_v7& legacy) {

    media::AudioPortFw aidl;

    media::AudioPortFw aidl;

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

    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.role = VALUE_OR_RETURN(legacy2aidl_audio_port_role_t_AudioPortRole(legacy.role));
@@ -1016,7 +1016,7 @@ legacy2aidl_audio_port_v7_AudioPort(const audio_port_v7& legacy) { 
    aidl.sys.gains.resize(legacy.num_gains);

    aidl.sys.gains.resize(legacy.num_gains);





    aidl.sys.activeConfig = VALUE_OR_RETURN(

    aidl.sys.activeConfig = VALUE_OR_RETURN(

            legacy2aidl_audio_port_config_AudioPortConfig(legacy.active_config));

            legacy2aidl_audio_port_config_AudioPortConfigFw(legacy.active_config));

    aidl.sys.activeConfig.hal.portId = aidl.hal.id;

    aidl.sys.activeConfig.hal.portId = aidl.hal.id;

    RETURN_IF_ERROR(

    RETURN_IF_ERROR(

            legacy2aidl_AudioPortExt(legacy.ext, legacy.type, &aidl.hal.ext, &aidl.sys.ext));

            legacy2aidl_AudioPortExt(legacy.ext, legacy.type, &aidl.hal.ext, &aidl.sys.ext));

media/libaudioclient/AudioSystem.cpp

+6 −6
Original line number Original line Diff line number Diff line
@@ -1540,7 +1540,7 @@ status_t AudioSystem::listAudioPorts(audio_port_role_t role, 
    *num_ports = VALUE_OR_RETURN_STATUS(convertIntegral<unsigned int>(numPortsAidl.value));

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

    *generation = VALUE_OR_RETURN_STATUS(convertIntegral<unsigned int>(generationAidl));

    *generation = VALUE_OR_RETURN_STATUS(convertIntegral<unsigned int>(generationAidl));

    RETURN_STATUS_IF_ERROR(convertRange(portsAidl.begin(), portsAidl.end(), ports,

    RETURN_STATUS_IF_ERROR(convertRange(portsAidl.begin(), portsAidl.end(), ports,

                                        aidl2legacy_AudioPort_audio_port_v7));

                                        aidl2legacy_AudioPortFw_audio_port_v7));

    return OK;

    return OK;

}

}
@@ -1554,7 +1554,7 @@ status_t AudioSystem::getAudioPort(struct audio_port_v7* port) { 
    media::AudioPortFw portAidl;

    media::AudioPortFw portAidl;

    RETURN_STATUS_IF_ERROR(

    RETURN_STATUS_IF_ERROR(

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

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

    *port = VALUE_OR_RETURN_STATUS(aidl2legacy_AudioPort_audio_port_v7(portAidl));

    *port = VALUE_OR_RETURN_STATUS(aidl2legacy_AudioPortFw_audio_port_v7(portAidl));

    return OK;

    return OK;

}

}
@@ -1568,7 +1568,7 @@ status_t AudioSystem::createAudioPatch(const struct audio_patch* patch, 
    if (aps == 0) return PERMISSION_DENIED;

    if (aps == 0) return PERMISSION_DENIED;





    media::AudioPatchFw patchAidl = VALUE_OR_RETURN_STATUS(

    media::AudioPatchFw patchAidl = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_patch_AudioPatch(*patch));

            legacy2aidl_audio_patch_AudioPatchFw(*patch));

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

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

    RETURN_STATUS_IF_ERROR(

    RETURN_STATUS_IF_ERROR(

            statusTFromBinderStatus(aps->createAudioPatch(patchAidl, handleAidl, &handleAidl)));

            statusTFromBinderStatus(aps->createAudioPatch(patchAidl, handleAidl, &handleAidl)));
@@ -1606,7 +1606,7 @@ status_t AudioSystem::listAudioPatches(unsigned int* num_patches, 
    *num_patches = VALUE_OR_RETURN_STATUS(convertIntegral<unsigned int>(numPatchesAidl.value));

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

    *generation = VALUE_OR_RETURN_STATUS(convertIntegral<unsigned int>(generationAidl));

    *generation = VALUE_OR_RETURN_STATUS(convertIntegral<unsigned int>(generationAidl));

    RETURN_STATUS_IF_ERROR(convertRange(patchesAidl.begin(), patchesAidl.end(), patches,

    RETURN_STATUS_IF_ERROR(convertRange(patchesAidl.begin(), patchesAidl.end(), patches,

                                        aidl2legacy_AudioPatch_audio_patch));

                                        aidl2legacy_AudioPatchFw_audio_patch));

    return OK;

    return OK;

}

}
@@ -1619,7 +1619,7 @@ status_t AudioSystem::setAudioPortConfig(const struct audio_port_config* config) 
    if (aps == 0) return PERMISSION_DENIED;

    if (aps == 0) return PERMISSION_DENIED;





    media::AudioPortConfigFw configAidl = VALUE_OR_RETURN_STATUS(

    media::AudioPortConfigFw configAidl = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_port_config_AudioPortConfig(*config));

            legacy2aidl_audio_port_config_AudioPortConfigFw(*config));

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

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

}

}
@@ -1840,7 +1840,7 @@ status_t AudioSystem::startAudioSource(const struct audio_port_config* source, 
    if (aps == 0) return PERMISSION_DENIED;

    if (aps == 0) return PERMISSION_DENIED;





    media::AudioPortConfigFw sourceAidl = VALUE_OR_RETURN_STATUS(

    media::AudioPortConfigFw sourceAidl = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_port_config_AudioPortConfig(*source));

            legacy2aidl_audio_port_config_AudioPortConfigFw(*source));

    media::AudioAttributesInternal attributesAidl = VALUE_OR_RETURN_STATUS(

    media::AudioAttributesInternal attributesAidl = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_attributes_t_AudioAttributesInternal(*attributes));

            legacy2aidl_audio_attributes_t_AudioAttributesInternal(*attributes));

    int32_t portIdAidl;

    int32_t portIdAidl;

media/libaudioclient/IAudioFlinger.cpp

+12 −12
Original line number Original line Diff line number Diff line
@@ -667,18 +667,18 @@ status_t AudioFlingerClientAdapter::setLowRamDevice(bool isLowRamDevice, int64_t 




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

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

    media::AudioPortFw portAidl = VALUE_OR_RETURN_STATUS(

    media::AudioPortFw portAidl = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_port_v7_AudioPort(*port));

            legacy2aidl_audio_port_v7_AudioPortFw(*port));

    media::AudioPortFw aidlRet;

    media::AudioPortFw aidlRet;

    RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(

    RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(

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

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

    *port = VALUE_OR_RETURN_STATUS(aidl2legacy_AudioPort_audio_port_v7(aidlRet));

    *port = VALUE_OR_RETURN_STATUS(aidl2legacy_AudioPortFw_audio_port_v7(aidlRet));

    return OK;

    return OK;

}

}





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

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

                                                     audio_patch_handle_t* handle) {

                                                     audio_patch_handle_t* handle) {

    media::AudioPatchFw patchAidl = VALUE_OR_RETURN_STATUS(

    media::AudioPatchFw patchAidl = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_patch_AudioPatch(*patch));

            legacy2aidl_audio_patch_AudioPatchFw(*patch));

    int32_t aidlRet = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_patch_handle_t_int32_t(

    int32_t aidlRet = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_patch_handle_t_int32_t(

                    AUDIO_PATCH_HANDLE_NONE));

                    AUDIO_PATCH_HANDLE_NONE));

    if (handle != nullptr) {

    if (handle != nullptr) {
@@ -705,12 +705,12 @@ status_t AudioFlingerClientAdapter::listAudioPatches(unsigned int* num_patches, 
            mDelegate->listAudioPatches(maxPatches, &aidlRet)));

            mDelegate->listAudioPatches(maxPatches, &aidlRet)));

    *num_patches = VALUE_OR_RETURN_STATUS(convertIntegral<unsigned int>(aidlRet.size()));

    *num_patches = VALUE_OR_RETURN_STATUS(convertIntegral<unsigned int>(aidlRet.size()));

    return convertRange(aidlRet.begin(), aidlRet.end(), patches,

    return convertRange(aidlRet.begin(), aidlRet.end(), patches,

                        aidl2legacy_AudioPatch_audio_patch);

                        aidl2legacy_AudioPatchFw_audio_patch);

}

}





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

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

    media::AudioPortConfigFw configAidl = VALUE_OR_RETURN_STATUS(

    media::AudioPortConfigFw configAidl = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_port_config_AudioPortConfig(*config));

            legacy2aidl_audio_port_config_AudioPortConfigFw(*config));

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

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

}

}
@@ -808,7 +808,7 @@ int32_t AudioFlingerClientAdapter::getAAudioHardwareBurstMinUsec() { 
status_t AudioFlingerClientAdapter::setDeviceConnectedState(

status_t AudioFlingerClientAdapter::setDeviceConnectedState(

        const struct audio_port_v7 *port, bool connected) {

        const struct audio_port_v7 *port, bool connected) {

    media::AudioPortFw aidlPort = VALUE_OR_RETURN_STATUS(

    media::AudioPortFw aidlPort = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_port_v7_AudioPort(*port));

            legacy2aidl_audio_port_v7_AudioPortFw(*port));

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

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

}

}
@@ -1241,15 +1241,15 @@ Status AudioFlingerServerAdapter::setLowRamDevice(bool isLowRamDevice, int64_t t 




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

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

                                               media::AudioPortFw* _aidl_return) {

                                               media::AudioPortFw* _aidl_return) {

    audio_port_v7 portLegacy = VALUE_OR_RETURN_BINDER(aidl2legacy_AudioPort_audio_port_v7(port));

    audio_port_v7 portLegacy = VALUE_OR_RETURN_BINDER(aidl2legacy_AudioPortFw_audio_port_v7(port));

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

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

    *_aidl_return = VALUE_OR_RETURN_BINDER(legacy2aidl_audio_port_v7_AudioPort(portLegacy));

    *_aidl_return = VALUE_OR_RETURN_BINDER(legacy2aidl_audio_port_v7_AudioPortFw(portLegacy));

    return Status::ok();

    return Status::ok();

}

}





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

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

                                                   int32_t* _aidl_return) {

                                                   int32_t* _aidl_return) {

    audio_patch patchLegacy = VALUE_OR_RETURN_BINDER(aidl2legacy_AudioPatch_audio_patch(patch));

    audio_patch patchLegacy = VALUE_OR_RETURN_BINDER(aidl2legacy_AudioPatchFw_audio_patch(patch));

    audio_patch_handle_t handleLegacy = VALUE_OR_RETURN_BINDER(

    audio_patch_handle_t handleLegacy = VALUE_OR_RETURN_BINDER(

            aidl2legacy_int32_t_audio_patch_handle_t(*_aidl_return));

            aidl2legacy_int32_t_audio_patch_handle_t(*_aidl_return));

    RETURN_BINDER_IF_ERROR(mDelegate->createAudioPatch(&patchLegacy, &handleLegacy));

    RETURN_BINDER_IF_ERROR(mDelegate->createAudioPatch(&patchLegacy, &handleLegacy));
@@ -1272,13 +1272,13 @@ Status AudioFlingerServerAdapter::listAudioPatches(int32_t maxCount, 
    RETURN_BINDER_IF_ERROR(convertRange(&patchesLegacy[0],

    RETURN_BINDER_IF_ERROR(convertRange(&patchesLegacy[0],

                           &patchesLegacy[count],

                           &patchesLegacy[count],

                           std::back_inserter(*_aidl_return),

                           std::back_inserter(*_aidl_return),

                           legacy2aidl_audio_patch_AudioPatch));

                           legacy2aidl_audio_patch_AudioPatchFw));

    return Status::ok();

    return Status::ok();

}

}





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

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

    audio_port_config configLegacy = VALUE_OR_RETURN_BINDER(

    audio_port_config configLegacy = VALUE_OR_RETURN_BINDER(

            aidl2legacy_AudioPortConfig_audio_port_config(config));

            aidl2legacy_AudioPortConfigFw_audio_port_config(config));

    return Status::fromStatusT(mDelegate->setAudioPortConfig(&configLegacy));

    return Status::fromStatusT(mDelegate->setAudioPortConfig(&configLegacy));

}

}
@@ -1357,7 +1357,7 @@ Status AudioFlingerServerAdapter::getAAudioHardwareBurstMinUsec(int32_t* _aidl_r 




Status AudioFlingerServerAdapter::setDeviceConnectedState(

Status AudioFlingerServerAdapter::setDeviceConnectedState(

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

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

    audio_port_v7 portLegacy = VALUE_OR_RETURN_BINDER(aidl2legacy_AudioPort_audio_port_v7(port));

    audio_port_v7 portLegacy = VALUE_OR_RETURN_BINDER(aidl2legacy_AudioPortFw_audio_port_v7(port));

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

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

}

}

media/libaudioclient/include/media/AidlConversion.h

+6 −6
Original line number Original line Diff line number Diff line
@@ -88,14 +88,14 @@ aidl2legacy_int32_t_audio_port_config_session_ext(int32_t aidl); 
ConversionResult<int32_t> legacy2aidl_audio_port_config_session_ext_AudioPortConfigSessionExt(

ConversionResult<int32_t> legacy2aidl_audio_port_config_session_ext_AudioPortConfigSessionExt(

        const audio_port_config_session_ext& legacy);

        const audio_port_config_session_ext& legacy);





ConversionResult<audio_port_config> aidl2legacy_AudioPortConfig_audio_port_config(

ConversionResult<audio_port_config> aidl2legacy_AudioPortConfigFw_audio_port_config(

        const media::AudioPortConfigFw& aidl);

        const media::AudioPortConfigFw& aidl);

ConversionResult<media::AudioPortConfigFw> legacy2aidl_audio_port_config_AudioPortConfig(

ConversionResult<media::AudioPortConfigFw> legacy2aidl_audio_port_config_AudioPortConfigFw(

        const audio_port_config& legacy);

        const audio_port_config& legacy);





ConversionResult<struct audio_patch> aidl2legacy_AudioPatch_audio_patch(

ConversionResult<struct audio_patch> aidl2legacy_AudioPatchFw_audio_patch(

        const media::AudioPatchFw& aidl);

        const media::AudioPatchFw& aidl);

ConversionResult<media::AudioPatchFw> legacy2aidl_audio_patch_AudioPatch(

ConversionResult<media::AudioPatchFw> legacy2aidl_audio_patch_AudioPatchFw(

        const struct audio_patch& legacy);

        const struct audio_patch& legacy);





ConversionResult<sp<AudioIoDescriptor>> aidl2legacy_AudioIoDescriptor_AudioIoDescriptor(

ConversionResult<sp<AudioIoDescriptor>> aidl2legacy_AudioIoDescriptor_AudioIoDescriptor(
@@ -167,9 +167,9 @@ ConversionResult<int32_t> 
legacy2aidl_audio_port_session_ext_int32_t(const audio_port_session_ext& legacy);

legacy2aidl_audio_port_session_ext_int32_t(const audio_port_session_ext& legacy);





ConversionResult<audio_port_v7>

ConversionResult<audio_port_v7>

aidl2legacy_AudioPort_audio_port_v7(const media::AudioPortFw& aidl);

aidl2legacy_AudioPortFw_audio_port_v7(const media::AudioPortFw& aidl);

ConversionResult<media::AudioPortFw>

ConversionResult<media::AudioPortFw>

legacy2aidl_audio_port_v7_AudioPort(const audio_port_v7& legacy);

legacy2aidl_audio_port_v7_AudioPortFw(const audio_port_v7& legacy);





ConversionResult<audio_unique_id_use_t>

ConversionResult<audio_unique_id_use_t>

aidl2legacy_AudioUniqueIdUse_audio_unique_id_use_t(media::AudioUniqueIdUse aidl);

aidl2legacy_AudioUniqueIdUse_audio_unique_id_use_t(media::AudioUniqueIdUse aidl);

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

+6 −6
Original line number Original line Diff line number Diff line
@@ -1546,7 +1546,7 @@ Status AudioPolicyService::listAudioPorts(media::AudioPortRole roleAidl, 
    numPortsReq = std::min(numPortsReq, num_ports);

    numPortsReq = std::min(numPortsReq, num_ports);

    RETURN_IF_BINDER_ERROR(binderStatusFromStatusT(

    RETURN_IF_BINDER_ERROR(binderStatusFromStatusT(

            convertRange(ports.get(), ports.get() + numPortsReq, std::back_inserter(*portsAidl),

            convertRange(ports.get(), ports.get() + numPortsReq, std::back_inserter(*portsAidl),

                         legacy2aidl_audio_port_v7_AudioPort)));

                         legacy2aidl_audio_port_v7_AudioPortFw)));

    count->value = VALUE_OR_RETURN_BINDER_STATUS(convertIntegral<int32_t>(num_ports));

    count->value = VALUE_OR_RETURN_BINDER_STATUS(convertIntegral<int32_t>(num_ports));

    *_aidl_return = VALUE_OR_RETURN_BINDER_STATUS(convertIntegral<int32_t>(generation));

    *_aidl_return = VALUE_OR_RETURN_BINDER_STATUS(convertIntegral<int32_t>(generation));

    return Status::ok();

    return Status::ok();
@@ -1561,7 +1561,7 @@ Status AudioPolicyService::getAudioPort(int portId, 
    }

    }

    AutoCallerClear acc;

    AutoCallerClear acc;

    RETURN_IF_BINDER_ERROR(binderStatusFromStatusT(mAudioPolicyManager->getAudioPort(&port)));

    RETURN_IF_BINDER_ERROR(binderStatusFromStatusT(mAudioPolicyManager->getAudioPort(&port)));

    *_aidl_return = VALUE_OR_RETURN_BINDER_STATUS(legacy2aidl_audio_port_v7_AudioPort(port));

    *_aidl_return = VALUE_OR_RETURN_BINDER_STATUS(legacy2aidl_audio_port_v7_AudioPortFw(port));

    return Status::ok();

    return Status::ok();

}

}
@@ -1569,7 +1569,7 @@ Status AudioPolicyService::createAudioPatch(const media::AudioPatchFw& patchAidl 
                                            int32_t handleAidl,

                                            int32_t handleAidl,

                                            int32_t* _aidl_return) {

                                            int32_t* _aidl_return) {

    audio_patch patch = VALUE_OR_RETURN_BINDER_STATUS(

    audio_patch patch = VALUE_OR_RETURN_BINDER_STATUS(

            aidl2legacy_AudioPatch_audio_patch(patchAidl));

            aidl2legacy_AudioPatchFw_audio_patch(patchAidl));

    audio_patch_handle_t handle = VALUE_OR_RETURN_BINDER_STATUS(

    audio_patch_handle_t handle = VALUE_OR_RETURN_BINDER_STATUS(

            aidl2legacy_int32_t_audio_port_handle_t(handleAidl));

            aidl2legacy_int32_t_audio_port_handle_t(handleAidl));

    RETURN_IF_BINDER_ERROR(binderStatusFromStatusT(AudioValidator::validateAudioPatch(patch)));

    RETURN_IF_BINDER_ERROR(binderStatusFromStatusT(AudioValidator::validateAudioPatch(patch)));
@@ -1628,7 +1628,7 @@ Status AudioPolicyService::listAudioPatches(Int* count, 
    numPatchesReq = std::min(numPatchesReq, num_patches);

    numPatchesReq = std::min(numPatchesReq, num_patches);

    RETURN_IF_BINDER_ERROR(binderStatusFromStatusT(

    RETURN_IF_BINDER_ERROR(binderStatusFromStatusT(

            convertRange(patches.get(), patches.get() + numPatchesReq,

            convertRange(patches.get(), patches.get() + numPatchesReq,

                         std::back_inserter(*patchesAidl), legacy2aidl_audio_patch_AudioPatch)));

                         std::back_inserter(*patchesAidl), legacy2aidl_audio_patch_AudioPatchFw)));

    count->value = VALUE_OR_RETURN_BINDER_STATUS(convertIntegral<int32_t>(num_patches));

    count->value = VALUE_OR_RETURN_BINDER_STATUS(convertIntegral<int32_t>(num_patches));

    *_aidl_return = VALUE_OR_RETURN_BINDER_STATUS(convertIntegral<int32_t>(generation));

    *_aidl_return = VALUE_OR_RETURN_BINDER_STATUS(convertIntegral<int32_t>(generation));

    return Status::ok();

    return Status::ok();
@@ -1637,7 +1637,7 @@ Status AudioPolicyService::listAudioPatches(Int* count, 
Status AudioPolicyService::setAudioPortConfig(const media::AudioPortConfigFw& configAidl)

Status AudioPolicyService::setAudioPortConfig(const media::AudioPortConfigFw& configAidl)

{

{

    audio_port_config config = VALUE_OR_RETURN_BINDER_STATUS(

    audio_port_config config = VALUE_OR_RETURN_BINDER_STATUS(

            aidl2legacy_AudioPortConfig_audio_port_config(configAidl));

            aidl2legacy_AudioPortConfigFw_audio_port_config(configAidl));

    RETURN_IF_BINDER_ERROR(

    RETURN_IF_BINDER_ERROR(

            binderStatusFromStatusT(AudioValidator::validateAudioPortConfig(config)));

            binderStatusFromStatusT(AudioValidator::validateAudioPortConfig(config)));
@@ -1811,7 +1811,7 @@ Status AudioPolicyService::startAudioSource(const media::AudioPortConfigFw& sour 
                                            const media::AudioAttributesInternal& attributesAidl,

                                            const media::AudioAttributesInternal& attributesAidl,

                                            int32_t* _aidl_return) {

                                            int32_t* _aidl_return) {

    audio_port_config source = VALUE_OR_RETURN_BINDER_STATUS(

    audio_port_config source = VALUE_OR_RETURN_BINDER_STATUS(

            aidl2legacy_AudioPortConfig_audio_port_config(sourceAidl));

            aidl2legacy_AudioPortConfigFw_audio_port_config(sourceAidl));

    audio_attributes_t attributes = VALUE_OR_RETURN_BINDER_STATUS(

    audio_attributes_t attributes = VALUE_OR_RETURN_BINDER_STATUS(

            aidl2legacy_AudioAttributesInternal_audio_attributes_t(attributesAidl));

            aidl2legacy_AudioAttributesInternal_audio_attributes_t(attributesAidl));

    audio_port_handle_t portId;

    audio_port_handle_t portId;