summaryrefslogtreecommitdiffstats
path: root/voip/jni
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2011-04-05 10:27:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-05 10:27:06 -0700
commitd8cbd16659d1a5d098acfcfa8ee98c95036aff63 (patch)
tree5f25ad8815d9e0e3cd1fb543c0ffaea3d5594901 /voip/jni
parenta88990cf5b5df9ac3efeca8af14e75b7f5d679b7 (diff)
parent7a492a9ad42947a3a7b777b0eb6eec56f5bb942b (diff)
downloadframeworks_base-d8cbd16659d1a5d098acfcfa8ee98c95036aff63.zip
frameworks_base-d8cbd16659d1a5d098acfcfa8ee98c95036aff63.tar.gz
frameworks_base-d8cbd16659d1a5d098acfcfa8ee98c95036aff63.tar.bz2
am 7a492a9a: am b7a76e84: am a482d83c: Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread
* commit '7a492a9ad42947a3a7b777b0eb6eec56f5bb942b': Issue 4157048: mic gain for VoIP/SIP calls.
Diffstat (limited to 'voip/jni')
-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;