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

am bd399b0b: Merge "RTP: Pause echo suppressor when far-end volume is low." into gingerbread

Browse Source 
* commit 'bd399b0bd205a1a3889bae1a619c6d4d4a0f4816':
  RTP: Pause echo suppressor when far-end volume is low.
This commit is contained in:
Chia-chi Yeh
2010-11-30 11:45:31 -08:00
committed by Android Git Automerger
parent f4c2eaf262 bd399b0bd2
commit e843dfa8dc
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
voip/jni/rtp/EchoSuppressor.cpp
View File

@@ -160,22 +160,27 @@ void EchoSuppressor::run(int16_t *playbacked, int16_t *recorded)
} }
// Compute correlations. // Compute correlations.
float corr2 = 0.0f;
int latency = 0; int latency = 0;
float corr2 = 0.0f;
float varX = 0.0f;
float varY = mY2Sum - mWeight * mYSum * mYSum; float varY = mY2Sum - mWeight * mYSum * mYSum;
for (int i = mTailLength - 1; i >= 0; --i) { for (int i = mTailLength - 1; i >= 0; --i) {
float varX = mX2Sums[i] - mWeight * mXSums[i] * mXSums[i];
float cov = mXYSums[i] - mWeight * mXSums[i] * mYSum; float cov = mXYSums[i] - mWeight * mXSums[i] * mYSum;
float c2 = cov * cov / (varX * varY + 1); if (cov > 0.0f) {
if (c2 > corr2) { float varXi = mX2Sums[i] - mWeight * mXSums[i] * mXSums[i];
corr2 = c2; float corr2i = cov * cov / (varXi * varY + 1);
latency = i; if (corr2i > corr2) {
varX = varXi;
corr2 = corr2i;
latency = i;
}
} }
} }
//LOGI("correlation^2 = %.10f, latency = %d", corr2, latency * mScale); //LOGI("corr^2 %.5f, var %8.0f %8.0f, latency %d", corr2, varX, varY,
// latency * mScale);
// Do echo suppression. // Do echo suppression.
if (corr2 > 0.1f) { if (corr2 > 0.1f && varX > 10000.0f) {
int factor = (corr2 > 1.0f) ? 0 : (1.0f - sqrtf(corr2)) * 4096; int factor = (corr2 > 1.0f) ? 0 : (1.0f - sqrtf(corr2)) * 4096;
for (int i = 0; i < mSampleCount; ++i) { for (int i = 0; i < mSampleCount; ++i) {
recorded[i] = recorded[i] * factor >> 16; recorded[i] = recorded[i] * factor >> 16;