Thread: [Iaxclient-cvs] SF.net SVN: iaxclient: [1140] branches/team/mihai/echocan/lib

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1140
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1140&view=rev
Author:   sbalea
Date:     2007-09-18 10:55:59 -0700 (Tue, 18 Sep 2007)

Log Message:
-----------
Move echo cancellation in audio_encode
Remove references to SPAN or MEC echo canceller
Switch to the new speex 1.2beta2 echo can API

Modified Paths:
--------------
    branches/team/mihai/echocan/lib/audio_encode.c
    branches/team/mihai/echocan/lib/audio_encode.h
    branches/team/mihai/echocan/lib/audio_portaudio.c

Modified: branches/team/mihai/echocan/lib/audio_encode.c
===================================================================

--- branches/team/mihai/echocan/lib/audio_encode.c	2007-09-14 18:22:02 UTC (rev 1139)
+++ branches/team/mihai/echocan/lib/audio_encode.c	2007-09-18 17:55:59 UTC (rev 1140)
@@ -14,6 +14,7 @@
  * the GNU Lesser (Library) General Public License.
  */
 
+#include "audio_encode.h"
 #include "iaxclient_lib.h"
 #include "iax-client.h"
 #ifdef CODEC_GSM
@@ -24,6 +25,11 @@
 #include "codec_speex.h"
 #include <speex/speex_preprocess.h>
 
+#ifdef SPEEX_EC
+#include <speex/speex_echo.h>
+#include "ringbuffer.h"
+#endif
+
 #ifdef CODEC_ILBC
 	#include "codec_ilbc.h"
 #endif
@@ -33,11 +39,19 @@
 static float input_level = 0.0f;
 static float output_level = 0.0f;
 
+int iaxci_sample_rate = 8000;
+
 static SpeexPreprocessState *st = NULL;
 static int speex_state_size = 0;
 static int speex_state_rate = 0;
 int iaxci_filters = IAXC_FILTER_AGC|IAXC_FILTER_DENOISE|IAXC_FILTER_AAGC|IAXC_FILTER_CN;
 
+#ifdef SPEEX_EC
+static SpeexEchoState *ec = NULL;
+static rb_RingBuffer ecOutRing;
+static char outRingBuf[EC_RING_SIZE];
+#endif
+
 /* use to measure time since last audio was processed */
 static struct timeval timeLastInput ;
 static struct timeval timeLastOutput ;
@@ -104,7 +118,7 @@
 	speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_AGC, &i);
 	i = (iaxci_filters & IAXC_FILTER_DENOISE) ? 1 : 0;
 	speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_DENOISE, &i);
-
+	
 	/* make vad more sensitive */
 	f = 0.30f;
 	speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_START, &f);
@@ -164,7 +178,7 @@
 
 		if ( (i & 0x3f) == 0 )
 		{
-			const float loudness;
+			float loudness;
 			speex_preprocess_ctl(st, SPEEX_PREPROCESS_GET_LOUDNESS, &loudness);
 			if ( loudness > 8000.0f || loudness < 4000.0f )
 			{
@@ -401,3 +415,65 @@
 	set_speex_filters();
 }
 
+void audio_echo_cancellation(short *inputBuffer, short *outputBuffer, int samples)
+{
+#ifdef SPEEX_EC
+	int i;
+	static long bias = 0;
+	short  delayedBuf[1024];
+	short cancelledBuffer[1024];
+
+	/* remove bias -- whether ec is on or not. */
+	for ( i = 0; i < samples; i++ )
+	{
+		bias += ((((long int) inputBuffer[i]) << 15) - bias) >> 14;
+		inputBuffer[i] -= (short int) (bias >> 15);
+	}
+	
+	/* if ec is off, clear ec state -- this way, we start fresh if/when
+	* it's turned back on. */
+	if ( !(iaxci_filters & IAXC_FILTER_ECHO) )
+	{
+		if ( ec )
+		{
+			speex_echo_state_destroy(ec);
+			ec = NULL;
+			if ( st )
+				speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_ECHO_STATE, NULL);
+		}
+
+		return;
+	}
+
+	/* we want echo cancellation */
+	if ( !ec )
+	{
+		rb_InitializeRingBuffer(&ecOutRing, EC_RING_SIZE, &outRingBuf);
+		ec = speex_echo_state_init(SAMPLES_PER_FRAME, ECHO_TAIL);
+		if ( st )
+		{
+			speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_ECHO_STATE, ec);
+			i = ECHO_SUPPRESS;
+			speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_ECHO_SUPPRESS, &i);
+			i = ECHO_SUPPRESS_ACTIVE;
+			speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_ECHO_SUPPRESS_ACTIVE, &i);			
+		}
+	}
+
+	/* fill ecOutRing */
+	rb_WriteRingBuffer(&ecOutRing, outputBuffer, samples * 2);
+
+	// Make sure we have enough buffer.
+	// Currently, just one SAMPLES_PER_FRAME's worth.
+	if ( rb_GetRingBufferReadAvailable(&ecOutRing) < ((samples + SAMPLES_PER_FRAME) * 2) )
+		return;
+
+	rb_ReadRingBuffer(&ecOutRing, delayedBuf, samples * 2);
+
+	speex_echo_cancellation(ec, inputBuffer, delayedBuf, cancelledBuffer);
+
+	for ( i = 0; i < samples; i++ )
+		inputBuffer[i] = cancelledBuffer[i];
+#endif
+}
+

Modified: branches/team/mihai/echocan/lib/audio_encode.h
===================================================================
--- branches/team/mihai/echocan/lib/audio_encode.h	2007-09-14 18:22:02 UTC (rev 1139)
+++ branches/team/mihai/echocan/lib/audio_encode.h	2007-09-18 17:55:59 UTC (rev 1140)
@@ -15,6 +15,28 @@
 #ifndef _AUDIO_ENCODE_H
 #define _AUDIO_ENCODE_H
 
+/* Some audio parameters */
+#define MAX_SAMPLE_RATE       48000
+#ifndef MS_PER_FRAME
+# define MS_PER_FRAME         40
+#endif
+
+extern int iaxci_sample_rate;
+#define SAMPLES_PER_FRAME     (MS_PER_FRAME * iaxci_sample_rate / 1000)
+
+#define MAX_SAMPLES_PER_FRAME (MS_PER_FRAME * MAX_SAMPLE_RATE  / 1000)
+
+/* echo_tail length, in samples */
+#define ECHO_TAIL 1024
+
+/* Maximum attenuation of residual echo in dB (negative number) */
+#define ECHO_SUPPRESS -60
+/* Maximum attenuation of residual echo when near end is active, in dB (negative number) */
+#define ECHO_SUPPRESS_ACTIVE -60
+
+/* Size of ring buffer used for echo can */
+#define EC_RING_SIZE  8192 /* must be pow(2) */
+
 struct iaxc_call;
 struct iax_event;
 
@@ -24,5 +46,7 @@
 int audio_decode_audio(struct iaxc_call * p, void * out, void * data, int len,
 		int iEncodeType, int * samples);
 
+void audio_echo_cancellation(short *inputBuffer, short *outputBuffer, int samples);
+
 #endif
 

Modified: branches/team/mihai/echocan/lib/audio_portaudio.c
===================================================================
--- branches/team/mihai/echocan/lib/audio_portaudio.c	2007-09-14 18:22:02 UTC (rev 1139)
+++ branches/team/mihai/echocan/lib/audio_portaudio.c	2007-09-18 17:55:59 UTC (rev 1140)
@@ -32,29 +32,18 @@
 #endif
 
 #include "audio_portaudio.h"
+#include "audio_encode.h"
 #include "iaxclient_lib.h"
 #include "ringbuffer.h"
 #include "portmixer.h"
 
-#ifdef USE_MEC2
-#include "mec3.h"
-static echo_can_state_t *ec;
-#endif
-
-#ifdef SPAN_EC
-#include "ec/echo.h"
-static echo_can_state_t *ec;
-#endif
-
 #ifdef SPEEX_EC
 #define restrict __restrict
 #include "speex/speex_echo.h"
 static SpeexEchoState *ec;
 #endif
 
-#define EC_RING_SZ  8192 /* must be pow(2) */
 
-
 typedef short SAMPLE;
 
 static PaStream *iStream, *oStream, *aStream;
@@ -62,22 +51,8 @@
 
 static int selectedInput, selectedOutput, selectedRing;
 
-static int sample_rate = 8000;
 static int mixers_initialized;
 
-
-#define MAX_SAMPLE_RATE       48000
-#ifndef MS_PER_FRAME
-# define MS_PER_FRAME         40
-#endif
-#define SAMPLES_PER_FRAME     (MS_PER_FRAME * sample_rate / 1000)
-
-/* static frame buffer allocation */
-#define MAX_SAMPLES_PER_FRAME (MS_PER_FRAME * MAX_SAMPLE_RATE  / 1000)
-
-/* echo_tail length, in frames must be pow(2) for mec/span ? */
-#define ECHO_TAIL 4096
-
 /* RingBuffer Size; Needs to be Pow(2), 1024 = 512 samples = 64ms */
 #ifndef OUTRBSZ
 # define OUTRBSZ 32768
@@ -120,7 +95,7 @@
 #endif
 
 /* size in bytes of ringbuffer target */
-#define RBOUTTARGET_BYTES (RBOUTTARGET * (sample_rate / 1000) * sizeof(SAMPLE))
+#define RBOUTTARGET_BYTES (RBOUTTARGET * (iaxci_sample_rate / 1000) * sizeof(SAMPLE))
 
 static char inRingBuf[INRBSZ], outRingBuf[OUTRBSZ];
 static rb_RingBuffer inRing, outRing;
@@ -369,82 +344,6 @@
 	return retval; /* found? */
 }
 
-static void iaxc_echo_can(short *inputBuffer, short *outputBuffer, int n)
-{
-	static rb_RingBuffer ecOutRing;
-	static char outRingBuf[EC_RING_SZ];
-	static long bias = 0;
-	short  delayedBuf[1024];
-	int i;
-
-	/* remove bias -- whether ec is on or not. */
-	for ( i = 0; i < n; i++ )
-	{
-		bias += ((((long int) inputBuffer[i]) << 15) - bias) >> 14;
-		inputBuffer[i] -= (short int) (bias >> 15);
-	}
-
-	/* if ec is off, clear ec state -- this way, we start fresh if/when
-	 * it's turned back on. */
-	if ( !(iaxc_get_filters() & IAXC_FILTER_ECHO) )
-	{
-		if ( ec )
-		{
-#if defined(USE_MEC2) || defined(SPAN_EC)
-			echo_can_free(ec);
-			ec = NULL;
-#endif
-#if defined(SPEEX_EC)
-			speex_echo_state_destroy(ec);
-			ec = NULL;
-#endif
-		}
-
-		return;
-	}
-
-	/* we want echo cancellation */
-
-	if ( !ec )
-	{
-		rb_InitializeRingBuffer(&ecOutRing, EC_RING_SZ, &outRingBuf);
-#if defined(USE_MEC2) || defined(SPAN_EC)
-		ec = echo_can_create(ECHO_TAIL, 0);
-#endif
-#if defined(SPEEX_EC)
-		ec = speex_echo_state_init(SAMPLES_PER_FRAME, ECHO_TAIL);
-#endif
-	}
-
-	/* fill ecOutRing */
-	rb_WriteRingBuffer(&ecOutRing, outputBuffer, n * 2);
-
-	// Make sure we have enough buffer.
-	// Currently, just one SAMPLES_PER_FRAME's worth.
-	if ( rb_GetRingBufferReadAvailable(&ecOutRing) < ((n + SAMPLES_PER_FRAME) * 2) )
-		return;
-
-	rb_ReadRingBuffer(&ecOutRing, delayedBuf, n * 2);
-
-#if defined(SPEEX_EC)
-	{
-		short cancelledBuffer[1024];
-
-		speex_echo_cancel(ec, inputBuffer, delayedBuf,
-				cancelledBuffer, NULL);
-
-		for ( i = 0; i < n; i++ )
-			inputBuffer[i] = cancelledBuffer[i];
-	}
-#endif
-
-#if defined(USE_MEC2) || defined(SPAN_EC)
-	for ( i = 0; i < n; i++ )
-		inputBuffer[i] = echo_can_update(ec, delayedBuf[i],
-				inputBuffer[i]);
-#endif
-}
-
 static int pa_callback(void *inputBuffer, void *outputBuffer,
 	    unsigned long samplesPerFrame,
 	    const PaStreamCallbackTimeInfo* outTime,
@@ -511,17 +410,16 @@
 		{
 			stereo2mono(virtualInBuffer, (SAMPLE *)inputBuffer,
 					samplesPerFrame);
-			iaxc_echo_can(virtualInBuffer, virtualOutBuffer,
-					samplesPerFrame);
-
+			audio_echo_cancellation(virtualInBuffer,
+			                        virtualOutBuffer,
+			                        samplesPerFrame);
 			rb_WriteRingBuffer(&inRing, virtualInBuffer, totBytes);
 		}
 		else
 		{
-			iaxc_echo_can((short *)inputBuffer,
-					(short *)outputBuffer,
-					samplesPerFrame);
-
+			audio_echo_cancellation((short *)inputBuffer,
+			                        (short *)outputBuffer,
+			                        samplesPerFrame);
 			rb_WriteRingBuffer(&inRing, inputBuffer, totBytes);
 		}
 	}
@@ -581,7 +479,7 @@
 		err = Pa_OpenStream(&iStream,
 			&in_stream_params,
 			&out_stream_params,
-			sample_rate,
+			iaxci_sample_rate,
 			paFramesPerBufferUnspecified, //FEEBACK - unsure if appropriate
 			paNoFlag,
 			(PaStreamCallback *)pa_callback,
@@ -594,7 +492,7 @@
 		err = Pa_OpenStream(&iStream,
 			&in_stream_params,
 			&no_device,
-			sample_rate,
+			iaxci_sample_rate,
 			paFramesPerBufferUnspecified, //FEEBACK - unsure if appropriate
 			paNoFlag,
 			(PaStreamCallback *)pa_callback,
@@ -604,7 +502,7 @@
 		err = Pa_OpenStream(&oStream,
 			&no_device,
 			&out_stream_params,
-			sample_rate,
+			iaxci_sample_rate,
 			paFramesPerBufferUnspecified, //FEEBACK - unsure if appropriate
 			paNoFlag,
 			(PaStreamCallback *)pa_callback,
@@ -711,7 +609,7 @@
 	err = Pa_OpenStream ( &aStream,
 			&in_stream_params,
 			&ring_stream_params,
-			sample_rate,
+			iaxci_sample_rate,
 			paFramesPerBufferUnspecified, //FEEBACK - unsure if appropriate
 			paNoFlag,
 			(PaStreamCallback *)pa_aux_callback,
@@ -724,7 +622,7 @@
 		err = Pa_OpenStream ( &aStream,
 				&no_device,
 				&ring_stream_params,
-				sample_rate,
+				iaxci_sample_rate,
 				paFramesPerBufferUnspecified, //FEEBACK - unsure if appropriate
 				paNoFlag,   /* flags */
 				(PaStreamCallback *)pa_aux_callback,
@@ -1059,7 +957,7 @@
 {
 	PaError  err;
 
-	sample_rate = sr;
+	iaxci_sample_rate = sr;
 
 	/* initialize portaudio */
 	if ( paNoError != (err = Pa_Initialize()) )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Iaxclient-cvs] SF.net SVN: iaxclient: [1140] branches/team/mihai/echocan/lib

iaxclient-cvs