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

Commit 6cd5fbde authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Android (Google) Code Review
Browse files

Merge changes from topic "fix-b-198812639-audio-port" 

* changes:
  Split AudioPort/Config between fwk and android.media.audio.common
  Refactor AudioPort and AudioPortConfig
  Remove AudioMixLatencyClass enum from AIDL interfaces
  Remove AudioPortConfigType from AIDL interfaces
  Dedupe RETURN_STATUS_IF_ERROR macro
parents da9b73d4 0078ee57

media/libaudioclient/AidlConversion.cpp

+252 −280

File changed.

Preview size limit exceeded, changes collapsed.

media/libaudioclient/Android.bp

+5 −14
Original line number Diff line number Diff line
@@ -319,31 +319,23 @@ aidl_interface { 
        "aidl/android/media/AudioIoConfigEvent.aidl",

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

        "aidl/android/media/AudioIoFlags.aidl",

        "aidl/android/media/AudioMixLatencyClass.aidl",

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

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

        "aidl/android/media/AudioPlaybackRate.aidl",

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

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

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

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

        "aidl/android/media/AudioPortConfigDeviceExt.aidl",

        "aidl/android/media/AudioPortConfigExt.aidl",

        "aidl/android/media/AudioPortConfigMixExt.aidl",

        "aidl/android/media/AudioPortConfigMixExtUseCase.aidl",

        "aidl/android/media/AudioPortConfigSessionExt.aidl",

        "aidl/android/media/AudioPortDeviceExt.aidl",

        "aidl/android/media/AudioPortExt.aidl",

        "aidl/android/media/AudioPortMixExt.aidl",

        "aidl/android/media/AudioPortConfigSys.aidl",

        "aidl/android/media/AudioPortDeviceExtSys.aidl",

        "aidl/android/media/AudioPortExtSys.aidl",

        "aidl/android/media/AudioPortMixExtSys.aidl",

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

        "aidl/android/media/AudioPortSessionExt.aidl",

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

        "aidl/android/media/AudioProfileSys.aidl",

        "aidl/android/media/AudioStandard.aidl",

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

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

        "aidl/android/media/AudioVibratorInfo.aidl",

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

        "aidl/android/media/ExtraAudioDescriptor.aidl",

        "aidl/android/media/TrackSecondaryOutputInfo.aidl",

    ],

    imports: [
@@ -466,7 +458,6 @@ aidl_interface { 
        "aidl/android/media/GetInputForAttrResponse.aidl",

        "aidl/android/media/GetOutputForAttrResponse.aidl",

        "aidl/android/media/GetSpatializerResponse.aidl",

        "aidl/android/media/Int.aidl",

        "aidl/android/media/RecordClientInfo.aidl",

        "aidl/android/media/IAudioPolicyService.aidl",

        "aidl/android/media/IAudioPolicyServiceClient.aidl",

media/libaudioclient/AudioAttributes.cpp

+0 −3
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ 
#include <media/AudioAttributes.h>

#include <media/PolicyAidlConversion.h>



#define RETURN_STATUS_IF_ERROR(x) \

    { auto _tmp = (x); if (_tmp != OK) return _tmp; }



namespace android {



status_t AudioAttributes::readFromParcel(const Parcel* parcel) {

media/libaudioclient/AudioEffect.cpp

+1 −7
Original line number Diff line number Diff line
@@ -32,12 +32,6 @@ 
#include <private/media/AudioEffectShared.h>

#include <utils/Log.h>



#define RETURN_STATUS_IF_ERROR(x)    \

    {                                \

        auto _tmp = (x);             \

        if (_tmp != OK) return _tmp; \

    }



namespace android {

using aidl_utils::statusTFromBinderStatus;

using binder::Status;
@@ -573,7 +567,7 @@ status_t AudioEffect::queryDefaultPreProcessing(audio_session_t audioSession, 


    int32_t audioSessionAidl = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_session_t_int32_t(audioSession));

    media::Int countAidl;

    media::audio::common::Int countAidl;

    countAidl.value = VALUE_OR_RETURN_STATUS(convertIntegral<int32_t>(*count));

    std::vector<media::EffectDescriptor> retAidl;

    RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(

media/libaudioclient/AudioProductStrategy.cpp

+0 −3
Original line number Diff line number Diff line
@@ -21,9 +21,6 @@ 
#include <media/AudioAttributes.h>

#include <media/PolicyAidlConversion.h>



#define RETURN_STATUS_IF_ERROR(x) \

    { auto _tmp = (x); if (_tmp != OK) return _tmp; }



namespace android {



status_t AudioProductStrategy::readFromParcel(const Parcel* parcel) {