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

Commit 025762e7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Syntax fix for AidlConversionNDK and DeviceHalHidl" into main am: 219bbc69 am: dc30635f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3237624



Change-Id: Icbe41760716ac7d6f1db547d8b2cbce003c3b457
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 685581c8 dc30635f

media/audioaidlconversion/AidlConversionNdk.cpp

+2 −1
Original line number Diff line number Diff line
@@ -197,7 +197,8 @@ legacy2aidl_record_track_metadata_v7_RecordTrackMetadata(const record_track_meta 


// static

ConversionResult<SourceMetadata>

legacy2aidl_SourceMetadata(const std::vector<playback_track_metadata_v7_t>& legacy) {

legacy2aidl_playback_track_metadata_v7_SourceMetadata(

        const std::vector<playback_track_metadata_v7_t>& legacy) {

    SourceMetadata aidl;

    aidl.tracks = VALUE_OR_RETURN(

            convertContainer<std::vector<PlaybackTrackMetadata>>(

media/audioaidlconversion/include/media/AidlConversionNdk.h

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ ConversionResult<hardware::audio::common::RecordTrackMetadata> 
legacy2aidl_record_track_metadata_v7_RecordTrackMetadata(const record_track_metadata_v7& legacy);



ConversionResult<hardware::audio::common::SourceMetadata>

legacy2aidl_SourceMetadata(const std::vector<playback_track_metadata_v7_t>& legacy);

legacy2aidl_playback_track_metadata_v7_SourceMetadata(

        const std::vector<playback_track_metadata_v7_t>& legacy);



}  // namespace android

}  // namespace aidl

media/libaudiohal/impl/DeviceHalAidl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ status_t DeviceHalAidl::openOutputStream( 
    int32_t aidlOutputFlags = VALUE_OR_RETURN_STATUS(

            ::aidl::android::legacy2aidl_audio_output_flags_t_int32_t_mask(flags));

    SourceMetadata aidlMetadata = VALUE_OR_RETURN_STATUS(

            ::aidl::android::legacy2aidl_SourceMetadata(sourceMetadata));

            ::aidl::android::legacy2aidl_playback_track_metadata_v7_SourceMetadata(sourceMetadata));

    AudioIoFlags aidlFlags = AudioIoFlags::make<AudioIoFlags::Tag::output>(aidlOutputFlags);

    AudioPortConfig mixPortConfig;

    AudioPatch aidlPatch;

media/libaudiohal/impl/DeviceHalHidl.cpp

+3 −5
Original line number Diff line number Diff line
@@ -280,11 +280,9 @@ status_t DeviceHalHidl::openOutputStream( 
    ::android::hardware::audio::common::COMMON_TYPES_CPP_VERSION::SourceMetadata hidlMetadata;

#endif



    if (status_t status = CoreUtils::sourceMetadataFromHalV7(

                sourceMetadata, true /*ignoreNonVendorTags*/, &hidlMetadata);

            status != OK) {

        return status;

    }

    RETURN_STATUS_IF_ERROR(CoreUtils::sourceMetadataFromHalV7(

            sourceMetadata, true /*ignoreNonVendorTags*/, &hidlMetadata

            ));



#if !(MAJOR_VERSION == 7 && MINOR_VERSION == 1)

    //TODO: b/193496180 use spatializer flag at audio HAL when available