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

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

Merge "Remove some unused members in EffectBundleAidl."

parents 80cd30ae 5848ac95

media/libeffects/lvm/wrapper/Aidl/EffectBundleAidl.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -86,8 +86,8 @@ EffectBundleAidl::~EffectBundleAidl() { 
}

}





ndk::ScopedAStatus EffectBundleAidl::getDescriptor(Descriptor* _aidl_return) {

ndk::ScopedAStatus EffectBundleAidl::getDescriptor(Descriptor* _aidl_return) {

    LOG(DEBUG) << _aidl_return->toString();

    RETURN_IF(!_aidl_return, EX_ILLEGAL_ARGUMENT, "Parameter:nullptr");

    RETURN_IF(!_aidl_return, EX_ILLEGAL_ARGUMENT, "Parameter:nullptr");

    LOG(DEBUG) << _aidl_return->toString();

    *_aidl_return = *mDescriptor;

    *_aidl_return = *mDescriptor;

    return ndk::ScopedAStatus::ok();

    return ndk::ScopedAStatus::ok();

}

}
@@ -157,6 +157,7 @@ ndk::ScopedAStatus EffectBundleAidl::setParameterSpecific(const Parameter::Speci 




ndk::ScopedAStatus EffectBundleAidl::getParameterSpecific(const Parameter::Id& id,

ndk::ScopedAStatus EffectBundleAidl::getParameterSpecific(const Parameter::Id& id,

                                                          Parameter::Specific* specific) {

                                                          Parameter::Specific* specific) {

    RETURN_IF(!specific, EX_NULL_POINTER, "nullPtr");

    auto tag = id.getTag();

    auto tag = id.getTag();

    RETURN_IF(Parameter::Id::equalizerTag != tag, EX_ILLEGAL_ARGUMENT, "wrongIdTag");

    RETURN_IF(Parameter::Id::equalizerTag != tag, EX_ILLEGAL_ARGUMENT, "wrongIdTag");

    auto eqId = id.get<Parameter::Id::equalizerTag>();

    auto eqId = id.get<Parameter::Id::equalizerTag>();

media/libeffects/lvm/wrapper/Aidl/EffectBundleAidl.h

+0 −13
Original line number Original line Diff line number Diff line
@@ -65,19 +65,6 @@ class EffectBundleAidl final : public EffectImpl { 
    lvm::BundleEffectType mType = lvm::BundleEffectType::EQUALIZER;

    lvm::BundleEffectType mType = lvm::BundleEffectType::EQUALIZER;

    std::shared_ptr<BundleContext> mContext;

    std::shared_ptr<BundleContext> mContext;





    int mPreset = lvm::PRESET_CUSTOM;

    size_t mInputFrameSize, mOutputFrameSize;



    // Equalizer

    int mCurPresetIdx = lvm::PRESET_CUSTOM; /* Current preset being used */

    int32_t mBandGaindB[lvm::MAX_NUM_BANDS];



    RetCode setEqPreset(const int& presetIdx);

    int getEqPreset() const { return mCurPresetIdx; }



    RetCode setEqBandLevels(const std::vector<Equalizer::BandLevel>& bandLevels);

    std::vector<Equalizer::BandLevel> getEqBandLevels() const;



    IEffect::Status status(binder_status_t status, size_t consumed, size_t produced);

    IEffect::Status status(binder_status_t status, size_t consumed, size_t produced);

    ndk::ScopedAStatus getParameterEqualizer(const Equalizer::Tag& tag,

    ndk::ScopedAStatus getParameterEqualizer(const Equalizer::Tag& tag,

                                             Parameter::Specific* specific);

                                             Parameter::Specific* specific);