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

Commit e99fcd2e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "LoudnessEnhancer : Improve the libeffects implementation" am: cefa59f5 am: 558c50d0 

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



Change-Id: I0f159d4692c47f5c00c42cc45f6e5d7cd58f8e38
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b473bbc7 558c50d0

media/libeffects/loudness/aidl/LoudnessEnhancerContext.cpp

+50 −45
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
 * limitations under the License.

 */



#define LOG_TAG "LoudnessEnhancerContext"



#include <Utils.h>



#include "LoudnessEnhancerContext.h"



namespace aidl::android::hardware::audio::effect {
@@ -21,17 +25,15 @@ namespace aidl::android::hardware::audio::effect { 
LoudnessEnhancerContext::LoudnessEnhancerContext(int statusDepth, const Parameter::Common& common)

    : EffectContext(statusDepth, common) {

    LOG(DEBUG) << __func__;

    mState = LOUDNESS_ENHANCER_STATE_UNINITIALIZED;

    mSampleRate = common.input.base.sampleRate;

    init_params();

}



LoudnessEnhancerContext::~LoudnessEnhancerContext() {

    LOG(DEBUG) << __func__;

    mState = LOUDNESS_ENHANCER_STATE_UNINITIALIZED;

}



RetCode LoudnessEnhancerContext::enable() {

    std::lock_guard lg(mMutex);

    if (mState != LOUDNESS_ENHANCER_STATE_INITIALIZED) {

        return RetCode::ERROR_EFFECT_LIB_ERROR;

    }
@@ -40,6 +42,7 @@ RetCode LoudnessEnhancerContext::enable() { 
}



RetCode LoudnessEnhancerContext::disable() {

    std::lock_guard lg(mMutex);

    if (mState != LOUDNESS_ENHANCER_STATE_ACTIVE) {

        return RetCode::ERROR_EFFECT_LIB_ERROR;

    }
@@ -49,12 +52,10 @@ RetCode LoudnessEnhancerContext::disable() { 


void LoudnessEnhancerContext::reset() {

    float targetAmp = pow(10, mGain / 2000.0f);  // mB to linear amplification

    {

    std::lock_guard lg(mMutex);

    if (mCompressor != nullptr) {

        // Get samplingRate from input

            mCompressor->Initialize(targetAmp, mSampleRate);

        }

        mCompressor->Initialize(targetAmp, mCommon.input.base.sampleRate);

    }

}
@@ -75,14 +76,17 @@ IEffect::Status LoudnessEnhancerContext::lvmProcess(float* in, float* out, int s 
    auto frameSize = getInputFrameSize();

    RETURN_VALUE_IF(0 == frameSize, status, "zeroFrameSize");



    LOG(DEBUG) << __func__ << " start processing";

    {

    std::lock_guard lg(mMutex);

    status = {STATUS_INVALID_OPERATION, 0, 0};

    RETURN_VALUE_IF(mState != LOUDNESS_ENHANCER_STATE_ACTIVE, status, "stateNotActive");



    LOG(DEBUG) << __func__ << " start processing";

    // PcmType is always expected to be Float 32 bit.

    constexpr float scale = 1 << 15;  // power of 2 is lossless conversion to int16_t range

    constexpr float inverseScale = 1.f / scale;

    const float inputAmp = pow(10, mGain / 2000.0f) * scale;

    float leftSample, rightSample;



    if (mCompressor != nullptr) {

        for (int inIdx = 0; inIdx < samples; inIdx += 2) {

            // makeup gain is applied on the input of the compressor
@@ -110,20 +114,21 @@ IEffect::Status LoudnessEnhancerContext::lvmProcess(float* in, float* out, int s 
            }

        }

    }

    }

    return {STATUS_OK, samples, samples};

}



void LoudnessEnhancerContext::init_params() {

    int channelCount = ::aidl::android::hardware::audio::common::getChannelCount(

            mCommon.input.base.channelMask);

    LOG_ALWAYS_FATAL_IF(channelCount != 2, "channel count %d not supported", channelCount);



    mGain = LOUDNESS_ENHANCER_DEFAULT_TARGET_GAIN_MB;

    float targetAmp = pow(10, mGain / 2000.0f);  // mB to linear amplification

    LOG(DEBUG) << __func__ << "Target gain = " << mGain << "mB <=> factor = " << targetAmp;



    {

    std::lock_guard lg(mMutex);

    mCompressor = std::make_unique<le_fx::AdaptiveDynamicRangeCompression>();

        mCompressor->Initialize(targetAmp, mSampleRate);

    }

    mCompressor->Initialize(targetAmp, mCommon.input.base.sampleRate);

    mState = LOUDNESS_ENHANCER_STATE_INITIALIZED;

}

media/libeffects/loudness/aidl/LoudnessEnhancerContext.h

+2 −3
Original line number Diff line number Diff line
@@ -46,9 +46,8 @@ class LoudnessEnhancerContext final : public EffectContext { 


  private:

    std::mutex mMutex;

    LoudnessEnhancerState mState;

    int mSampleRate;

    int mGain;

    LoudnessEnhancerState mState GUARDED_BY(mMutex) = LOUDNESS_ENHANCER_STATE_UNINITIALIZED;

    int mGain = LOUDNESS_ENHANCER_DEFAULT_TARGET_GAIN_MB;

    // In this implementation, there is no coupling between the compression on the left and right

    // channels

    std::unique_ptr<le_fx::AdaptiveDynamicRangeCompression> mCompressor GUARDED_BY(mMutex);