Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "RTP: integrate the echo canceller from speex." into gingerbread

Browse Source
This commit is contained in:
Chia-chi Yeh
2010-08-24 02:28:41 -07:00
committed by Android (Google) Code Review
parent 5b1f0c9f64 4ae6ec428f
commit a83987d2cc
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
voip/jni/rtp/Android.mk
View File

@@ -32,10 +32,11 @@ LOCAL_SHARED_LIBRARIES := \
libutils \ libutils \
libmedia libmedia
LOCAL_STATIC_LIBRARIES := LOCAL_STATIC_LIBRARIES := libspeex
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(JNI_H_INCLUDE) $(JNI_H_INCLUDE) \
external/speex/include
LOCAL_CFLAGS += -fvisibility=hidden LOCAL_CFLAGS += -fvisibility=hidden

19
voip/jni/rtp/AudioGroup.cpp
View File

@@ -40,6 +40,8 @@
#include <media/AudioTrack.h> #include <media/AudioTrack.h>
#include <media/mediarecorder.h> #include <media/mediarecorder.h>
#include <speex/speex_echo.h>
#include "jni.h" #include "jni.h"
#include "JNIHelp.h" #include "JNIHelp.h"
@@ -445,6 +447,8 @@ private:
int mDeviceSocket; int mDeviceSocket;
AudioTrack mTrack; AudioTrack mTrack;
AudioRecord mRecord; AudioRecord mRecord;
SpeexEchoState *mEchoState;
bool networkLoop(); bool networkLoop();
bool deviceLoop(); bool deviceLoop();
@@ -506,6 +510,7 @@ AudioGroup::AudioGroup()
mEventQueue = -1; mEventQueue = -1;
mDtmfEvent = -1; mDtmfEvent = -1;
mDeviceSocket = -1; mDeviceSocket = -1;
mEchoState = NULL;
mNetworkThread = new NetworkThread(this); mNetworkThread = new NetworkThread(this);
mDeviceThread = new DeviceThread(this); mDeviceThread = new DeviceThread(this);
} }
@@ -518,6 +523,9 @@ AudioGroup::~AudioGroup()
mRecord.stop(); mRecord.stop();
close(mEventQueue); close(mEventQueue);
close(mDeviceSocket); close(mDeviceSocket);
if (mEchoState) {
speex_echo_state_destroy(mEchoState);
}
while (mChain) { while (mChain) {
AudioStream *next = mChain->mNext; AudioStream *next = mChain->mNext;
delete mChain; delete mChain;
@@ -566,7 +574,8 @@ bool AudioGroup::set(int sampleRate, int sampleCount)
} }
LOGD("latency: output %d, input %d", mTrack.latency(), mRecord.latency()); LOGD("latency: output %d, input %d", mTrack.latency(), mRecord.latency());
// TODO: initialize echo canceler here. // Initialize echo canceller.
mEchoState = speex_echo_state_init(sampleCount, sampleRate);
// Create device socket. // Create device socket.
int pair[2]; int pair[2];
@@ -633,6 +642,7 @@ bool AudioGroup::setMode(int mode)
if (mode == MUTED) { if (mode == MUTED) {
mRecord.stop(); mRecord.stop();
} else { } else {
speex_echo_state_reset(mEchoState);
mRecord.start(); mRecord.start();
} }
@@ -793,7 +803,7 @@ bool AudioGroup::deviceLoop()
status_t status = mRecord.obtainBuffer(&buffer, 1); status_t status = mRecord.obtainBuffer(&buffer, 1);
if (status == NO_ERROR) { if (status == NO_ERROR) {
int count = (buffer.frameCount < toRead) ? int count = ((int)buffer.frameCount < toRead) ?
buffer.frameCount : toRead; buffer.frameCount : toRead;
memcpy(&input[mSampleCount - toRead], buffer.i8, count * 2); memcpy(&input[mSampleCount - toRead], buffer.i8, count * 2);
toRead -= count; toRead -= count;
@@ -817,8 +827,9 @@ bool AudioGroup::deviceLoop()
if (mMode == NORMAL) { if (mMode == NORMAL) {
send(mDeviceSocket, input, sizeof(input), MSG_DONTWAIT); send(mDeviceSocket, input, sizeof(input), MSG_DONTWAIT);
} else { } else {
// TODO: Echo canceller runs here. int16_t result[mSampleCount];
send(mDeviceSocket, input, sizeof(input), MSG_DONTWAIT); speex_echo_cancellation(mEchoState, input, output, result);
send(mDeviceSocket, result, sizeof(result), MSG_DONTWAIT);
} }
} }
return true; return true;