summaryrefslogtreecommitdiffstats
path: root/voip
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2011-04-04 17:44:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-04 17:44:50 -0700
commit7a492a9ad42947a3a7b777b0eb6eec56f5bb942b (patch)
treef7b07a079cf640dbd2e9f2b7bd32b9e48b139ae2 /voip
parent824c6edce8f79aac9c98caabd9b8857d4c580629 (diff)
parentb7a76e84fde7fe534d46aaaa71e3224798354009 (diff)
downloadframeworks_base-7a492a9ad42947a3a7b777b0eb6eec56f5bb942b.zip
frameworks_base-7a492a9ad42947a3a7b777b0eb6eec56f5bb942b.tar.gz
frameworks_base-7a492a9ad42947a3a7b777b0eb6eec56f5bb942b.tar.bz2
am b7a76e84: am a482d83c: Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread
* commit 'b7a76e84fde7fe534d46aaaa71e3224798354009': Issue 4157048: mic gain for VoIP/SIP calls.
Diffstat (limited to 'voip')
-rw-r--r--voip/jni/rtp/AudioGroup.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/voip/jni/rtp/AudioGroup.cpp b/voip/jni/rtp/AudioGroup.cpp
index c031eee..41fedce 100644
--- a/voip/jni/rtp/AudioGroup.cpp
+++ b/voip/jni/rtp/AudioGroup.cpp
@@ -30,6 +30,7 @@
#define LOG_TAG "AudioGroup"
#include <cutils/atomic.h>
+#include <cutils/properties.h>
#include <utils/Log.h>
#include <utils/Errors.h>
#include <utils/RefBase.h>
@@ -619,6 +620,14 @@ bool AudioGroup::setMode(int mode)
if (mode < 0 || mode > LAST_MODE) {
return false;
}
+ //FIXME: temporary code to overcome echo and mic gain issues on herring board.
+ // Must be modified/removed when proper support for voice processing query and control
+ // is included in audio framework
+ char value[PROPERTY_VALUE_MAX];
+ property_get("ro.product.board", value, "");
+ if (mode == NORMAL && !strcmp(value, "herring")) {
+ mode = ECHO_SUPPRESSION;
+ }
if (mode == ECHO_SUPPRESSION && AudioSystem::getParameters(
0, String8("ec_supported")) == "ec_supported=yes") {
mode = NORMAL;