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

Commit ada1d984 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Gerrit Code Review
Browse files

Merge "libeffects: Rename effect process names." into main

parents 572ac6a0 7268c74b
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ RetCode HapticGeneratorImpl::releaseContext() {
IEffect::Status HapticGeneratorImpl::effectProcessImpl(float* in, float* out, int samples) {
    IEffect::Status status = {EX_NULL_POINTER, 0, 0};
    RETURN_VALUE_IF(!mContext, status, "nullContext");
    return mContext->lvmProcess(in, out, samples);
    return mContext->process(in, out, samples);
}

}  // namespace aidl::android::hardware::audio::effect
+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ RetCode HapticGeneratorContext::setHgVibratorInformation(
    return RetCode::SUCCESS;
}

IEffect::Status HapticGeneratorContext::lvmProcess(float* in, float* out, int samples) {
IEffect::Status HapticGeneratorContext::process(float* in, float* out, int samples) {
    LOG(DEBUG) << __func__ << " in " << in << " out " << out << " sample " << samples;

    IEffect::Status status = {EX_NULL_POINTER, 0, 0};
+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ class HapticGeneratorContext final : public EffectContext {
    RetCode setHgVibratorInformation(const HapticGenerator::VibratorInformation& vibratorInfo);
    HapticGenerator::VibratorInformation getHgVibratorInformation();

    IEffect::Status lvmProcess(float* in, float* out, int samples);
    IEffect::Status process(float* in, float* out, int samples);

  private:
    static constexpr float DEFAULT_RESONANT_FREQUENCY = 150.0f;
+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ RetCode LoudnessEnhancerImpl::releaseContext() {
IEffect::Status LoudnessEnhancerImpl::effectProcessImpl(float* in, float* out, int samples) {
    IEffect::Status status = {EX_NULL_POINTER, 0, 0};
    RETURN_VALUE_IF(!mContext, status, "nullContext");
    return mContext->lvmProcess(in, out, samples);
    return mContext->process(in, out, samples);
}

}  // namespace aidl::android::hardware::audio::effect
+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ RetCode LoudnessEnhancerContext::setLeGain(int gainMb) {
    return RetCode::SUCCESS;
}

IEffect::Status LoudnessEnhancerContext::lvmProcess(float* in, float* out, int samples) {
IEffect::Status LoudnessEnhancerContext::process(float* in, float* out, int samples) {
    LOG(DEBUG) << __func__ << " in " << in << " out " << out << " sample " << samples;

    IEffect::Status status = {EX_NULL_POINTER, 0, 0};
Loading