diff options
author | Chia-chi Yeh <chiachi@android.com> | 2010-08-26 10:33:09 +0800 |
---|---|---|
committer | Chia-chi Yeh <chiachi@android.com> | 2010-08-26 10:33:09 +0800 |
commit | 7fa7ee11f6c274903241897c284337ba8b158988 (patch) | |
tree | 2b9136b9dcab61263b0747b45657764e74b62efc /voip | |
parent | 4ae6ec428f3570b9020b35ada6a62f94af66d888 (diff) | |
download | frameworks_base-7fa7ee11f6c274903241897c284337ba8b158988.zip frameworks_base-7fa7ee11f6c274903241897c284337ba8b158988.tar.gz frameworks_base-7fa7ee11f6c274903241897c284337ba8b158988.tar.bz2 |
Revert "RTP: integrate the echo canceller from speex."
This reverts commit 4ae6ec428f3570b9020b35ada6a62f94af66d888.
Diffstat (limited to 'voip')
-rw-r--r-- | voip/jni/rtp/Android.mk | 5 | ||||
-rw-r--r-- | voip/jni/rtp/AudioGroup.cpp | 19 |
2 files changed, 6 insertions, 18 deletions
diff --git a/voip/jni/rtp/Android.mk b/voip/jni/rtp/Android.mk index 3bd85aa..a364355 100644 --- a/voip/jni/rtp/Android.mk +++ b/voip/jni/rtp/Android.mk @@ -32,11 +32,10 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libmedia -LOCAL_STATIC_LIBRARIES := libspeex +LOCAL_STATIC_LIBRARIES := LOCAL_C_INCLUDES += \ - $(JNI_H_INCLUDE) \ - external/speex/include + $(JNI_H_INCLUDE) LOCAL_CFLAGS += -fvisibility=hidden diff --git a/voip/jni/rtp/AudioGroup.cpp b/voip/jni/rtp/AudioGroup.cpp index b5a4e22..bb45a9a 100644 --- a/voip/jni/rtp/AudioGroup.cpp +++ b/voip/jni/rtp/AudioGroup.cpp @@ -40,8 +40,6 @@ #include <media/AudioTrack.h> #include <media/mediarecorder.h> -#include <speex/speex_echo.h> - #include "jni.h" #include "JNIHelp.h" @@ -447,8 +445,6 @@ private: int mDeviceSocket; AudioTrack mTrack; AudioRecord mRecord; - - SpeexEchoState *mEchoState; bool networkLoop(); bool deviceLoop(); @@ -510,7 +506,6 @@ AudioGroup::AudioGroup() mEventQueue = -1; mDtmfEvent = -1; mDeviceSocket = -1; - mEchoState = NULL; mNetworkThread = new NetworkThread(this); mDeviceThread = new DeviceThread(this); } @@ -523,9 +518,6 @@ AudioGroup::~AudioGroup() mRecord.stop(); close(mEventQueue); close(mDeviceSocket); - if (mEchoState) { - speex_echo_state_destroy(mEchoState); - } while (mChain) { AudioStream *next = mChain->mNext; delete mChain; @@ -574,8 +566,7 @@ bool AudioGroup::set(int sampleRate, int sampleCount) } LOGD("latency: output %d, input %d", mTrack.latency(), mRecord.latency()); - // Initialize echo canceller. - mEchoState = speex_echo_state_init(sampleCount, sampleRate); + // TODO: initialize echo canceler here. // Create device socket. int pair[2]; @@ -642,7 +633,6 @@ bool AudioGroup::setMode(int mode) if (mode == MUTED) { mRecord.stop(); } else { - speex_echo_state_reset(mEchoState); mRecord.start(); } @@ -803,7 +793,7 @@ bool AudioGroup::deviceLoop() status_t status = mRecord.obtainBuffer(&buffer, 1); if (status == NO_ERROR) { - int count = ((int)buffer.frameCount < toRead) ? + int count = (buffer.frameCount < toRead) ? buffer.frameCount : toRead; memcpy(&input[mSampleCount - toRead], buffer.i8, count * 2); toRead -= count; @@ -827,9 +817,8 @@ bool AudioGroup::deviceLoop() if (mMode == NORMAL) { send(mDeviceSocket, input, sizeof(input), MSG_DONTWAIT); } else { - int16_t result[mSampleCount]; - speex_echo_cancellation(mEchoState, input, output, result); - send(mDeviceSocket, result, sizeof(result), MSG_DONTWAIT); + // TODO: Echo canceller runs here. + send(mDeviceSocket, input, sizeof(input), MSG_DONTWAIT); } } return true; |