diff options
| author | Eric Laurent <elaurent@google.com> | 2012-01-31 12:35:20 -0800 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2012-02-01 10:59:17 -0800 |
| commit | 5a1f97c007db4a0c8f60453ca127944588dcc18e (patch) | |
| tree | 9f7c518a2e98103544bb17e79826000414da1bc5 /media | |
| parent | dfc6cdf7930f889739690217d58797cbf5916c92 (diff) | |
| download | frameworks_base-5a1f97c007db4a0c8f60453ca127944588dcc18e.zip frameworks_base-5a1f97c007db4a0c8f60453ca127944588dcc18e.tar.gz frameworks_base-5a1f97c007db4a0c8f60453ca127944588dcc18e.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')
| -rwxr-xr-x | media/libeffects/preprocessing/Android.mk | 2 | ||||
| -rwxr-xr-x | media/libeffects/preprocessing/PreProcessing.cpp | 8 |
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) |