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

[<sb...@us...>]

Revision: 1344
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1344&view=rev
Author:   sbalea
Date:     2008-02-07 08:50:56 -0800 (Thu, 07 Feb 2008)

Log Message:
-----------
Merge speex-1.2beta3 changes from trunk.

Modified Paths:
--------------
    branches/team/mihai/echocan/configure.ac
    branches/team/mihai/echocan/lib/Makefile.am
    branches/team/mihai/echocan/lib/audio_encode.c
    branches/team/mihai/echocan/m4/speex.m4

Modified: branches/team/mihai/echocan/configure.ac
===================================================================
--- branches/team/mihai/echocan/configure.ac	2008-02-06 00:09:00 UTC (rev 1343)
+++ branches/team/mihai/echocan/configure.ac	2008-02-07 16:50:56 UTC (rev 1344)
@@ -227,6 +227,12 @@
    obtain a copy.
 ]))
 
+PKG_CHECK_MODULES(SPEEXDSP, [speexdsp >= 1.2],,AC_MSG_ERROR([
+   speexdsp is required to build this package!
+   please see http://www.xiph.org/ for how to
+   obtain a copy.
+]))
+
 has_theora=no
 if test ! x$with_theora = xno; then
 PKG_CHECK_MODULES(THEORA, [theora >= 1.0alpha7],has_theora=yes)

Modified: branches/team/mihai/echocan/lib/Makefile.am
===================================================================
--- branches/team/mihai/echocan/lib/Makefile.am	2008-02-06 00:09:00 UTC (rev 1343)
+++ branches/team/mihai/echocan/lib/Makefile.am	2008-02-07 16:50:56 UTC (rev 1344)
@@ -12,6 +12,7 @@
 AM_CFLAGS =					\
 	$(PTHREAD_CFLAGS)			\
 	$(SPEEX_CFLAGS)				\
+	$(SPEEXDSP_CFLAGS)			\
 	$(IAX2_CFLAGS)				\
 	$(PORTAUDIO_CFLAGS)
 
@@ -25,7 +26,8 @@
 	$(PTHREAD_LIBS)				\
 	$(IAX2_LIBS)				\
 	$(PORTAUDIO_LIBS)			\
-	$(SPEEX_LIBS)
+	$(SPEEX_LIBS)				\
+	$(SPEEXDSP_LIBS)
 
 AM_LDFLAGS =					\
 	-no-undefined				\

Modified: branches/team/mihai/echocan/lib/audio_encode.c
===================================================================
--- branches/team/mihai/echocan/lib/audio_encode.c	2008-02-06 00:09:00 UTC (rev 1343)
+++ branches/team/mihai/echocan/lib/audio_encode.c	2008-02-07 16:50:56 UTC (rev 1344)
@@ -197,9 +197,9 @@
 
 		if ( (i & 0x3f) == 0 )
 		{
-			int loudness;
+			float loudness;
 			speex_preprocess_ctl(st, SPEEX_PREPROCESS_GET_AGC_LOUDNESS, &loudness);
-			if ( loudness > AAGC_HOT || loudness < AAGC_COLD )
+			if ( loudness > 8000.0f || loudness < 4000.0f )
 			{
 				const float level = iaxc_input_level_get();
 

Modified: branches/team/mihai/echocan/m4/speex.m4
===================================================================
--- branches/team/mihai/echocan/m4/speex.m4	2008-02-06 00:09:00 UTC (rev 1343)
+++ branches/team/mihai/echocan/m4/speex.m4	2008-02-07 16:50:56 UTC (rev 1344)
@@ -41,7 +41,7 @@
     SPEEX_LIBS="-L$prefix/lib"
   fi
 
-  SPEEX_LIBS="$SPEEX_LIBS -lspeex"
+  SPEEX_LIBS="$SPEEX_LIBS -lspeex -lspeexdsp"
 
   if test "x$speex_includes" != "x" ; then
     SPEEX_CFLAGS="-I$speex_includes"
@@ -60,7 +60,7 @@
     LIBS="$LIBS $SPEEX_LIBS"
 
 dnl Check for a working version of speex that is of the right version.
-min_speex_version=ifelse([$1], ,1.0.0,$1)
+min_speex_version=ifelse([$1], ,1.2.0,$1)
 AC_MSG_CHECKING(for speex headers version >= $min_speex_version)
 #no_speex=""
     speex_min_major_version=`echo $min_speex_version | \


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