diff options
| author | Eric Laurent <elaurent@google.com> | 2012-02-02 09:39:28 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-02 09:39:28 -0800 |
| commit | 175df1156154dcb889eb36c446cabed351e873db (patch) | |
| tree | 12e664a6d2d699dae2970e774157fb4d93074fc3 /media | |
| parent | 26daa02bdb0c62f8162ad8d4d771cabce8644b4a (diff) | |
| parent | 5a1f97c007db4a0c8f60453ca127944588dcc18e (diff) | |
| download | frameworks_base-175df1156154dcb889eb36c446cabed351e873db.zip frameworks_base-175df1156154dcb889eb36c446cabed351e873db.tar.gz frameworks_base-175df1156154dcb889eb36c446cabed351e873db.tar.bz2 | |
Merge "modifications for new webrtc modules"
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) |