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

Commit 3263821d authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge changes I85952846,I049faa30 

* changes:
  Audio Aidl: Unify naming for conversion methods
  Audio Aidl: update switch handling
parents e27cf726 973638a1

media/libaudioclient/AidlConversion.cpp

+116 −115

File changed.

Preview size limit exceeded, changes collapsed.

media/libaudioclient/AudioTrack.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2819,7 +2819,7 @@ status_t AudioTrack::getTimestamp_l(AudioTimestamp& timestamp) 
        media::AudioTimestampInternal ts;

        mAudioTrack->getTimestamp(&ts, &status);

        if (status == OK) {

            timestamp = VALUE_OR_FATAL(aidl2legacy_AudioTimestamp(ts));

            timestamp = VALUE_OR_FATAL(aidl2legacy_AudioTimestampInternal_AudioTimestamp(ts));

        }

    } else {

        // read timestamp from shared memory

media/libaudioclient/IAudioFlinger.cpp

+12 −12
Original line number Diff line number Diff line
@@ -55,13 +55,13 @@ ConversionResult<media::CreateTrackRequest> IAudioFlinger::CreateTrackInput::toA 
    media::CreateTrackRequest aidl;

    aidl.attr = VALUE_OR_RETURN(legacy2aidl_audio_attributes_t_AudioAttributesInternal(attr));

    aidl.config = VALUE_OR_RETURN(legacy2aidl_audio_config_t_AudioConfig(config));

    aidl.clientInfo = VALUE_OR_RETURN(legacy2aidl_AudioClient(clientInfo));

    aidl.clientInfo = VALUE_OR_RETURN(legacy2aidl_AudioClient_AudioClient(clientInfo));

    aidl.sharedBuffer = VALUE_OR_RETURN(legacy2aidl_NullableIMemory_SharedFileRegion(sharedBuffer));

    aidl.notificationsPerBuffer = VALUE_OR_RETURN(convertIntegral<int32_t>(notificationsPerBuffer));

    aidl.speed = speed;

    aidl.audioTrackCallback = audioTrackCallback;

    aidl.opPackageName = opPackageName;

    aidl.flags = VALUE_OR_RETURN(legacy2aidl_audio_output_flags_mask(flags));

    aidl.flags = VALUE_OR_RETURN(legacy2aidl_audio_output_flags_t_int32_t_mask(flags));

    aidl.frameCount = VALUE_OR_RETURN(convertIntegral<int64_t>(frameCount));

    aidl.notificationFrameCount = VALUE_OR_RETURN(convertIntegral<int64_t>(notificationFrameCount));

    aidl.selectedDeviceId = VALUE_OR_RETURN(
@@ -75,14 +75,14 @@ IAudioFlinger::CreateTrackInput::fromAidl(const media::CreateTrackRequest& aidl) 
    IAudioFlinger::CreateTrackInput legacy;

    legacy.attr = VALUE_OR_RETURN(aidl2legacy_AudioAttributesInternal_audio_attributes_t(aidl.attr));

    legacy.config = VALUE_OR_RETURN(aidl2legacy_AudioConfig_audio_config_t(aidl.config));

    legacy.clientInfo = VALUE_OR_RETURN(aidl2legacy_AudioClient(aidl.clientInfo));

    legacy.clientInfo = VALUE_OR_RETURN(aidl2legacy_AudioClient_AudioClient(aidl.clientInfo));

    legacy.sharedBuffer = VALUE_OR_RETURN(aidl2legacy_NullableSharedFileRegion_IMemory(aidl.sharedBuffer));

    legacy.notificationsPerBuffer = VALUE_OR_RETURN(

            convertIntegral<uint32_t>(aidl.notificationsPerBuffer));

    legacy.speed = aidl.speed;

    legacy.audioTrackCallback = aidl.audioTrackCallback;

    legacy.opPackageName = aidl.opPackageName;

    legacy.flags = VALUE_OR_RETURN(aidl2legacy_audio_output_flags_mask(aidl.flags));

    legacy.flags = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_output_flags_t_mask(aidl.flags));

    legacy.frameCount = VALUE_OR_RETURN(convertIntegral<size_t>(aidl.frameCount));

    legacy.notificationFrameCount = VALUE_OR_RETURN(

            convertIntegral<size_t>(aidl.notificationFrameCount));
@@ -95,7 +95,7 @@ IAudioFlinger::CreateTrackInput::fromAidl(const media::CreateTrackRequest& aidl) 
ConversionResult<media::CreateTrackResponse>

IAudioFlinger::CreateTrackOutput::toAidl() const {

    media::CreateTrackResponse aidl;

    aidl.flags = VALUE_OR_RETURN(legacy2aidl_audio_output_flags_mask(flags));

    aidl.flags = VALUE_OR_RETURN(legacy2aidl_audio_output_flags_t_int32_t_mask(flags));

    aidl.frameCount = VALUE_OR_RETURN(convertIntegral<int64_t>(frameCount));

    aidl.notificationFrameCount = VALUE_OR_RETURN(convertIntegral<int64_t>(notificationFrameCount));

    aidl.selectedDeviceId = VALUE_OR_RETURN(
@@ -115,7 +115,7 @@ ConversionResult<IAudioFlinger::CreateTrackOutput> 
IAudioFlinger::CreateTrackOutput::fromAidl(

        const media::CreateTrackResponse& aidl) {

    IAudioFlinger::CreateTrackOutput legacy;

    legacy.flags = VALUE_OR_RETURN(aidl2legacy_audio_output_flags_mask(aidl.flags));

    legacy.flags = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_output_flags_t_mask(aidl.flags));

    legacy.frameCount = VALUE_OR_RETURN(convertIntegral<size_t>(aidl.frameCount));

    legacy.notificationFrameCount = VALUE_OR_RETURN(

            convertIntegral<size_t>(aidl.notificationFrameCount));
@@ -137,10 +137,10 @@ IAudioFlinger::CreateRecordInput::toAidl() const { 
    media::CreateRecordRequest aidl;

    aidl.attr = VALUE_OR_RETURN(legacy2aidl_audio_attributes_t_AudioAttributesInternal(attr));

    aidl.config = VALUE_OR_RETURN(legacy2aidl_audio_config_base_t_AudioConfigBase(config));

    aidl.clientInfo = VALUE_OR_RETURN(legacy2aidl_AudioClient(clientInfo));

    aidl.clientInfo = VALUE_OR_RETURN(legacy2aidl_AudioClient_AudioClient(clientInfo));

    aidl.opPackageName = VALUE_OR_RETURN(legacy2aidl_String16_string(opPackageName));

    aidl.riid = VALUE_OR_RETURN(legacy2aidl_audio_unique_id_t_int32_t(riid));

    aidl.flags = VALUE_OR_RETURN(legacy2aidl_audio_input_flags_mask(flags));

    aidl.flags = VALUE_OR_RETURN(legacy2aidl_audio_input_flags_t_int32_t_mask(flags));

    aidl.frameCount = VALUE_OR_RETURN(convertIntegral<int64_t>(frameCount));

    aidl.notificationFrameCount = VALUE_OR_RETURN(convertIntegral<int64_t>(notificationFrameCount));

    aidl.selectedDeviceId = VALUE_OR_RETURN(
@@ -155,10 +155,10 @@ IAudioFlinger::CreateRecordInput::fromAidl( 
    IAudioFlinger::CreateRecordInput legacy;

    legacy.attr = VALUE_OR_RETURN(aidl2legacy_AudioAttributesInternal_audio_attributes_t(aidl.attr));

    legacy.config = VALUE_OR_RETURN(aidl2legacy_AudioConfigBase_audio_config_base_t(aidl.config));

    legacy.clientInfo = VALUE_OR_RETURN(aidl2legacy_AudioClient(aidl.clientInfo));

    legacy.clientInfo = VALUE_OR_RETURN(aidl2legacy_AudioClient_AudioClient(aidl.clientInfo));

    legacy.opPackageName = VALUE_OR_RETURN(aidl2legacy_string_view_String16(aidl.opPackageName));

    legacy.riid = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_unique_id_t(aidl.riid));

    legacy.flags = VALUE_OR_RETURN(aidl2legacy_audio_input_flags_mask(aidl.flags));

    legacy.flags = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_input_flags_t_mask(aidl.flags));

    legacy.frameCount = VALUE_OR_RETURN(convertIntegral<size_t>(aidl.frameCount));

    legacy.notificationFrameCount = VALUE_OR_RETURN(

            convertIntegral<size_t>(aidl.notificationFrameCount));
@@ -171,7 +171,7 @@ IAudioFlinger::CreateRecordInput::fromAidl( 
ConversionResult<media::CreateRecordResponse>

IAudioFlinger::CreateRecordOutput::toAidl() const {

    media::CreateRecordResponse aidl;

    aidl.flags = VALUE_OR_RETURN(legacy2aidl_audio_input_flags_mask(flags));

    aidl.flags = VALUE_OR_RETURN(legacy2aidl_audio_input_flags_t_int32_t_mask(flags));

    aidl.frameCount = VALUE_OR_RETURN(convertIntegral<int64_t>(frameCount));

    aidl.notificationFrameCount = VALUE_OR_RETURN(convertIntegral<int64_t>(notificationFrameCount));

    aidl.selectedDeviceId = VALUE_OR_RETURN(
@@ -190,7 +190,7 @@ ConversionResult<IAudioFlinger::CreateRecordOutput> 
IAudioFlinger::CreateRecordOutput::fromAidl(

        const media::CreateRecordResponse& aidl) {

    IAudioFlinger::CreateRecordOutput legacy;

    legacy.flags = VALUE_OR_RETURN(aidl2legacy_audio_input_flags_mask(aidl.flags));

    legacy.flags = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_input_flags_t_mask(aidl.flags));

    legacy.frameCount = VALUE_OR_RETURN(convertIntegral<size_t>(aidl.frameCount));

    legacy.notificationFrameCount = VALUE_OR_RETURN(

            convertIntegral<size_t>(aidl.notificationFrameCount));

media/libaudioclient/include/media/AidlConversion.h

+29 −17
Original line number Diff line number Diff line
@@ -80,10 +80,12 @@ ConversionResult<int32_t> legacy2aidl_audio_unique_id_t_int32_t(audio_unique_id_ 
ConversionResult<audio_hw_sync_t> aidl2legacy_int32_t_audio_hw_sync_t(int32_t aidl);

ConversionResult<int32_t> legacy2aidl_audio_hw_sync_t_int32_t(audio_hw_sync_t legacy);



// The legacy enum is unnamed. Thus, we use int.

ConversionResult<int> aidl2legacy_AudioPortConfigType(media::AudioPortConfigType aidl);

// The legacy enum is unnamed. Thus, we use int.

ConversionResult<media::AudioPortConfigType> legacy2aidl_AudioPortConfigType(int legacy);

// The legacy enum is unnamed. Thus, we use int32_t.

ConversionResult<int32_t> aidl2legacy_AudioPortConfigType_int32_t(

        media::AudioPortConfigType aidl);

// The legacy enum is unnamed. Thus, we use int32_t.

ConversionResult<media::AudioPortConfigType> legacy2aidl_int32_t_AudioPortConfigType(

        int32_t legacy);



ConversionResult<unsigned int> aidl2legacy_int32_t_config_mask(int32_t aidl);

ConversionResult<int32_t> legacy2aidl_config_mask_int32_t(unsigned int legacy);
@@ -129,7 +131,7 @@ ConversionResult<media::AudioGainMode> 
legacy2aidl_audio_gain_mode_t_AudioGainMode(audio_gain_mode_t legacy);



ConversionResult<audio_gain_mode_t> aidl2legacy_int32_t_audio_gain_mode_t_mask(int32_t aidl);

ConversionResult<int32_t> legacy2aidl_audio_gain_mode_t_mask_int32_t(audio_gain_mode_t legacy);

ConversionResult<int32_t> legacy2aidl_audio_gain_mode_t_int32_t_mask(audio_gain_mode_t legacy);



ConversionResult<audio_devices_t> aidl2legacy_int32_t_audio_devices_t(int32_t aidl);

ConversionResult<int32_t> legacy2aidl_audio_devices_t_int32_t(audio_devices_t legacy);
@@ -149,20 +151,26 @@ ConversionResult<audio_output_flags_t> aidl2legacy_AudioOutputFlags_audio_output 
ConversionResult<media::AudioOutputFlags> legacy2aidl_audio_output_flags_t_AudioOutputFlags(

        audio_output_flags_t legacy);



ConversionResult<audio_input_flags_t> aidl2legacy_audio_input_flags_mask(int32_t aidl);

ConversionResult<int32_t> legacy2aidl_audio_input_flags_mask(audio_input_flags_t legacy);

ConversionResult<audio_input_flags_t> aidl2legacy_int32_t_audio_input_flags_t_mask(

        int32_t aidl);

ConversionResult<int32_t> legacy2aidl_audio_input_flags_t_int32_t_mask(

        audio_input_flags_t legacy);



ConversionResult<audio_output_flags_t> aidl2legacy_audio_output_flags_mask(int32_t aidl);

ConversionResult<int32_t> legacy2aidl_audio_output_flags_mask(audio_output_flags_t legacy);

ConversionResult<audio_output_flags_t> aidl2legacy_int32_t_audio_output_flags_t_mask(

        int32_t aidl);

ConversionResult<int32_t> legacy2aidl_audio_output_flags_t_int32_t_mask(

        audio_output_flags_t legacy);



ConversionResult<audio_io_flags> aidl2legacy_AudioIoFlags_audio_io_flags(

        const media::AudioIoFlags& aidl, media::AudioPortRole role, media::AudioPortType type);

ConversionResult<media::AudioIoFlags> legacy2aidl_audio_io_flags_AudioIoFlags(

        const audio_io_flags& legacy, audio_port_role_t role, audio_port_type_t type);



ConversionResult<audio_port_config_device_ext> aidl2legacy_AudioPortConfigDeviceExt(

ConversionResult<audio_port_config_device_ext>

aidl2legacy_AudioPortConfigDeviceExt_audio_port_config_device_ext(

        const media::AudioPortConfigDeviceExt& aidl);

ConversionResult<media::AudioPortConfigDeviceExt> legacy2aidl_AudioPortConfigDeviceExt(

ConversionResult<media::AudioPortConfigDeviceExt>

legacy2aidl_audio_port_config_device_ext_AudioPortConfigDeviceExt(

        const audio_port_config_device_ext& legacy);



ConversionResult<audio_stream_type_t> aidl2legacy_AudioStreamType_audio_stream_type_t(
@@ -183,9 +191,11 @@ ConversionResult<audio_port_config_mix_ext> aidl2legacy_AudioPortConfigMixExt( 
ConversionResult<media::AudioPortConfigMixExt> legacy2aidl_AudioPortConfigMixExt(

        const audio_port_config_mix_ext& legacy, audio_port_role_t role);



ConversionResult<audio_port_config_session_ext> aidl2legacy_AudioPortConfigSessionExt(

ConversionResult<audio_port_config_session_ext>

aidl2legacy_AudioPortConfigSessionExt_audio_port_config_session_ext(

        const media::AudioPortConfigSessionExt& aidl);

ConversionResult<media::AudioPortConfigSessionExt> legacy2aidl_AudioPortConfigSessionExt(

ConversionResult<media::AudioPortConfigSessionExt>

legacy2aidl_audio_port_config_session_ext_AudioPortConfigSessionExt(

        const audio_port_config_session_ext& legacy);



ConversionResult<audio_port_config> aidl2legacy_AudioPortConfig_audio_port_config(
@@ -204,8 +214,10 @@ ConversionResult<sp<AudioIoDescriptor>> aidl2legacy_AudioIoDescriptor_AudioIoDes 
ConversionResult<media::AudioIoDescriptor> legacy2aidl_AudioIoDescriptor_AudioIoDescriptor(

        const sp<AudioIoDescriptor>& legacy);



ConversionResult<AudioClient> aidl2legacy_AudioClient(const media::AudioClient& aidl);

ConversionResult<media::AudioClient> legacy2aidl_AudioClient(const AudioClient& legacy);

ConversionResult<AudioClient> aidl2legacy_AudioClient_AudioClient(

        const media::AudioClient& aidl);

ConversionResult<media::AudioClient> legacy2aidl_AudioClient_AudioClient(

        const AudioClient& legacy);



ConversionResult<audio_content_type_t>

aidl2legacy_AudioContentType_audio_content_type_t(media::AudioContentType aidl);
@@ -263,9 +275,9 @@ ConversionResult<std::optional<media::SharedFileRegion>> 
legacy2aidl_NullableIMemory_SharedFileRegion(const sp<IMemory>& legacy);



ConversionResult<AudioTimestamp>

aidl2legacy_AudioTimestamp(const media::AudioTimestampInternal& aidl);

aidl2legacy_AudioTimestampInternal_AudioTimestamp(const media::AudioTimestampInternal& aidl);

ConversionResult<media::AudioTimestampInternal>

legacy2aidl_AudioTimestamp(const AudioTimestamp& legacy);

legacy2aidl_AudioTimestamp_AudioTimestampInternal(const AudioTimestamp& legacy);



ConversionResult<audio_uuid_t>

aidl2legacy_AudioUuid_audio_uuid_t(const media::AudioUuid& aidl);

media/libaudiofoundation/AudioGain.cpp

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ status_t AudioGain::writeToParcelable(media::AudioGain* parcelable) const { 
    parcelable->useInChannelMask = mUseInChannelMask;

    parcelable->useForVolume = mUseForVolume;

    parcelable->mode = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_gain_mode_t_mask_int32_t(mGain.mode));

            legacy2aidl_audio_gain_mode_t_int32_t_mask(mGain.mode));

    parcelable->channelMask = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_channel_mask_t_int32_t(mGain.channel_mask));

    parcelable->minValue = VALUE_OR_RETURN_STATUS(convertIntegral<int32_t>(mGain.min_value));