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

Commit 95d35980 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "Use expf() instead of an approximation" into main am: 4ec817db 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2854589



Change-Id: I9081c201c33995db764f3524cdb60c01930e10c4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2e5ab590 4ec817db

media/libeffects/loudness/dsp/core/dynamic_range_compression.cpp

+2 −4
Original line number Original line Diff line number Diff line
@@ -89,8 +89,7 @@ float AdaptiveDynamicRangeCompression::Compress(float x) { 
  } else {

  } else {

    state_ = alpha_release_ * state_ + (1.0f - alpha_release_) * cv;

    state_ = alpha_release_ * state_ + (1.0f - alpha_release_) * cv;

  }

  }

  compressor_gain_ *=

  compressor_gain_ *= expf(state_ - prev_state);

      math::ExpApproximationViaTaylorExpansionOrder5(state_ - prev_state);

  x *= compressor_gain_;

  x *= compressor_gain_;

  if (x > kFixedPointLimit) {

  if (x > kFixedPointLimit) {

    return kFixedPointLimit;

    return kFixedPointLimit;
@@ -118,8 +117,7 @@ void AdaptiveDynamicRangeCompression::Compress(float *x1, float *x2) { 
  } else {

  } else {

    state_ = alpha_release_ * state_ + (1.0f - alpha_release_) * cv;

    state_ = alpha_release_ * state_ + (1.0f - alpha_release_) * cv;

  }

  }

  compressor_gain_ *=

  compressor_gain_ *= expf(state_ - prev_state);

      math::ExpApproximationViaTaylorExpansionOrder5(state_ - prev_state);

  *x1 *= compressor_gain_;

  *x1 *= compressor_gain_;

  if (*x1 > kFixedPointLimit) {

  if (*x1 > kFixedPointLimit) {

    *x1 = kFixedPointLimit;

    *x1 = kFixedPointLimit;