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

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

Move encapsulation info fields to stable types 

Move the following fields from framework types to stable:
 - {AudioPortDeviceExtSys->AudioPortDeviceExt}.encapsulationModes
 - {AudioPortDeviceExtSys->AudioPortDeviceExt}.encapsulationMetadataTypes

This information is reported by the HAL and is used by
the framework.

Bug: 270731693
Test: atest audio_aidl_conversion_tests
Change-Id: I908761c34870f290366b1d0d343cb665511d8b9b
parent 4e012365

media/audioaidlconversion/AidlConversionCppNdk.cpp

+9 −0
Original line number Diff line number Diff line
@@ -2184,6 +2184,11 @@ aidl2legacy_AudioPortDeviceExt_audio_port_device_ext(const AudioPortDeviceExt& a 
    audio_port_device_ext legacy{};

    RETURN_IF_ERROR(aidl2legacy_AudioDevice_audio_device(

                    aidl.device, &legacy.type, legacy.address));

    legacy.encapsulation_modes = VALUE_OR_RETURN(

            aidl2legacy_AudioEncapsulationMode_mask(aidl.encapsulationModes));

    legacy.encapsulation_metadata_types = VALUE_OR_RETURN(

            aidl2legacy_AudioEncapsulationMetadataType_mask(

                    aidl.encapsulationMetadataTypes));

    return legacy;

}
@@ -2192,6 +2197,10 @@ ConversionResult<AudioPortDeviceExt> legacy2aidl_audio_port_device_ext_AudioPort 
    AudioPortDeviceExt aidl;

    aidl.device = VALUE_OR_RETURN(

            legacy2aidl_audio_device_AudioDevice(legacy.type, legacy.address));

    aidl.encapsulationModes = VALUE_OR_RETURN(

            legacy2aidl_AudioEncapsulationMode_mask(legacy.encapsulation_modes));

    aidl.encapsulationMetadataTypes = VALUE_OR_RETURN(

            legacy2aidl_AudioEncapsulationMetadataType_mask(legacy.encapsulation_metadata_types));

    return aidl;

}

media/libaudioclient/AidlConversion.cpp

+0 −9
Original line number Diff line number Diff line
@@ -724,11 +724,6 @@ aidl2legacy_AudioPortDeviceExt_audio_port_device_ext( 
            aidl2legacy_AudioPortDeviceExt_audio_port_device_ext(aidl));

    legacy.hw_module = VALUE_OR_RETURN(

            aidl2legacy_int32_t_audio_module_handle_t(aidlSys.hwModule));

    legacy.encapsulation_modes = VALUE_OR_RETURN(

            aidl2legacy_AudioEncapsulationMode_mask(aidlSys.encapsulationModes));

    legacy.encapsulation_metadata_types = VALUE_OR_RETURN(

            aidl2legacy_AudioEncapsulationMetadataType_mask(

                    aidlSys.encapsulationMetadataTypes));

    return legacy;

}
@@ -738,10 +733,6 @@ status_t legacy2aidl_audio_port_device_ext_AudioPortDeviceExt( 
    *aidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_port_device_ext_AudioPortDeviceExt(legacy));

    aidlDeviceExt->hwModule = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_module_handle_t_int32_t(legacy.hw_module));

    aidlDeviceExt->encapsulationModes = VALUE_OR_RETURN_STATUS(

            legacy2aidl_AudioEncapsulationMode_mask(legacy.encapsulation_modes));

    aidlDeviceExt->encapsulationMetadataTypes = VALUE_OR_RETURN_STATUS(

            legacy2aidl_AudioEncapsulationMetadataType_mask(legacy.encapsulation_metadata_types));

    return OK;

}

media/libaudioclient/aidl/android/media/AudioPortDeviceExtSys.aidl

+0 −4
Original line number Diff line number Diff line
@@ -22,8 +22,4 @@ package android.media; 
parcelable AudioPortDeviceExtSys {

    /** Module the device is attached to. Interpreted as audio_module_handle_t. */

    int hwModule;

    /** Bitmask, indexed by AudioEncapsulationMode. */

    int encapsulationModes;

    /** Bitmask, indexed by AudioEncapsulationMetadataType. */

    int encapsulationMetadataTypes;

}

media/libaudiofoundation/DeviceDescriptorBase.cpp

+8 −8
Original line number Diff line number Diff line
@@ -186,12 +186,12 @@ status_t DeviceDescriptorBase::writeToParcelable(media::AudioPortFw* parcelable) 
    deviceExt.encodedFormats = VALUE_OR_RETURN_STATUS(

            convertContainer<std::vector<media::audio::common::AudioFormatDescription>>(

                    mEncodedFormats, legacy2aidl_audio_format_t_AudioFormatDescription));

    UNION_SET(parcelable->hal.ext, device, deviceExt);

    media::AudioPortDeviceExtSys deviceSys;

    deviceSys.encapsulationModes = VALUE_OR_RETURN_STATUS(

    deviceExt.encapsulationModes = VALUE_OR_RETURN_STATUS(

            legacy2aidl_AudioEncapsulationMode_mask(mEncapsulationModes));

    deviceSys.encapsulationMetadataTypes = VALUE_OR_RETURN_STATUS(

    deviceExt.encapsulationMetadataTypes = VALUE_OR_RETURN_STATUS(

            legacy2aidl_AudioEncapsulationMetadataType_mask(mEncapsulationMetadataTypes));

    UNION_SET(parcelable->hal.ext, device, deviceExt);

    media::AudioPortDeviceExtSys deviceSys;

    UNION_SET(parcelable->sys.ext, device, deviceSys);

    return OK;

}
@@ -214,12 +214,12 @@ status_t DeviceDescriptorBase::readFromParcelable(const media::AudioPortFw& parc 
    mEncodedFormats = VALUE_OR_RETURN_STATUS(

            convertContainer<FormatVector>(deviceExt.encodedFormats,

                    aidl2legacy_AudioFormatDescription_audio_format_t));

    media::AudioPortDeviceExtSys deviceSys = VALUE_OR_RETURN_STATUS(

            UNION_GET(parcelable.sys.ext, device));

    mEncapsulationModes = VALUE_OR_RETURN_STATUS(

            aidl2legacy_AudioEncapsulationMode_mask(deviceSys.encapsulationModes));

            aidl2legacy_AudioEncapsulationMode_mask(deviceExt.encapsulationModes));

    mEncapsulationMetadataTypes = VALUE_OR_RETURN_STATUS(

            aidl2legacy_AudioEncapsulationMetadataType_mask(deviceSys.encapsulationMetadataTypes));

            aidl2legacy_AudioEncapsulationMetadataType_mask(deviceExt.encapsulationMetadataTypes));

    media::AudioPortDeviceExtSys deviceSys = VALUE_OR_RETURN_STATUS(

            UNION_GET(parcelable.sys.ext, device));

    return OK;

}