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

Commit 175df115 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "modifications for new webrtc modules"

parents 26daa02b 5a1f97c0

media/libeffects/preprocessing/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -13,7 +13,7 @@ LOCAL_SRC_FILES:= \ 
LOCAL_C_INCLUDES += \

LOCAL_C_INCLUDES += \

    external/webrtc/src \

    external/webrtc/src \

    external/webrtc/src/modules/interface \

    external/webrtc/src/modules/interface \

    external/webrtc/src/modules/audio_processing/main/interface \

    external/webrtc/src/modules/audio_processing/interface \

    system/media/audio_effects/include

    system/media/audio_effects/include





LOCAL_C_INCLUDES += $(call include-path-for, speex)

LOCAL_C_INCLUDES += $(call include-path-for, speex)

media/libeffects/preprocessing/PreProcessing.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -24,8 +24,8 @@ 
#include <audio_effects/effect_aec.h>

#include <audio_effects/effect_aec.h>

#include <audio_effects/effect_agc.h>

#include <audio_effects/effect_agc.h>

#include <audio_effects/effect_ns.h>

#include <audio_effects/effect_ns.h>

#include "modules/interface/module_common_types.h"

#include <module_common_types.h>

#include "modules/audio_processing/main/interface/audio_processing.h"

#include <audio_processing.h>

#include "speex/speex_resampler.h"

#include "speex/speex_resampler.h"
@@ -220,8 +220,8 @@ bool HasReverseStream(uint32_t procId) 
// Automatic Gain Control (AGC)

// Automatic Gain Control (AGC)

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------





static const int kAgcDefaultTargetLevel = 0;

static const int kAgcDefaultTargetLevel = 3;

static const int kAgcDefaultCompGain = 90;

static const int kAgcDefaultCompGain = 9;

static const bool kAgcDefaultLimiter = true;

static const bool kAgcDefaultLimiter = true;





int  AgcInit (preproc_effect_t *effect)

int  AgcInit (preproc_effect_t *effect)