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

Commit 2295d909 authored by Shunkai Yao's avatar Shunkai Yao Committed by Gerrit Code Review
Browse files

Merge "Effect AIDL: cleanup dependencies" into main

parents 3a3c1dfd cbe90d05

media/libeffects/downmix/Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -56,9 +56,7 @@ cc_library_shared { 
        ":effectCommonFile",

    ],

    defaults: [

        "aidlaudioservice_defaults",

        "latest_android_hardware_audio_effect_ndk_shared",

        "latest_android_media_audio_common_types_ndk_shared",

        "aidlaudioeffectservice_defaults",

    ],

    header_libs: [

        "libaudioeffects",

media/libeffects/dynamicsproc/Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -86,9 +86,7 @@ cc_library_shared { 
    ],



    defaults: [

        "aidlaudioservice_defaults",

        "latest_android_hardware_audio_effect_ndk_shared",

        "latest_android_media_audio_common_types_ndk_shared",

        "aidlaudioeffectservice_defaults",

        "dynamicsprocessingdefaults",

    ],

media/libeffects/dynamicsproc/aidl/DynamicsProcessingContext.cpp

+2 −2
Original line number Diff line number Diff line
@@ -313,8 +313,8 @@ IEffect::Status DynamicsProcessingContext::dpeProcess(float* in, float* out, int 
void DynamicsProcessingContext::init() {

    std::lock_guard lg(mMutex);

    mState = DYNAMICS_PROCESSING_STATE_INITIALIZED;

    mChannelCount = ::aidl::android::hardware::audio::common::getChannelCount(

            mCommon.input.base.channelMask);

    mChannelCount = static_cast<int>(::aidl::android::hardware::audio::common::getChannelCount(

            mCommon.input.base.channelMask));

}



dp_fx::DPChannel* DynamicsProcessingContext::getChannel_l(int channel) {

media/libeffects/dynamicsproc/aidl/DynamicsProcessingContext.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ class DynamicsProcessingContext final : public EffectContext { 
    static constexpr float kPreferredProcessingDurationMs = 10.0f;

    static constexpr int kBandCount = 5;

    std::mutex mMutex;

    size_t mChannelCount GUARDED_BY(mMutex) = 0;

    int mChannelCount GUARDED_BY(mMutex) = 0;

    DynamicsProcessingState mState GUARDED_BY(mMutex) = DYNAMICS_PROCESSING_STATE_UNINITIALIZED;

    std::unique_ptr<dp_fx::DPFrequency> mDpFreq GUARDED_BY(mMutex) = nullptr;

    bool mEngineInited GUARDED_BY(mMutex) = false;

media/libeffects/hapticgenerator/Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -75,9 +75,7 @@ cc_library_shared { 
    ],



    defaults: [

        "aidlaudioservice_defaults",

        "latest_android_hardware_audio_effect_ndk_shared",

        "latest_android_media_audio_common_types_ndk_shared",

        "aidlaudioeffectservice_defaults",

        "hapticgeneratordefaults",

    ],