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

Commit 50e016a9 authored by Ytai Ben-Tsvi's avatar Ytai Ben-Tsvi
Browse files

Prepare openOutput() signature to AIDL conversion 

The purpose is to avoid having more than one primitive output
argument and to avoid in/out arguments.
Test: Audio-related CTS tests from CtsMediaTestCases

Change-Id: I827f99755f85bd58f3088c9445add52848763fa0
parent 1ff75699

media/libaudioclient/AidlConversion.cpp

+76 −4
Original line number Diff line number Diff line
@@ -1515,7 +1515,7 @@ legacy2aidl_audio_attributes_t_AudioAttributesInternal(const audio_attributes_t& 
}



ConversionResult<audio_encapsulation_mode_t>

aidl2legacy_audio_encapsulation_mode_t_AudioEncapsulationMode(media::AudioEncapsulationMode aidl) {

aidl2legacy_AudioEncapsulationMode_audio_encapsulation_mode_t(media::AudioEncapsulationMode aidl) {

    switch (aidl) {

        case media::AudioEncapsulationMode::NONE:

            return AUDIO_ENCAPSULATION_MODE_NONE;
@@ -1528,7 +1528,7 @@ aidl2legacy_audio_encapsulation_mode_t_AudioEncapsulationMode(media::AudioEncaps 
}



ConversionResult<media::AudioEncapsulationMode>

legacy2aidl_AudioEncapsulationMode_audio_encapsulation_mode_t(audio_encapsulation_mode_t legacy) {

legacy2aidl_audio_encapsulation_mode_t_AudioEncapsulationMode(audio_encapsulation_mode_t legacy) {

    switch (legacy) {

        case AUDIO_ENCAPSULATION_MODE_NONE:

            return media::AudioEncapsulationMode::NONE;
@@ -1560,7 +1560,7 @@ aidl2legacy_AudioOffloadInfo_audio_offload_info_t(const media::AudioOffloadInfo& 
    legacy.offload_buffer_size = VALUE_OR_RETURN(convertIntegral<uint32_t>(aidl.offloadBufferSize));

    legacy.usage = VALUE_OR_RETURN(aidl2legacy_AudioUsage_audio_usage_t(aidl.usage));

    legacy.encapsulation_mode = VALUE_OR_RETURN(

            aidl2legacy_audio_encapsulation_mode_t_AudioEncapsulationMode(aidl.encapsulationMode));

            aidl2legacy_AudioEncapsulationMode_audio_encapsulation_mode_t(aidl.encapsulationMode));

    legacy.content_id = VALUE_OR_RETURN(convertReinterpret<int32_t>(aidl.contentId));

    legacy.sync_id = VALUE_OR_RETURN(convertReinterpret<int32_t>(aidl.syncId));

    return legacy;
@@ -1595,7 +1595,7 @@ legacy2aidl_audio_offload_info_t_AudioOffloadInfo(const audio_offload_info_t& le 
            return unexpected(BAD_VALUE);

        }

        aidl.encapsulationMode = VALUE_OR_RETURN(

                legacy2aidl_AudioEncapsulationMode_audio_encapsulation_mode_t(

                legacy2aidl_audio_encapsulation_mode_t_AudioEncapsulationMode(

                        legacy.encapsulation_mode));

        aidl.contentId = VALUE_OR_RETURN(convertReinterpret<int32_t>(legacy.content_id));

        aidl.syncId = VALUE_OR_RETURN(convertReinterpret<int32_t>(legacy.sync_id));
@@ -1758,4 +1758,76 @@ legacy2aidl_effect_descriptor_t_EffectDescriptor(const effect_descriptor_t& lega 
    return aidl;

}



ConversionResult<audio_encapsulation_metadata_type_t>

aidl2legacy_AudioEncapsulationMetadataType_audio_encapsulation_metadata_type_t(

        media::AudioEncapsulationMetadataType aidl) {

    switch (aidl) {

        case media::AudioEncapsulationMetadataType::NONE:

            return AUDIO_ENCAPSULATION_METADATA_TYPE_NONE;

        case media::AudioEncapsulationMetadataType::FRAMEWORK_TUNER:

            return AUDIO_ENCAPSULATION_METADATA_TYPE_FRAMEWORK_TUNER;

        case media::AudioEncapsulationMetadataType::DVB_AD_DESCRIPTOR:

            return AUDIO_ENCAPSULATION_METADATA_TYPE_DVB_AD_DESCRIPTOR;

    }

    return unexpected(BAD_VALUE);

}



ConversionResult<media::AudioEncapsulationMetadataType>

legacy2aidl_audio_encapsulation_metadata_type_t_AudioEncapsulationMetadataType(

        audio_encapsulation_metadata_type_t legacy) {

    switch (legacy) {

        case AUDIO_ENCAPSULATION_METADATA_TYPE_NONE:

            return media::AudioEncapsulationMetadataType::NONE;

        case AUDIO_ENCAPSULATION_METADATA_TYPE_FRAMEWORK_TUNER:

            return media::AudioEncapsulationMetadataType::FRAMEWORK_TUNER;

        case AUDIO_ENCAPSULATION_METADATA_TYPE_DVB_AD_DESCRIPTOR:

            return media::AudioEncapsulationMetadataType::DVB_AD_DESCRIPTOR;

    }

    return unexpected(BAD_VALUE);

}



ConversionResult<uint32_t>

aidl2legacy_AudioEncapsulationMode_mask(int32_t aidl) {

    return convertBitmask<uint32_t,

                          int32_t,

                          audio_encapsulation_mode_t,

                          media::AudioEncapsulationMode>(

            aidl, aidl2legacy_AudioEncapsulationMode_audio_encapsulation_mode_t,

            index2enum_index<media::AudioEncapsulationMode>,

            enumToMask_index<uint32_t, audio_encapsulation_mode_t>);

}



ConversionResult<int32_t>

legacy2aidl_AudioEncapsulationMode_mask(uint32_t legacy) {

    return convertBitmask<int32_t,

                          uint32_t,

                          media::AudioEncapsulationMode,

                          audio_encapsulation_mode_t>(

            legacy, legacy2aidl_audio_encapsulation_mode_t_AudioEncapsulationMode,

            index2enum_index<audio_encapsulation_mode_t>,

            enumToMask_index<int32_t, media::AudioEncapsulationMode>);

}



ConversionResult<uint32_t>

aidl2legacy_AudioEncapsulationMetadataType_mask(int32_t aidl) {

    return convertBitmask<uint32_t,

                          int32_t,

                          audio_encapsulation_metadata_type_t,

                          media::AudioEncapsulationMetadataType>(

            aidl, aidl2legacy_AudioEncapsulationMetadataType_audio_encapsulation_metadata_type_t,

            index2enum_index<media::AudioEncapsulationMetadataType>,

            enumToMask_index<uint32_t, audio_encapsulation_metadata_type_t>);

}



ConversionResult<int32_t>

legacy2aidl_AudioEncapsulationMetadataType_mask(uint32_t legacy) {

    return convertBitmask<int32_t,

                          uint32_t,

                          media::AudioEncapsulationMetadataType,

                          audio_encapsulation_metadata_type_t>(

            legacy, legacy2aidl_audio_encapsulation_metadata_type_t_AudioEncapsulationMetadataType,

            index2enum_index<audio_encapsulation_metadata_type_t>,

            enumToMask_index<int32_t, media::AudioEncapsulationMetadataType>);

}



}  // namespace android

media/libaudioclient/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -243,7 +243,9 @@ aidl_interface { 
        "aidl/android/media/AudioContentType.aidl",

        "aidl/android/media/AudioDevice.aidl",

        "aidl/android/media/AudioEncapsulationMode.aidl",

        "aidl/android/media/AudioEncapsulationMetadataType.aidl",

        "aidl/android/media/AudioFlag.aidl",

        "aidl/android/media/AudioGain.aidl",

        "aidl/android/media/AudioGainConfig.aidl",

        "aidl/android/media/AudioGainMode.aidl",

        "aidl/android/media/AudioInputFlags.aidl",
@@ -254,6 +256,7 @@ aidl_interface { 
        "aidl/android/media/AudioOffloadInfo.aidl",

        "aidl/android/media/AudioOutputFlags.aidl",

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

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

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

        "aidl/android/media/AudioPortConfigType.aidl",

        "aidl/android/media/AudioPortConfigDeviceExt.aidl",
@@ -263,12 +266,14 @@ aidl_interface { 
        "aidl/android/media/AudioPortConfigSessionExt.aidl",

        "aidl/android/media/AudioPortRole.aidl",

        "aidl/android/media/AudioPortType.aidl",

        "aidl/android/media/AudioProfile.aidl",

        "aidl/android/media/AudioSourceType.aidl",

        "aidl/android/media/AudioStreamType.aidl",

        "aidl/android/media/AudioTimestampInternal.aidl",

        "aidl/android/media/AudioUniqueIdUse.aidl",

        "aidl/android/media/AudioUsage.aidl",

        "aidl/android/media/AudioUuid.aidl",

        "aidl/android/media/DeviceDescriptorBase.aidl",

        "aidl/android/media/EffectDescriptor.aidl",

    ],

    imports: [
@@ -300,6 +305,8 @@ aidl_interface { 
        "aidl/android/media/CreateTrackResponse.aidl",

        "aidl/android/media/OpenInputRequest.aidl",

        "aidl/android/media/OpenInputResponse.aidl",

        "aidl/android/media/OpenOutputRequest.aidl",

        "aidl/android/media/OpenOutputResponse.aidl",



        "aidl/android/media/IAudioFlingerClient.aidl",

        "aidl/android/media/IAudioRecord.aidl",

media/libaudioclient/IAudioFlinger.cpp

+15 −52
Original line number Diff line number Diff line
@@ -530,37 +530,16 @@ public: 
        return reply.readInt64();

    }



    virtual status_t openOutput(audio_module_handle_t module,

                                audio_io_handle_t *output,

                                audio_config_t *config,

                                const sp<DeviceDescriptorBase>& device,

                                uint32_t *latencyMs,

                                audio_output_flags_t flags)

    virtual status_t openOutput(const media::OpenOutputRequest& request,

                                media::OpenOutputResponse* response)

    {

        if (output == nullptr || config == nullptr || device == nullptr || latencyMs == nullptr) {

            return BAD_VALUE;

        }

        status_t status;

        Parcel data, reply;

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

        data.writeInt32(module);

        data.write(config, sizeof(audio_config_t));

        data.writeParcelable(*device);

        data.writeInt32((int32_t) flags);

        status_t status = remote()->transact(OPEN_OUTPUT, data, &reply);

        if (status != NO_ERROR) {

            *output = AUDIO_IO_HANDLE_NONE;

            return status;

        }

        status = (status_t)reply.readInt32();

        if (status != NO_ERROR) {

            *output = AUDIO_IO_HANDLE_NONE;

            return status;

        }

        *output = (audio_io_handle_t)reply.readInt32();

        ALOGV("openOutput() returned output, %d", *output);

        reply.read(config, sizeof(audio_config_t));

        *latencyMs = reply.readInt32();

        return NO_ERROR;

        return data.writeParcelable(request)

                ?: remote()->transact(OPEN_OUTPUT, data, &reply)

                ?: data.readInt32(&status)

                ?: status

                ?: data.readParcelable(response);

    }



    virtual audio_io_handle_t openDuplicateOutput(audio_io_handle_t output1,
@@ -1295,29 +1274,13 @@ status_t BnAudioFlinger::onTransact( 
        } break;

        case OPEN_OUTPUT: {

            CHECK_INTERFACE(IAudioFlinger, data, reply);

            audio_module_handle_t module = (audio_module_handle_t)data.readInt32();

            audio_config_t config = {};

            if (data.read(&config, sizeof(audio_config_t)) != NO_ERROR) {

                ALOGE("b/23905951");

            }

            sp<DeviceDescriptorBase> device = new DeviceDescriptorBase(AUDIO_DEVICE_NONE);

            status_t status = NO_ERROR;

            if ((status = data.readParcelable(device.get())) != NO_ERROR) {

                reply->writeInt32((int32_t)status);

                return NO_ERROR;

            }

            audio_output_flags_t flags = (audio_output_flags_t) data.readInt32();

            uint32_t latencyMs = 0;

            audio_io_handle_t output = AUDIO_IO_HANDLE_NONE;

            status = openOutput(module, &output, &config, device, &latencyMs, flags);

            ALOGV("OPEN_OUTPUT output, %d", output);

            reply->writeInt32((int32_t)status);

            if (status == NO_ERROR) {

                reply->writeInt32((int32_t)output);

                reply->write(&config, sizeof(audio_config_t));

                reply->writeInt32(latencyMs);

            }

            return NO_ERROR;

            status_t status;

            media::OpenOutputRequest request;

            media::OpenOutputResponse response;

            return data.readParcelable(&request)

                ?: (status = openOutput(request, &response), OK)

                ?: reply->writeInt32(status)

                ?: reply->writeParcelable(response);

        } break;

        case OPEN_DUPLICATE_OUTPUT: {

            CHECK_INTERFACE(IAudioFlinger, data, reply);

media/libaudioclient/aidl/android/media/AudioEncapsulationMetadataType.aidl

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package android.media;



/**

 * {@hide}

 */

@Backing(type="int")

enum AudioEncapsulationMetadataType {

    NONE = 0,

    FRAMEWORK_TUNER = 1,

    DVB_AD_DESCRIPTOR = 2,

}

media/libaudioclient/aidl/android/media/AudioGain.aidl

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.media;



/**

 * {@hide}

 */

parcelable AudioGain {

    int index;

    boolean useInChannelMask;

    boolean useForVolume;

    /** Bitmask, indexed by AudioGainMode. */

    int mode;

    /** Interpreted as audio_channel_mask_t. */

    int channelMask;

    int minValue;

    int maxValue;

    int defaultValue;

    int stepValue;

    int minRampMs;

    int maxRampMs;

}