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

Commit 874e7592 authored by Atneya Nair's avatar Atneya Nair Committed by Automerger Merge Worker
Browse files

Rename AudioPatch to AudioPatchFw am: b6c50a3b am: 231dad5e 

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



Change-Id: I59a3e420165707c1003e5d2c39c429c5943d8435
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f1e49b87 231dad5e

media/libaudioclient/AidlConversion.cpp

+3 −3
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ ConversionResult<media::AudioPortConfigFw> legacy2aidl_audio_port_config_AudioPo 
}



ConversionResult<struct audio_patch> aidl2legacy_AudioPatch_audio_patch(

        const media::AudioPatch& aidl) {

        const media::AudioPatchFw& aidl) {

    struct audio_patch legacy;

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

    legacy.num_sinks = VALUE_OR_RETURN(convertIntegral<unsigned int>(aidl.sinks.size()));
@@ -514,9 +514,9 @@ ConversionResult<struct audio_patch> aidl2legacy_AudioPatch_audio_patch( 
    return legacy;

}



ConversionResult<media::AudioPatch> legacy2aidl_audio_patch_AudioPatch(

ConversionResult<media::AudioPatchFw> legacy2aidl_audio_patch_AudioPatch(

        const struct audio_patch& legacy) {

    media::AudioPatch aidl;

    media::AudioPatchFw aidl;

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



    if (legacy.num_sinks > AUDIO_PATCH_PORTS_MAX) {

media/libaudioclient/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ aidl_interface { 
        "aidl/android/media/AudioHalVersion.aidl",

        "aidl/android/media/AudioIoConfigEvent.aidl",

        "aidl/android/media/AudioIoDescriptor.aidl",

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

        "aidl/android/media/AudioPatchFw.aidl",

        "aidl/android/media/AudioPortFw.aidl",

        "aidl/android/media/AudioPortSys.aidl",

        "aidl/android/media/AudioPortConfigFw.aidl",

media/libaudioclient/AudioSystem.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1567,7 +1567,7 @@ status_t AudioSystem::createAudioPatch(const struct audio_patch* patch, 
    const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();

    if (aps == 0) return PERMISSION_DENIED;



    media::AudioPatch patchAidl = VALUE_OR_RETURN_STATUS(

    media::AudioPatchFw patchAidl = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_patch_AudioPatch(*patch));

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

    RETURN_STATUS_IF_ERROR(
@@ -1598,7 +1598,7 @@ status_t AudioSystem::listAudioPatches(unsigned int* num_patches, 


    Int numPatchesAidl;

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

    std::vector<media::AudioPatch> patchesAidl;

    std::vector<media::AudioPatchFw> patchesAidl;

    int32_t generationAidl;



    RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(

media/libaudioclient/IAudioFlinger.cpp

+5 −4
Original line number Diff line number Diff line
@@ -677,7 +677,8 @@ status_t AudioFlingerClientAdapter::getAudioPort(struct audio_port_v7* port) { 


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

                                                     audio_patch_handle_t* handle) {

    media::AudioPatch patchAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_patch_AudioPatch(*patch));

    media::AudioPatchFw patchAidl = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_patch_AudioPatch(*patch));

    int32_t aidlRet = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_patch_handle_t_int32_t(

                    AUDIO_PATCH_HANDLE_NONE));

    if (handle != nullptr) {
@@ -698,7 +699,7 @@ status_t AudioFlingerClientAdapter::releaseAudioPatch(audio_patch_handle_t handl 


status_t AudioFlingerClientAdapter::listAudioPatches(unsigned int* num_patches,

                                                     struct audio_patch* patches) {

    std::vector<media::AudioPatch> aidlRet;

    std::vector<media::AudioPatchFw> aidlRet;

    int32_t maxPatches = VALUE_OR_RETURN_STATUS(convertIntegral<int32_t>(*num_patches));

    RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(

            mDelegate->listAudioPatches(maxPatches, &aidlRet)));
@@ -1246,7 +1247,7 @@ Status AudioFlingerServerAdapter::getAudioPort(const media::AudioPortFw& port, 
    return Status::ok();

}



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

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

                                                   int32_t* _aidl_return) {

    audio_patch patchLegacy = VALUE_OR_RETURN_BINDER(aidl2legacy_AudioPatch_audio_patch(patch));

    audio_patch_handle_t handleLegacy = VALUE_OR_RETURN_BINDER(
@@ -1263,7 +1264,7 @@ Status AudioFlingerServerAdapter::releaseAudioPatch(int32_t handle) { 
}



Status AudioFlingerServerAdapter::listAudioPatches(int32_t maxCount,

                            std::vector<media::AudioPatch>* _aidl_return) {

                            std::vector<media::AudioPatchFw>* _aidl_return) {

    unsigned int count = VALUE_OR_RETURN_BINDER(convertIntegral<unsigned int>(maxCount));

    count = std::min(count, static_cast<unsigned int>(MAX_ITEMS_PER_LIST));

    std::unique_ptr<audio_patch[]> patchesLegacy(new audio_patch[count]);

media/libaudioclient/aidl/android/media/AudioIoDescriptor.aidl

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package android.media;



import android.media.AudioPatch;

import android.media.AudioPatchFw;

import android.media.audio.common.AudioChannelLayout;

import android.media.audio.common.AudioFormatDescription;
@@ -26,7 +26,7 @@ import android.media.audio.common.AudioFormatDescription; 
parcelable AudioIoDescriptor {

    /** Interpreted as audio_io_handle_t. */

    int ioHandle;

    AudioPatch patch;

    AudioPatchFw patch;

    boolean isInput;

    int samplingRate;

    AudioFormatDescription format;