summaryrefslogtreecommitdiffstats
path: root/media/libeffects/preprocessing/PreProcessing.cpp
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2012-09-07 14:55:18 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-07 14:55:18 -0700
commit1fbb83b665720f2629d7a3759a0a7b61b4f04571 (patch)
treecca1653ca3c4c7ba53d3aaa724369504dcb71e1e /media/libeffects/preprocessing/PreProcessing.cpp
parente356780df8379d875d1e549eca8daa1a5e399f03 (diff)
parent85396642425b94ec33aa26f27e109353e3516ec4 (diff)
downloadframeworks_av-1fbb83b665720f2629d7a3759a0a7b61b4f04571.zip
frameworks_av-1fbb83b665720f2629d7a3759a0a7b61b4f04571.tar.gz
frameworks_av-1fbb83b665720f2629d7a3759a0a7b61b4f04571.tar.bz2
am 85396642: Merge "audioflinger: changes for new audio devices enums" into jb-mr1-dev
* commit '85396642425b94ec33aa26f27e109353e3516ec4': audioflinger: changes for new audio devices enums
Diffstat (limited to 'media/libeffects/preprocessing/PreProcessing.cpp')
-rwxr-xr-xmedia/libeffects/preprocessing/PreProcessing.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libeffects/preprocessing/PreProcessing.cpp b/media/libeffects/preprocessing/PreProcessing.cpp
index 5709837..597866a 100755
--- a/media/libeffects/preprocessing/PreProcessing.cpp
+++ b/media/libeffects/preprocessing/PreProcessing.cpp
@@ -517,6 +517,10 @@ int AecSetDevice(preproc_effect_t *effect, uint32_t device)
webrtc::EchoControlMobile *aec = static_cast<webrtc::EchoControlMobile *>(effect->engine);
webrtc::EchoControlMobile::RoutingMode mode = webrtc::EchoControlMobile::kQuietEarpieceOrHeadset;
+ if (audio_is_input_device(device)) {
+ return 0;
+ }
+
switch(device) {
case AUDIO_DEVICE_OUT_EARPIECE:
mode = webrtc::EchoControlMobile::kEarpiece;