[Pkg-voip-commits] r5681 - in /zaptel/trunk/debian: README.Debian changelog rules zaptel.init

Wed May 7 23:05:32 UTC 2008

Author: tzafrir-guest
Date: Wed May  7 23:05:31 2008
New Revision: 5681

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5681
Log:
* Set OSLEC as the default echo canceller.
* The "unload" init.d script operation will now also attempt to unload
  oslec.

Modified:
    zaptel/trunk/debian/README.Debian
    zaptel/trunk/debian/changelog
    zaptel/trunk/debian/rules
    zaptel/trunk/debian/zaptel.init

Modified: zaptel/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/README.Debian?rev=5681&op=diff
==============================================================================

--- zaptel/trunk/debian/README.Debian (original)
+++ zaptel/trunk/debian/README.Debian Wed May  7 23:05:31 2008
@@ -79,19 +79,21 @@
 defaultzone=us
 
 
-OSLEC
------
+Echo Canceller
+--------------
 Open Source Line Echo Canceller (OSLEC) is an alternative echo canceller 
 developed outside the main Zaptel tree. It is currently labelled "Beta".
 For more information see http://www.rowetel.com/ucasterisk/oslec.html .
+It generally works much better than the default upstream echo canceller
+(MG2). On the downside, it has a higher CPU consumption.
 
-It will not build by default, as it introduces an extra kernel module that 
-doesn't wit well so far with the current modules loading / unloading 
-procedures. To build and install a zaptel-modules package with oslec as the 
-echo canceller, install the package zaptel-source and use the following 
-command:
+We now include OSLEC and make it our default echo canceller. Unlike the
+original distribution of oslec, we include it as part of the Zaptel
+package. It will get built unless we set an alternative echo canceller.
+If you still want to use the original echo MG2 echo canceller, build 
+the zaptel-modules package using:
 
-  ECHO_CAN_NAME=OSLEC m-a a-i zaptel
+  ECHO_CAN_NAME=MG2 m-a a-i zaptel
 
 The oslec code is the package required some minor changes to the code in
 from the oslec repository. Specifically, I have not included the full copy 
@@ -106,7 +108,19 @@
 under /proc/oslec . A dialg-based interface is available under
 /usr/share/zaptel/examples/oslec-ctrl-panel.sh .
 
-Please help testing oslec.
+According to early tests by OSLEC users, the default Asterisk echo
+canceller size of 128 taps (16ms) should be good enough for most
+installations, and 256 taps (32 ms) should cover just about any case. 
+For phones connected to FXS ports you can use substatially lower values
+in order to reduce CPU consumption. e.g: 8ms or even 4 ms (64 taps or 32
+taps).
+
+Setting the number of taps for a channel in Asterisk's chan_zap is done
+using the following in Asterisk's zapata.conf: 
+
+  echocancell=NNN
+
+where NNN is the number of taps. See Asterisk sample zapata.conf .
 
 
 Build-time Tests

Modified: zaptel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/changelog?rev=5681&op=diff
==============================================================================
--- zaptel/trunk/debian/changelog (original)
+++ zaptel/trunk/debian/changelog Wed May  7 23:05:31 2008
@@ -8,8 +8,11 @@
   * Note the buid "error" from http://bugs.digium.com/12426 .
   * Fix the generation of tonezone.txt.
   * Patch xpp_fix_t1: allow the xpp pri module to initialize as T1.
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Tue, 22 Apr 2008 10:10:49 +0300
+  * Set OSLEC as the default echo canceller.
+  * The "unload" init.d script operation will now also attempt to unload
+    oslec.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu,  8 May 2008 02:03:34 +0300
 
 zaptel (1:1.4.10~dfsg-1) unstable; urgency=low
 

Modified: zaptel/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/rules?rev=5681&op=diff
==============================================================================
--- zaptel/trunk/debian/rules (original)
+++ zaptel/trunk/debian/rules Wed May  7 23:05:31 2008
@@ -55,6 +55,10 @@
   # directory.
   EXTRA_MODS+=$(BRISTUFF_MODULES)
   EXTRA_SUBDIRS += vzaphfc
+endif
+
+ifndef ECHO_CAN_NAME
+ECHO_CAN_NAME=OSLEC
 endif
 
 ifeq ($(ECHO_CAN_NAME),OSLEC)

Modified: zaptel/trunk/debian/zaptel.init
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/zaptel.init?rev=5681&op=diff
==============================================================================
--- zaptel/trunk/debian/zaptel.init (original)
+++ zaptel/trunk/debian/zaptel.init Wed May  7 23:05:31 2008
@@ -127,6 +127,10 @@
 		;;
 	unload)
 		unload_module zaptel
+		# if oslec is the echo canceller, loading zaptel will
+		# also load oslec. Thus we need to be able to unload it
+		# as well:
+		unload_module oslec
 		;;
 	status)
 		check_zaptel_timing


