Merge "Remove some unused members in EffectBundleAidl."
diff --git a/media/libeffects/lvm/wrapper/Aidl/EffectBundleAidl.cpp b/media/libeffects/lvm/wrapper/Aidl/EffectBundleAidl.cpp
index 8272462..569356f 100644
--- a/media/libeffects/lvm/wrapper/Aidl/EffectBundleAidl.cpp
+++ b/media/libeffects/lvm/wrapper/Aidl/EffectBundleAidl.cpp
@@ -86,8 +86,8 @@
}
ndk::ScopedAStatus EffectBundleAidl::getDescriptor(Descriptor* _aidl_return) {
- LOG(DEBUG) << _aidl_return->toString();
RETURN_IF(!_aidl_return, EX_ILLEGAL_ARGUMENT, "Parameter:nullptr");
+ LOG(DEBUG) << _aidl_return->toString();
*_aidl_return = *mDescriptor;
return ndk::ScopedAStatus::ok();
}
@@ -157,6 +157,7 @@
ndk::ScopedAStatus EffectBundleAidl::getParameterSpecific(const Parameter::Id& id,
Parameter::Specific* specific) {
+ RETURN_IF(!specific, EX_NULL_POINTER, "nullPtr");
auto tag = id.getTag();
RETURN_IF(Parameter::Id::equalizerTag != tag, EX_ILLEGAL_ARGUMENT, "wrongIdTag");
auto eqId = id.get<Parameter::Id::equalizerTag>();
diff --git a/media/libeffects/lvm/wrapper/Aidl/EffectBundleAidl.h b/media/libeffects/lvm/wrapper/Aidl/EffectBundleAidl.h
index f10003e..5fdf301 100644
--- a/media/libeffects/lvm/wrapper/Aidl/EffectBundleAidl.h
+++ b/media/libeffects/lvm/wrapper/Aidl/EffectBundleAidl.h
@@ -65,19 +65,6 @@
lvm::BundleEffectType mType = lvm::BundleEffectType::EQUALIZER;
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);
ndk::ScopedAStatus getParameterEqualizer(const Equalizer::Tag& tag,
Parameter::Specific* specific);