summaryrefslogtreecommitdiffstats
path: root/media/libeffects
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2012-01-31 12:35:20 -0800
committerEric Laurent <elaurent@google.com>2012-02-01 10:59:17 -0800
commit5387696d25bc710f8cd0e6d08079e2aa8d6c1417 (patch)
tree32b5c99149c72f0a7ef23dc17d0ddbb4d810eef4 /media/libeffects
parentbb62819aa34b0e89090ccc50e5915e25bc137583 (diff)
downloadframeworks_av-5387696d25bc710f8cd0e6d08079e2aa8d6c1417.zip
frameworks_av-5387696d25bc710f8cd0e6d08079e2aa8d6c1417.tar.gz
frameworks_av-5387696d25bc710f8cd0e6d08079e2aa8d6c1417.tar.bz2
modifications for new webrtc modules
Adapt include files path in makefile and source to new directory structure in webrtc library. Also changed the default AGC parameters to less extreme settings. Change-Id: Ia6a41c816dc44645f8f867937b722eede88c06ea
Diffstat (limited to 'media/libeffects')
-rwxr-xr-xmedia/libeffects/preprocessing/Android.mk2
-rwxr-xr-xmedia/libeffects/preprocessing/PreProcessing.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/media/libeffects/preprocessing/Android.mk b/media/libeffects/preprocessing/Android.mk
index 77d40b6..7f7c7e1 100755
--- a/media/libeffects/preprocessing/Android.mk
+++ b/media/libeffects/preprocessing/Android.mk
@@ -13,7 +13,7 @@ LOCAL_SRC_FILES:= \
LOCAL_C_INCLUDES += \
external/webrtc/src \
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
LOCAL_C_INCLUDES += $(call include-path-for, speex)
diff --git a/media/libeffects/preprocessing/PreProcessing.cpp b/media/libeffects/preprocessing/PreProcessing.cpp
index e988e06..9fd6764 100755
--- a/media/libeffects/preprocessing/PreProcessing.cpp
+++ b/media/libeffects/preprocessing/PreProcessing.cpp
@@ -24,8 +24,8 @@
#include <audio_effects/effect_aec.h>
#include <audio_effects/effect_agc.h>
#include <audio_effects/effect_ns.h>
-#include "modules/interface/module_common_types.h"
-#include "modules/audio_processing/main/interface/audio_processing.h"
+#include <module_common_types.h>
+#include <audio_processing.h>
#include "speex/speex_resampler.h"
@@ -220,8 +220,8 @@ bool HasReverseStream(uint32_t procId)
// Automatic Gain Control (AGC)
//------------------------------------------------------------------------------
-static const int kAgcDefaultTargetLevel = 0;
-static const int kAgcDefaultCompGain = 90;
+static const int kAgcDefaultTargetLevel = 3;
+static const int kAgcDefaultCompGain = 9;
static const bool kAgcDefaultLimiter = true;
int AgcInit (preproc_effect_t *effect)