diff options
| author | fjoe <fjoe@FreeBSD.org> | 2009-09-17 03:33:37 +0800 |
|---|---|---|
| committer | fjoe <fjoe@FreeBSD.org> | 2009-09-17 03:33:37 +0800 |
| commit | 3584e6fc0ef54c71fc0336ba4b3980905e2bab99 (patch) | |
| tree | 3ac19329cb03c98c5a7355c9f9d3b87ee8f51655 /net | |
| parent | 718a3941fdfaf5d5b5015bc9b6b556439e3bc876 (diff) | |
| download | freebsd-ports-gnome-3584e6fc0ef54c71fc0336ba4b3980905e2bab99.tar.gz freebsd-ports-gnome-3584e6fc0ef54c71fc0336ba4b3980905e2bab99.tar.zst freebsd-ports-gnome-3584e6fc0ef54c71fc0336ba4b3980905e2bab99.zip | |
Update to 1.4.26.2 + bristuff-0.4.0-RC3g.
All patches except 122-chan_zap-GSM.diff are present in cumulative bristuff patch.
Sponsored by: Ethon Technologies GmbH
Feature safe: yes
Diffstat (limited to 'net')
46 files changed, 9517 insertions, 2861 deletions
diff --git a/net/asterisk-bristuff/Makefile b/net/asterisk-bristuff/Makefile index 3fe5985ddff4..d56c3466af84 100644 --- a/net/asterisk-bristuff/Makefile +++ b/net/asterisk-bristuff/Makefile @@ -6,18 +6,18 @@ # PORTNAME= asterisk -PORTVERSION= 1.2.13 -PORTREVISION= 9 +PORTVERSION= 1.4.26.2 +PORTREVISION= 0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ PKGNAMESUFFIX= -bristuff -PATCHFILES= ${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz -PATCH_SITES= ${MASTER_SITE_LOCAL} -PATCH_SITE_SUBDIR= fjoe +PATCHFILES= ${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz:bristuff +PATCH_SITES= ${MASTER_SITE_LOCAL:S,$,:bristuff,} +PATCH_SITE_SUBDIR= fjoe:bristuff PATCH_DIST_STRIP= -p1 -BRIVER= bristuff-0.3.0-PRE-1s +BRIVER= bristuff-0.4.0-RC3g CONFLICTS= asterisk-[0-9]* MAINTAINER= fjoe@FreeBSD.org @@ -26,13 +26,17 @@ COMMENT= An Open Source PBX and telephony toolkit BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \ newt.51:${PORTSDIR}/devel/newt \ + gsm.1:${PORTSDIR}/audio/gsm \ curl.5:${PORTSDIR}/ftp/curl RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -ONLY_FOR_ARCHS= i386 sparc64 amd64 +ONLY_FOR_ARCHS= i386 sparc64 amd64 powerpc GNU_CONFIGURE= yes -CONFIGURE_WRKSRC= ${WRKSRC}/editline +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \ + LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --with-gsm=${LOCALBASE} +CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 USE_GMAKE= yes USE_BISON= build USE_RC_SUBR= asterisk.sh @@ -41,58 +45,166 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ MKDIR="${MKDIR}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ OPENH323DIR=${LOCALBASE}/share/openh323 \ - OSVERSION=${OSVERSION} + OSVERSION=${OSVERSION} \ + NOISY_BUILD=YES \ + ASTCFLAGS="${CFLAGS}" MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8 +CONFLICTS= asterisk*-1.2* asterisk*-1.6* + +OPTIONS= OGGVORBIS "Enable Ogg Vorbis support" on \ + ODBC "Enable ODBC support" on \ + POSTGRES "Enable PostgreSQL support" on \ + RADIUS "Enable RADIUS accounting support" on \ + SNMP "Enable SNMP support" on \ + H323 "Enable H.323 support" on \ + FREETDS "Enable FreeTDS support" on \ + JABBER "Enable Jabber and Gtalk support" on \ + SQLITE "Enable SQLITE support" on \ + ILBC "Enable iLBC codec" off \ + MISC_PATCHES "Apply additional patches" off + +# not yet +# CODEC_PATCH "Apply codec negotiation patch" off \ .include <bsd.port.pre.mk> -.if ${ARCH} != "i386" -WITHOUT_H323= 1 -WITHOUT_ZAPTEL= 1 -BROKEN= current does not build +.if ${ARCH} == "i386" || ${ARCH} == "amd64" +OPTIONS+= ZAPTEL "Enable Zaptel support" on + +# Include this since we have altered OPTIONS. +.include "$(PORTSDIR)/Mk/bsd.port.options.mk" .endif -.if defined(WITHOUT_H323) +.if !defined(WITH_H323) PLIST_SUB+= WITH_H323="@comment " +CONFIGURE_ARGS+= --without-h323 .else -LIB_DEPENDS+= pt_r.1:${PORTSDIR}/devel/pwlib\ - h323_r.1:${PORTSDIR}/net/openh323 PLIST_SUB+= WITH_H323="" -MAKE_ENV+= WITH_H323=1 +CONFIGURE_ARGS+= --with-h323=${LOCALBASE} +LIB_DEPENDS+= pt_r.1:${PORTSDIR}/devel/pwlib \ + h323_r.1:${PORTSDIR}/net/openh323 .endif -.if defined(WITHOUT_ZAPTEL) +.if !defined(WITH_ZAPTEL) PLIST_SUB+= WITH_ZAPTEL="@comment " -MAKE_ENV+= WITHOUT_ZAPTEL=1 +CONFIGURE_ARGS+= --without-zaptel --without-dahdi .else +PLIST_SUB+= WITH_ZAPTEL="" +CONFIGURE_ARGS+= --with-zaptel --without-dahdi BUILD_DEPENDS+= ${LOCALBASE}/include/zaptel/zaptel.h:${PORTSDIR}/misc/zaptel -LIB_DEPENDS+= pri-bristuff.1:${PORTSDIR}/misc/libpri-bristuff +LIB_DEPENDS+= pri-bristuff.1:${PORTSDIR}/misc/libpri RUN_DEPENDS+= ${LOCALBASE}/include/zaptel/zaptel.h:${PORTSDIR}/misc/zaptel -PLIST_SUB+= WITH_ZAPTEL="" -MAKE_ENV+= WITH_ZAPTEL=1 .endif # # WITH_FREETDS, WITH_PGSQL and WITH_SQLITE can also be added to MAKE_ENV # similarly -.if defined(WITHOUT_ODBC) +.if !defined(WITH_ODBC) PLIST_SUB+= WITH_ODBC="@comment " +CONFIGURE_ARGS+= --without-odbc .else -LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC PLIST_SUB+= WITH_ODBC="" -MAKE_ENV+= WITH_ODBC=1 +CONFIGURE_ARGS+= --with-odbc --with-ltdl +LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC \ + ltdl.7:${PORTSDIR}/devel/libltdl22 +.endif + +.if !defined(WITH_FREETDS) +PLIST_SUB+= WITH_FREETDS="@comment " +CONFIGURE_ARGS+= --without-tds +.else +PLIST_SUB+= WITH_FREETDS="" +CONFIGURE_ARGS+= --with-tds=${LOCALBASE} +LIB_DEPENDS+= tds.5:${PORTSDIR}/databases/freetds +.endif + +.if !defined(WITH_POSTGRES) +PLIST_SUB+= WITH_POSTGRES="@comment " +CONFIGURE_ARGS+= --without-postgres +.else +PLIST_SUB+= WITH_POSTGRES="" +USE_PGSQL= yes +CONFIGURE_ARGS+= --with-postgres +.endif + +.if !defined(WITH_OGGVORBIS) +PLIST_SUB+= WITH_OGGVORBIS="@comment " +CONFIGURE_ARGS+= --without-ogg +.else +PLIST_SUB+= WITH_OGGVORBIS="" +CONFIGURE_ARGS+= --with-ogg +LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis +.endif + +.if !defined(WITH_RADIUS) +PLIST_SUB+= WITH_RADIUS="@comment " +CONFIGURE_ARGS+= --without-radius +.else +PLIST_SUB+= WITH_RADIUS="" +CONFIGURE_ARGS+= --with-radius +LIB_DEPENDS+= radiusclient-ng.2:${PORTSDIR}/net/radiusclient +.endif + +.if !defined(WITH_SNMP) +PLIST_SUB+= WITH_SNMP="@comment " +CONFIGURE_ARGS+= --without-netsnmp +.else +PLIST_SUB+= WITH_SNMP="" +CONFIGURE_ARGS+= --with-netsnmp +LIB_DEPENDS+= netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp +.endif + +.if !defined(WITH_JABBER) +PLIST_SUB+= WITH_JABBER="@comment " +CONFIGURE_ARGS+= --without-iksemel +.else +PLIST_SUB+= WITH_JABBER="" +CONFIGURE_ARGS+= --with-iksemel +LIB_DEPENDS+= iksemel.4:${PORTSDIR}/textproc/iksemel +.endif + +.if !defined(WITH_SQLITE) +PLIST_SUB+= WITH_SQLITE="@comment " +CONFIGURE_ARGS+= --without-sqlite +.else +PLIST_SUB+= WITH_SQLITE="" +CONFIGURE_ARGS+= --with-sqlite +LIB_DEPENDS+= sqlite:${PORTSDIR}/databases/sqlite2 .endif -.if defined(WITHOUT_FAX) -PLIST_SUB+= WITH_FAX="@comment " +.if !defined(WITH_ILBC) +PLIST_SUB+= WITH_ILBC="@comment " .else -MAKE_ENV+= WITH_FAX=1 -LIB_DEPENDS+= spandsp.0:${PORTSDIR}/comms/spandsp -PLIST_SUB+= WITH_FAX="" +PLIST_SUB+= WITH_ILBC="" +EXTRA_PATCHES+= ${PATCHDIR}/ilbc_enable.diff .endif +.if defined(WITH_CODEC_PATCH) +PATCHFILES+= asterisk-1.4.25-codec-negotiation-20090526.diff.gz +PATCH_SITES+= http://b2bua.org/chrome/site/ +EXTRA_PATCHES+= ${PATCHDIR}/codecnego-patch-Makefile +.else +EXTRA_PATCHES+= ${PATCHDIR}/nocodecnego-patch-Makefile +.endif + +.if defined(WITH_MISC_PATCHES) +EXTRA_PATCHES+= ${PATCHDIR}/dtmf_debug.diff +EXTRA_PATCHES+= ${PATCHDIR}/sip_force_callid.diff +EXTRA_PATCHES+= ${PATCHDIR}/sip_set_auth.diff +.if defined(WITH_CODEC_PATCH) +EXTRA_PATCHES+= ${PATCHDIR}/rtp_force_dtmf-codecnego.diff +.else +EXTRA_PATCHES+= ${PATCHDIR}/rtp_force_dtmf-nocodecnego.diff +.endif +.endif + +post-extract: + ${MKDIR} ${WRKSRC}/codecs/ilbc + ${FIND} ${WRKSRC} -name '*.d' -delete + post-patch: ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample - ${REINPLACE_CMD} -e 's,^#include <libpri\.h>,#include <libpri-bristuff.h>,' ${WRKSRC}/channels/chan_zap.c + ${REINPLACE_CMD} -e 's,^#include <libpri\.h>,#include <libpri-bristuff.h>,' ${WRKSRC}/channels/chan_dahdi.c + ${REINPLACE_CMD} -e 's,-lpri,-lpri-bristuff,' ${WRKSRC}/configure .include <bsd.port.post.mk> diff --git a/net/asterisk-bristuff/distinfo b/net/asterisk-bristuff/distinfo index 72d744575a40..2acf3d59863e 100644 --- a/net/asterisk-bristuff/distinfo +++ b/net/asterisk-bristuff/distinfo @@ -1,6 +1,6 @@ -MD5 (asterisk-1.2.13.tar.gz) = ad8fbe2198568f55c254045ecb3b7926 -SHA256 (asterisk-1.2.13.tar.gz) = 8d197b118d9ee25bc8793b37d1daa6b54fd6074e6738f462368361e5698d98f8 -SIZE (asterisk-1.2.13.tar.gz) = 10584113 -MD5 (asterisk-1.2.13-bristuff-0.3.0-PRE-1s.patch.gz) = ea2db8b5195e1eaf8274ba5aca8ef549 -SHA256 (asterisk-1.2.13-bristuff-0.3.0-PRE-1s.patch.gz) = 26a7306642f4589f909653d7aea15b026f9f155736f7ba08df0af3e0cd465e72 -SIZE (asterisk-1.2.13-bristuff-0.3.0-PRE-1s.patch.gz) = 110909 +MD5 (asterisk-1.4.26.2.tar.gz) = 58181c29d998f883f567dc9757a04167 +SHA256 (asterisk-1.4.26.2.tar.gz) = 384e080e359ae28ca9323800a3fa0586210342039b96ecbdced9ea285516efe9 +SIZE (asterisk-1.4.26.2.tar.gz) = 21436723 +MD5 (asterisk-1.4.26.2-bristuff-0.4.0-RC3g.patch.gz) = 1e9f8448a1e1e43376c30d6172a7e39d +SHA256 (asterisk-1.4.26.2-bristuff-0.4.0-RC3g.patch.gz) = 4dd61ebde6323815d3e82fe2c3738d691322aaf4816f0820042c93470b4dce13 +SIZE (asterisk-1.4.26.2-bristuff-0.4.0-RC3g.patch.gz) = 69460 diff --git a/net/asterisk-bristuff/files/asterisk.sh.in b/net/asterisk-bristuff/files/asterisk.sh.in index 3774209eefe1..e05d58ed6ee8 100644 --- a/net/asterisk-bristuff/files/asterisk.sh.in +++ b/net/asterisk-bristuff/files/asterisk.sh.in @@ -3,7 +3,6 @@ # PROVIDE: asterisk # REQUIRE: DAEMON # KEYWORD: shutdown - # # Add the following lines to /etc/rc.conf to enable asterisk: # @@ -12,6 +11,14 @@ . %%RC_SUBR%% +stop_precmd=asterisk_shutdown +sig_stop=KILL +asterisk_shutdown () { + %%PREFIX%%/sbin/asterisk -qrx 'stop now' + sleep 1 + return 0 +} + name=asterisk rcvar=`set_rcvar` diff --git a/net/asterisk-bristuff/files/codecnego-patch-Makefile b/net/asterisk-bristuff/files/codecnego-patch-Makefile new file mode 100644 index 000000000000..03f724a899ec --- /dev/null +++ b/net/asterisk-bristuff/files/codecnego-patch-Makefile @@ -0,0 +1,222 @@ + +$FreeBSD: /tmp/pcvs/ports/net/asterisk-bristuff/files/Attic/codecnego-patch-Makefile,v 1.1 2009-09-16 19:33:37 fjoe Exp $ + +--- Makefile.orig ++++ Makefile +@@ -95,7 +95,7 @@ + OVERWRITE=y + + # Include debug and macro symbols in the executables (-g) and profiling info (-pg) +-DEBUG=-g3 ++#DEBUG=-g3 + + # Staging directory + # Files are copied here temporarily during the install process +@@ -129,7 +129,7 @@ + ASTMANDIR=$(mandir) + ifneq ($(findstring BSD,$(OSARCH)),) + ASTVARLIBDIR=$(prefix)/share/asterisk +- ASTVARRUNDIR=$(localstatedir)/run/asterisk ++ ASTVARRUNDIR=$(localstatedir)/run + else + ASTVARLIBDIR=$(localstatedir)/lib/asterisk + endif +@@ -219,9 +219,11 @@ + ASTLDFLAGS+=-L/usr/local/lib + endif + ++ifneq ($(OSARCH),FreeBSD) + ifneq ($(PROC),ultrasparc) + ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) + endif ++endif + + ifeq ($(PROC),ppc) + ASTCFLAGS+=-fsigned-char +@@ -229,7 +231,7 @@ + + ifeq ($(OSARCH),FreeBSD) + # -V is understood by BSD Make, not by GNU make. +- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) ++ BSDVERSION=$(OSVERSION) + ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) + AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) + endif +@@ -408,15 +410,15 @@ + # Should static HTTP be installed during make samples or even with its own target ala + # webvoicemail? There are portions here that *could* be customized but might also be + # improved a lot. I'll put it here for now. +- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http ++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http + for x in static-http/*; do \ +- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ + done +- mkdir -p $(DESTDIR)$(ASTDATADIR)/images ++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/images + for x in images/*.jpg; do \ +- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/images ; \ + done +- mkdir -p $(DESTDIR)$(AGI_DIR) ++ $(MKDIR) $(DESTDIR)$(AGI_DIR) + $(MAKE) -C sounds install + + update: +@@ -437,47 +439,47 @@ + OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) + + installdirs: +- mkdir -p $(DESTDIR)$(MODULES_DIR) +- mkdir -p $(DESTDIR)$(ASTSBINDIR) +- mkdir -p $(DESTDIR)$(ASTETCDIR) +- mkdir -p $(DESTDIR)$(ASTBINDIR) +- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor ++ $(MKDIR) $(DESTDIR)$(MODULES_DIR) ++ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) ++ $(MKDIR) $(DESTDIR)$(ASTETCDIR) ++ $(MKDIR) $(DESTDIR)$(ASTBINDIR) ++ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor + + bininstall: _all installdirs $(SUBDIRS_INSTALL) +- $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/ ++ $(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/ + $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk +- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ +- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ ++ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ ++ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ + if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ +- cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ +- chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ ++ cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe_asterisk.out;\ ++ ${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ + fi +- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) +- $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir) +- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) ++ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR) ++ $(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir) ++ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) + if [ -n "$(OLDHEADERS)" ]; then \ + rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\ + fi +- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv +- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom +- mkdir -p $(DESTDIR)$(ASTDATADIR)/keys +- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware +- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax +- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8 +- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys +- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys +- $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 +- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 +- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 +- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 ++ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv ++ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom ++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys ++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware ++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax ++ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8 ++ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys ++ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys ++ $(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 ++ $(BSD_INSTALL_MAN) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 ++ $(BSD_INSTALL_MAN) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 ++ $(BSD_INSTALL_MAN) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 + if [ -f contrib/firmware/iax/iaxy.bin ] ; then \ +- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ ++ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ + fi + + $(SUBDIRS_INSTALL): +@@ -513,7 +515,7 @@ + @exit 1 + endif + +-install: badshell datafiles bininstall ++install: badshell datafiles bininstall samples + @if [ -x /usr/sbin/asterisk-post-install ]; then \ + /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ + fi +@@ -551,31 +553,23 @@ + upgrade: bininstall + + adsi: +- mkdir -p $(DESTDIR)$(ASTETCDIR) ++ $(MKDIR) $(DESTDIR)$(ASTETCDIR) + for x in configs/*.adsi; do \ + if [ ! -f $(DESTDIR)$(ASTETCDIR)/$$x ]; then \ +- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ + fi ; \ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \ + done + + samples: adsi +- mkdir -p $(DESTDIR)$(ASTETCDIR) ++ $(MKDIR) $(DESTDIR)$(ASTETCDIR) + for x in configs/*.sample; do \ +- if [ -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ +- if [ "$(OVERWRITE)" = "y" ]; then \ +- if cmp -s $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $$x ; then \ +- echo "Config file $$x is unchanged"; \ +- continue; \ +- fi ; \ +- mv -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.old ; \ +- else \ +- echo "Skipping config file $$x"; \ +- continue; \ +- fi ;\ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ;\ ++ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`;\ + fi ; \ +- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ;\ + done +- if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ ++ if true; then \ + ( \ + echo "[directories]" ; \ + echo "astetcdir => $(ASTETCDIR)" ; \ +@@ -662,20 +656,23 @@ + echo "; Default: strict"; \ + echo ";"; \ + echo ";translation_algorithm = strict"; \ +- ) > $(DESTDIR)$(ASTCONFPATH) ; \ ++ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \ ++ if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ ++ cp $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \ ++ fi; \ + else \ + echo "Skipping asterisk.conf creation"; \ + fi +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX + build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR) + + webvmail: + @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 ) + @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 ) + $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi +- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk ++ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk + for x in images/*.gif; do \ +- $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ + done + @echo " +--------- Asterisk Web Voicemail ----------+" + @echo " + +" diff --git a/net/asterisk-bristuff/files/dtmf_debug.diff b/net/asterisk-bristuff/files/dtmf_debug.diff new file mode 100644 index 000000000000..968554880ac3 --- /dev/null +++ b/net/asterisk-bristuff/files/dtmf_debug.diff @@ -0,0 +1,226 @@ +--- channels/chan_sip.c.orig 2009-05-12 21:18:44.000000000 +0300 ++++ channels/chan_sip.c 2009-05-26 12:50:22.000000000 +0300 +@@ -3891,6 +3891,7 @@ + ast_log(LOG_WARNING, "old channel wasn't %p but was %p\n", oldchan, p->owner); + else { + p->owner = newchan; ++ ast_rtp_set_chan_name(p->rtp, newchan->name); + /* Re-invite RTP back to Asterisk. Needed if channel is masqueraded out of a native + RTP bridge (i.e., RTP not going through Asterisk): RTP bridge code might not be + able to do this if the masquerade happens before the bridge breaks (e.g., AMI +@@ -4168,6 +4169,7 @@ + if (i->rtp) { + tmp->fds[0] = ast_rtp_fd(i->rtp); + tmp->fds[1] = ast_rtcp_fd(i->rtp); ++ ast_rtp_set_chan_id(i->rtp, i->callid); + } + if (needvideo && i->vrtp) { + tmp->fds[2] = ast_rtp_fd(i->vrtp); +@@ -4195,6 +4197,8 @@ + if (!ast_strlen_zero(i->language)) + ast_string_field_set(tmp, language, i->language); + i->owner = tmp; ++ ast_rtp_set_chan_name(i->rtp, tmp->name); ++ + ast_module_ref(ast_module_info->self); + ast_copy_string(tmp->context, i->context, sizeof(tmp->context)); + /*Since it is valid to have extensions in the dialplan that have unescaped characters in them +@@ -4621,8 +4625,10 @@ + build_via(p); + if (!callid) + build_callid_pvt(p); +- else ++ else { + ast_string_field_set(p, callid, callid); ++ ast_rtp_set_chan_id(p->rtp, p->callid); ++ } + /* Assign default music on hold class */ + ast_string_field_set(p, mohinterpret, default_mohinterpret); + ast_string_field_set(p, mohsuggest, default_mohsuggest); +--- include/asterisk/rtp.h.orig 2008-03-04 20:05:28.000000000 +0200 ++++ include/asterisk/rtp.h 2009-05-26 12:50:22.000000000 +0300 +@@ -243,6 +243,9 @@ + + int ast_rtp_codec_getformat(int pt); + ++void ast_rtp_set_chan_name(struct ast_rtp *, const char *); ++void ast_rtp_set_chan_id(struct ast_rtp *, const char *); ++ + /*! \brief Set rtp timeout */ + void ast_rtp_set_rtptimeout(struct ast_rtp *rtp, int timeout); + /*! \brief Set rtp hold timeout */ +--- main/rtp.c.orig 2009-05-13 16:38:01.000000000 +0300 ++++ main/rtp.c 2009-05-26 12:52:30.000000000 +0300 +@@ -80,6 +80,7 @@ + static int rtpstart; /*!< First port for RTP sessions (set in rtp.conf) */ + static int rtpend; /*!< Last port for RTP sessions (set in rtp.conf) */ + static int rtpdebug; /*!< Are we debugging? */ ++static int rtpdebugdtmf; /*!< Are we debugging DTMFs? */ + static int rtcpdebug; /*!< Are we debugging RTCP? */ + static int rtcpstats; /*!< Are we debugging RTCP? */ + static int rtcpinterval = RTCP_DEFAULT_INTERVALMS; /*!< Time between rtcp reports in millisecs */ +@@ -173,6 +174,8 @@ + struct ast_codec_pref pref; + struct ast_rtp *bridged; /*!< Who we are Packet bridged to */ + int set_marker_bit:1; /*!< Whether to set the marker bit or not */ ++ char chan_name[100]; ++ char chan_id[100]; + }; + + /* Forward declarations */ +@@ -673,8 +676,8 @@ + struct ast_frame *f = NULL; + event = ntohl(*((unsigned int *)(data))); + event &= 0x001F; +- if (option_debug > 2 || rtpdebug) +- ast_log(LOG_DEBUG, "Cisco DTMF Digit: %08x (len = %d)\n", event, len); ++ if (option_debug > 2 || rtpdebug || rtpdebugdtmf) ++ ast_log(LOG_DEBUG, "Channel: %s %s Cisco DTMF packet: %08x (len = %d)\n", rtp->chan_name, rtp->chan_id, event, len); + if (event < 10) { + resp = '0' + event; + } else if (event < 11) { +@@ -688,12 +691,25 @@ + } + if (rtp->resp && (rtp->resp != resp)) { + f = send_dtmf(rtp, AST_FRAME_DTMF_END); ++ ast_log(LOG_DEBUG, "Channel: %s %s Cisco DTMF event: %c\n", rtp->chan_name, rtp->chan_id, rtp->resp); + } + rtp->resp = resp; + rtp->dtmf_timeout = 0; + return f; + } + ++void ast_rtp_set_chan_id(struct ast_rtp *rtp, const char *chan_id) { ++ if (rtp == NULL || chan_id == NULL) ++ return; ++ snprintf(rtp->chan_id, sizeof(rtp->chan_id), "%s", chan_id); ++} ++ ++void ast_rtp_set_chan_name(struct ast_rtp *rtp, const char *chan_name) { ++ if (rtp == NULL || chan_name == NULL) ++ return; ++ snprintf(rtp->chan_name, sizeof(rtp->chan_name), "%s", chan_name); ++} ++ + /*! + * \brief Process RTP DTMF and events according to RFC 2833. + * +@@ -1090,6 +1106,10 @@ + struct rtpPayloadType rtpPT; + int reconstruct = ntohl(rtpheader[0]); + ++ /* If we are listening for DTMF - then feed all packets into the core to keep the RTP stream consistent when relaying DTMFs */ ++ if (ast_test_flag(rtp, FLAG_P2P_NEED_DTMF)) ++ return -1; ++ + /* Get fields from packet */ + payload = (reconstruct & 0x7f0000) >> 16; + mark = (((reconstruct & 0x800000) >> 23) != 0); +@@ -1097,10 +1117,6 @@ + /* Check what the payload value should be */ + rtpPT = ast_rtp_lookup_pt(rtp, payload); + +- /* If the payload is DTMF, and we are listening for DTMF - then feed it into the core */ +- if (ast_test_flag(rtp, FLAG_P2P_NEED_DTMF) && !rtpPT.isAstFormat && rtpPT.code == AST_RTP_DTMF) +- return -1; +- + /* Otherwise adjust bridged payload to match */ + bridged_payload = ast_rtp_lookup_code(bridged, rtpPT.isAstFormat, rtpPT.code); + +@@ -1293,11 +1309,12 @@ + /* This is special in-band data that's not one of our codecs */ + if (rtpPT.code == AST_RTP_DTMF) { + /* It's special -- rfc2833 process it */ +- if (rtp_debug_test_addr(&sin)) { ++ if (rtp_debug_test_addr(&sin) || rtpdebugdtmf) { + unsigned char *data; + unsigned int event; + unsigned int event_end; + unsigned int duration; ++ + data = rtp->rawdata + AST_FRIENDLY_OFFSET + hdrlen; + event = ntohl(*((unsigned int *)(data))); + event >>= 24; +@@ -1306,9 +1323,12 @@ + event_end >>= 24; + duration = ntohl(*((unsigned int *)(data))); + duration &= 0xFFFF; +- ast_verbose("Got RTP RFC2833 from %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u, mark %d, event %08x, end %d, duration %-5.5d) \n", ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), payloadtype, seqno, timestamp, res - hdrlen, (mark?1:0), event, ((event_end & 0x80)?1:0), duration); ++ ++ ast_verbose("Channel: %s %s Got RTP RFC2833 from %s:%u to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u, mark %d, event %08x, end %d, duration %-5.5d)\n", rtp->chan_name, rtp->chan_id, ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), ast_inet_ntoa(rtp->us.sin_addr), ntohs(rtp->us.sin_port), payloadtype, seqno, timestamp, res - hdrlen, (mark?1:0), event, ((event_end & 0x80)?1:0), duration); + } + f = process_rfc2833(rtp, rtp->rawdata + AST_FRIENDLY_OFFSET + hdrlen, res - hdrlen, seqno, timestamp); ++ if (rtpdebugdtmf && f) ++ ast_verbose("Channel: %s %s Got RFC2833 DTMF event %c of type %s\n", rtp->chan_name, rtp->chan_id, f->subclass, (f->frametype == AST_FRAME_DTMF_BEGIN ? "DTMF BEGIN" : (f->frametype == AST_FRAME_DTMF_END ? "DTMF_END" : "UNKNOWN"))); + } else if (rtpPT.code == AST_RTP_CISCO_DTMF) { + /* It's really special -- process it the Cisco way */ + if (rtp->lastevent <= seqno || (rtp->lastevent >= 65530 && seqno <= 6)) { +@@ -2272,8 +2292,9 @@ + ast_log(LOG_ERROR, "RTP Transmission error to %s:%u: %s\n", + ast_inet_ntoa(rtp->them.sin_addr), + ntohs(rtp->them.sin_port), strerror(errno)); +- if (rtp_debug_test_addr(&rtp->them)) +- ast_verbose("Sent RTP DTMF packet to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n", ++ if (rtp_debug_test_addr(&rtp->them) || rtpdebugdtmf) ++ ast_verbose("Channel: %s %s Sent RTP DTMF packet to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n", ++ rtp->chan_name, rtp->chan_id, + ast_inet_ntoa(rtp->them.sin_addr), + ntohs(rtp->them.sin_port), payload, rtp->seqno, rtp->lastdigitts, res - hdrlen); + /* Increment sequence number */ +@@ -2316,8 +2337,9 @@ + ast_log(LOG_ERROR, "RTP Transmission error to %s:%d: %s\n", + ast_inet_ntoa(rtp->them.sin_addr), + ntohs(rtp->them.sin_port), strerror(errno)); +- if (rtp_debug_test_addr(&rtp->them)) +- ast_verbose("Sent RTP DTMF packet to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n", ++ if (rtp_debug_test_addr(&rtp->them) || rtpdebugdtmf) ++ ast_verbose("Channel: %s %s Sent RTP DTMF packet to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n", ++ rtp->chan_name, rtp->chan_id, + ast_inet_ntoa(rtp->them.sin_addr), + ntohs(rtp->them.sin_port), rtp->send_payload, rtp->seqno, rtp->lastdigitts, res - hdrlen); + +@@ -3609,6 +3631,16 @@ + return RESULT_SUCCESS; + } + ++static int rtp_do_debug_dtmf(int fd, int argc, char *argv[]) ++{ ++ if (argc != 3) ++ return RESULT_SHOWUSAGE; ++ ++ rtpdebugdtmf = 1; ++ ast_cli(fd, "RTP DTMF debugging enabled\n"); ++ return RESULT_SUCCESS; ++} ++ + static int rtp_do_debug(int fd, int argc, char *argv[]) + { + if (argc != 2) { +@@ -3669,6 +3701,7 @@ + if (argc != 3) + return RESULT_SHOWUSAGE; + rtpdebug = 0; ++ rtpdebugdtmf = 0; + ast_cli(fd,"RTP Debugging Disabled\n"); + return RESULT_SUCCESS; + } +@@ -3729,7 +3762,7 @@ + } + + static char debug_usage[] = +- "Usage: rtp debug [ip host[:port]]\n" ++ "Usage: rtp debug [ip host[:port] | dtmf]\n" + " Enable dumping of all RTP packets to and from host.\n"; + + static char no_debug_usage[] = +@@ -3804,6 +3837,10 @@ + rtp_do_debug, "Enable RTP debugging", + debug_usage }, + ++ { { "rtp", "debug", "dtmf", NULL }, ++ rtp_do_debug_dtmf, "Enable RTP debugging on DTMFs", ++ debug_usage }, ++ + { { "rtp", "debug", "off", NULL }, + rtp_no_debug, "Disable RTP debugging", + no_debug_usage, NULL, &cli_rtp_no_debug_deprecated }, diff --git a/net/asterisk-bristuff/files/ilbc_enable.diff b/net/asterisk-bristuff/files/ilbc_enable.diff new file mode 100644 index 000000000000..152a953cde46 --- /dev/null +++ b/net/asterisk-bristuff/files/ilbc_enable.diff @@ -0,0 +1,7599 @@ + +$FreeBSD: /tmp/pcvs/ports/net/asterisk-bristuff/files/Attic/ilbc_enable.diff,v 1.1 2009-09-16 19:33:37 fjoe Exp $ + +--- menuselect-tree ++++ menuselect-tree +@@ -269,7 +269,6 @@ + <depend>gsm</depend> + </member> + <member name="codec_ilbc" displayname="iLBC Coder/Decoder" remove_on_change="codecs/codec_ilbc.o codecs/codec_ilbc.so"> +- <defaultenabled>no</defaultenabled> + </member> + <member name="codec_lpc10" displayname="LPC10 2.4kbps Coder/Decoder" remove_on_change="codecs/codec_lpc10.o codecs/codec_lpc10.so"> + </member> +diff -druN codecs/ilbc.orig/FrameClassify.c codecs/ilbc/FrameClassify.c +--- codecs/ilbc.orig/FrameClassify.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/FrameClassify.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,110 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ FrameClassify.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#include "iLBC_define.h" ++#include "FrameClassify.h" ++ ++/*---------------------------------------------------------------* ++ * Classification of subframes to localize start state ++ *--------------------------------------------------------------*/ ++ ++int FrameClassify( /* index to the max-energy sub-frame */ ++ iLBC_Enc_Inst_t *iLBCenc_inst, ++ /* (i/o) the encoder state structure */ ++ float *residual /* (i) lpc residual signal */ ++) { ++ float max_ssqEn, fssqEn[NSUB_MAX], bssqEn[NSUB_MAX], *pp; ++ int n, l, max_ssqEn_n; ++ const float ssqEn_win[NSUB_MAX-1]={(float)0.8,(float)0.9, ++ (float)1.0,(float)0.9,(float)0.8}; ++ const float sampEn_win[5]={(float)1.0/(float)6.0, ++ (float)2.0/(float)6.0, (float)3.0/(float)6.0, ++ (float)4.0/(float)6.0, (float)5.0/(float)6.0}; ++ ++ /* init the front and back energies to zero */ ++ ++ memset(fssqEn, 0, NSUB_MAX*sizeof(float)); ++ memset(bssqEn, 0, NSUB_MAX*sizeof(float)); ++ ++ /* Calculate front of first seqence */ ++ ++ n=0; ++ pp=residual; ++ ++ ++ for (l=0; l<5; l++) { ++ fssqEn[n] += sampEn_win[l] * (*pp) * (*pp); ++ pp++; ++ } ++ for (l=5; l<SUBL; l++) { ++ fssqEn[n] += (*pp) * (*pp); ++ pp++; ++ } ++ ++ /* Calculate front and back of all middle sequences */ ++ ++ for (n=1; n<iLBCenc_inst->nsub-1; n++) { ++ pp=residual+n*SUBL; ++ for (l=0; l<5; l++) { ++ fssqEn[n] += sampEn_win[l] * (*pp) * (*pp); ++ bssqEn[n] += (*pp) * (*pp); ++ pp++; ++ } ++ for (l=5; l<SUBL-5; l++) { ++ fssqEn[n] += (*pp) * (*pp); ++ bssqEn[n] += (*pp) * (*pp); ++ pp++; ++ } ++ for (l=SUBL-5; l<SUBL; l++) { ++ fssqEn[n] += (*pp) * (*pp); ++ bssqEn[n] += sampEn_win[SUBL-l-1] * (*pp) * (*pp); ++ pp++; ++ } ++ } ++ ++ /* Calculate back of last seqence */ ++ ++ n=iLBCenc_inst->nsub-1; ++ pp=residual+n*SUBL; ++ for (l=0; l<SUBL-5; l++) { ++ bssqEn[n] += (*pp) * (*pp); ++ pp++; ++ } ++ for (l=SUBL-5; l<SUBL; l++) { ++ bssqEn[n] += sampEn_win[SUBL-l-1] * (*pp) * (*pp); ++ pp++; ++ } ++ ++ /* find the index to the weighted 80 sample with ++ most energy */ ++ ++ if (iLBCenc_inst->mode==20) l=1; ++ else l=0; ++ ++ max_ssqEn=(fssqEn[0]+bssqEn[1])*ssqEn_win[l]; ++ max_ssqEn_n=1; ++ for (n=2; n<iLBCenc_inst->nsub; n++) { ++ ++ l++; ++ ++ ++ if ((fssqEn[n-1]+bssqEn[n])*ssqEn_win[l] > max_ssqEn) { ++ max_ssqEn=(fssqEn[n-1]+bssqEn[n]) * ++ ssqEn_win[l]; ++ max_ssqEn_n=n; ++ } ++ } ++ ++ return max_ssqEn_n; ++} ++ ++ +diff -druN codecs/ilbc.orig/FrameClassify.h codecs/ilbc/FrameClassify.h +--- codecs/ilbc.orig/FrameClassify.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/FrameClassify.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,26 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ FrameClassify.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++ ++ ++#ifndef __iLBC_FRAMECLASSIFY_H ++#define __iLBC_FRAMECLASSIFY_H ++ ++int FrameClassify( /* index to the max-energy sub-frame */ ++ iLBC_Enc_Inst_t *iLBCenc_inst, ++ /* (i/o) the encoder state structure */ ++ float *residual /* (i) lpc residual signal */ ++); ++ ++#endif ++ ++ +diff -druN codecs/ilbc.orig/LPCdecode.c codecs/ilbc/LPCdecode.c +--- codecs/ilbc.orig/LPCdecode.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/LPCdecode.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,152 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ LPC_decode.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#include <math.h> ++#include <string.h> ++ ++#include "helpfun.h" ++#include "lsf.h" ++#include "iLBC_define.h" ++#include "LPCdecode.h" ++#include "constants.h" ++ ++/*---------------------------------------------------------------* ++ * interpolation of lsf coefficients for the decoder ++ *--------------------------------------------------------------*/ ++ ++void LSFinterpolate2a_dec( ++ float *a, /* (o) lpc coefficients for a sub-frame */ ++ float *lsf1, /* (i) first lsf coefficient vector */ ++ ++ ++ float *lsf2, /* (i) second lsf coefficient vector */ ++ float coef, /* (i) interpolation weight */ ++ int length /* (i) length of lsf vectors */ ++){ ++ float lsftmp[LPC_FILTERORDER]; ++ ++ interpolate(lsftmp, lsf1, lsf2, coef, length); ++ lsf2a(a, lsftmp); ++} ++ ++/*---------------------------------------------------------------* ++ * obtain dequantized lsf coefficients from quantization index ++ *--------------------------------------------------------------*/ ++ ++void SimplelsfDEQ( ++ float *lsfdeq, /* (o) dequantized lsf coefficients */ ++ int *index, /* (i) quantization index */ ++ int lpc_n /* (i) number of LPCs */ ++){ ++ int i, j, pos, cb_pos; ++ ++ /* decode first LSF */ ++ ++ pos = 0; ++ cb_pos = 0; ++ for (i = 0; i < LSF_NSPLIT; i++) { ++ for (j = 0; j < dim_lsfCbTbl[i]; j++) { ++ lsfdeq[pos + j] = lsfCbTbl[cb_pos + ++ (long)(index[i])*dim_lsfCbTbl[i] + j]; ++ } ++ pos += dim_lsfCbTbl[i]; ++ cb_pos += size_lsfCbTbl[i]*dim_lsfCbTbl[i]; ++ } ++ ++ if (lpc_n>1) { ++ ++ /* decode last LSF */ ++ ++ pos = 0; ++ cb_pos = 0; ++ for (i = 0; i < LSF_NSPLIT; i++) { ++ for (j = 0; j < dim_lsfCbTbl[i]; j++) { ++ lsfdeq[LPC_FILTERORDER + pos + j] = ++ lsfCbTbl[cb_pos + ++ (long)(index[LSF_NSPLIT + i])* ++ dim_lsfCbTbl[i] + j]; ++ } ++ pos += dim_lsfCbTbl[i]; ++ cb_pos += size_lsfCbTbl[i]*dim_lsfCbTbl[i]; ++ } ++ } ++} ++ ++/*----------------------------------------------------------------* ++ ++ ++ * obtain synthesis and weighting filters form lsf coefficients ++ *---------------------------------------------------------------*/ ++ ++void DecoderInterpolateLSF( ++ float *syntdenum, /* (o) synthesis filter coefficients */ ++ float *weightdenum, /* (o) weighting denumerator ++ coefficients */ ++ float *lsfdeq, /* (i) dequantized lsf coefficients */ ++ int length, /* (i) length of lsf coefficient vector */ ++ iLBC_Dec_Inst_t *iLBCdec_inst ++ /* (i) the decoder state structure */ ++){ ++ int i, pos, lp_length; ++ float lp[LPC_FILTERORDER + 1], *lsfdeq2; ++ ++ lsfdeq2 = lsfdeq + length; ++ lp_length = length + 1; ++ ++ if (iLBCdec_inst->mode==30) { ++ /* sub-frame 1: Interpolation between old and first */ ++ ++ LSFinterpolate2a_dec(lp, iLBCdec_inst->lsfdeqold, lsfdeq, ++ lsf_weightTbl_30ms[0], length); ++ memcpy(syntdenum,lp,lp_length*sizeof(float)); ++ bwexpand(weightdenum, lp, LPC_CHIRP_WEIGHTDENUM, ++ lp_length); ++ ++ /* sub-frames 2 to 6: interpolation between first ++ and last LSF */ ++ ++ pos = lp_length; ++ for (i = 1; i < 6; i++) { ++ LSFinterpolate2a_dec(lp, lsfdeq, lsfdeq2, ++ lsf_weightTbl_30ms[i], length); ++ memcpy(syntdenum + pos,lp,lp_length*sizeof(float)); ++ bwexpand(weightdenum + pos, lp, ++ LPC_CHIRP_WEIGHTDENUM, lp_length); ++ pos += lp_length; ++ } ++ } ++ else { ++ pos = 0; ++ for (i = 0; i < iLBCdec_inst->nsub; i++) { ++ LSFinterpolate2a_dec(lp, iLBCdec_inst->lsfdeqold, ++ lsfdeq, lsf_weightTbl_20ms[i], length); ++ memcpy(syntdenum+pos,lp,lp_length*sizeof(float)); ++ bwexpand(weightdenum+pos, lp, LPC_CHIRP_WEIGHTDENUM, ++ lp_length); ++ pos += lp_length; ++ } ++ } ++ ++ /* update memory */ ++ ++ ++ ++ if (iLBCdec_inst->mode==30) ++ memcpy(iLBCdec_inst->lsfdeqold, lsfdeq2, ++ length*sizeof(float)); ++ else ++ memcpy(iLBCdec_inst->lsfdeqold, lsfdeq, ++ length*sizeof(float)); ++ ++} ++ ++ +diff -druN codecs/ilbc.orig/LPCdecode.h codecs/ilbc/LPCdecode.h +--- codecs/ilbc.orig/LPCdecode.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/LPCdecode.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,44 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ LPC_decode.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#ifndef __iLBC_LPC_DECODE_H ++#define __iLBC_LPC_DECODE_H ++ ++void LSFinterpolate2a_dec( ++ ++ ++ float *a, /* (o) lpc coefficients for a sub-frame */ ++ float *lsf1, /* (i) first lsf coefficient vector */ ++ float *lsf2, /* (i) second lsf coefficient vector */ ++ float coef, /* (i) interpolation weight */ ++ int length /* (i) length of lsf vectors */ ++); ++ ++void SimplelsfDEQ( ++ float *lsfdeq, /* (o) dequantized lsf coefficients */ ++ int *index, /* (i) quantization index */ ++ int lpc_n /* (i) number of LPCs */ ++); ++ ++void DecoderInterpolateLSF( ++ float *syntdenum, /* (o) synthesis filter coefficients */ ++ float *weightdenum, /* (o) weighting denumerator ++ coefficients */ ++ float *lsfdeq, /* (i) dequantized lsf coefficients */ ++ int length, /* (i) length of lsf coefficient vector */ ++ iLBC_Dec_Inst_t *iLBCdec_inst ++ /* (i) the decoder state structure */ ++); ++ ++#endif ++ ++ +diff -druN codecs/ilbc.orig/LPCencode.c codecs/ilbc/LPCencode.c +--- codecs/ilbc.orig/LPCencode.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/LPCencode.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,228 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ LPCencode.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#include <string.h> ++ ++ ++ ++#include "iLBC_define.h" ++#include "LPCencode.h" ++#include "helpfun.h" ++#include "lsf.h" ++#include "constants.h" ++ ++/*----------------------------------------------------------------* ++ * lpc analysis (subrutine to LPCencode) ++ *---------------------------------------------------------------*/ ++ ++static void SimpleAnalysis( ++ float *lsf, /* (o) lsf coefficients */ ++ float *data, /* (i) new data vector */ ++ iLBC_Enc_Inst_t *iLBCenc_inst ++ /* (i/o) the encoder state structure */ ++){ ++ int k, is; ++ float temp[BLOCKL_MAX], lp[LPC_FILTERORDER + 1]; ++ float lp2[LPC_FILTERORDER + 1]; ++ float r[LPC_FILTERORDER + 1]; ++ ++ is=LPC_LOOKBACK+BLOCKL_MAX-iLBCenc_inst->blockl; ++ memcpy(iLBCenc_inst->lpc_buffer+is,data, ++ iLBCenc_inst->blockl*sizeof(float)); ++ ++ /* No lookahead, last window is asymmetric */ ++ ++ for (k = 0; k < iLBCenc_inst->lpc_n; k++) { ++ ++ is = LPC_LOOKBACK; ++ ++ if (k < (iLBCenc_inst->lpc_n - 1)) { ++ window(temp, lpc_winTbl, ++ iLBCenc_inst->lpc_buffer, BLOCKL_MAX); ++ } else { ++ window(temp, lpc_asymwinTbl, ++ iLBCenc_inst->lpc_buffer + is, BLOCKL_MAX); ++ } ++ ++ autocorr(r, temp, BLOCKL_MAX, LPC_FILTERORDER); ++ window(r, r, lpc_lagwinTbl, LPC_FILTERORDER + 1); ++ ++ levdurb(lp, temp, r, LPC_FILTERORDER); ++ bwexpand(lp2, lp, LPC_CHIRP_SYNTDENUM, LPC_FILTERORDER+1); ++ ++ a2lsf(lsf + k*LPC_FILTERORDER, lp2); ++ } ++ is=LPC_LOOKBACK+BLOCKL_MAX-iLBCenc_inst->blockl; ++ memmove(iLBCenc_inst->lpc_buffer, ++ iLBCenc_inst->lpc_buffer+LPC_LOOKBACK+BLOCKL_MAX-is, ++ is*sizeof(float)); ++} ++ ++/*----------------------------------------------------------------* ++ ++ ++ * lsf interpolator and conversion from lsf to a coefficients ++ * (subrutine to SimpleInterpolateLSF) ++ *---------------------------------------------------------------*/ ++ ++static void LSFinterpolate2a_enc( ++ float *a, /* (o) lpc coefficients */ ++ float *lsf1,/* (i) first set of lsf coefficients */ ++ float *lsf2,/* (i) second set of lsf coefficients */ ++ float coef, /* (i) weighting coefficient to use between ++ lsf1 and lsf2 */ ++ long length /* (i) length of coefficient vectors */ ++){ ++ float lsftmp[LPC_FILTERORDER]; ++ ++ interpolate(lsftmp, lsf1, lsf2, coef, length); ++ lsf2a(a, lsftmp); ++} ++ ++/*----------------------------------------------------------------* ++ * lsf interpolator (subrutine to LPCencode) ++ *---------------------------------------------------------------*/ ++ ++static void SimpleInterpolateLSF( ++ float *syntdenum, /* (o) the synthesis filter denominator ++ resulting from the quantized ++ interpolated lsf */ ++ float *weightdenum, /* (o) the weighting filter denominator ++ resulting from the unquantized ++ interpolated lsf */ ++ float *lsf, /* (i) the unquantized lsf coefficients */ ++ float *lsfdeq, /* (i) the dequantized lsf coefficients */ ++ float *lsfold, /* (i) the unquantized lsf coefficients of ++ the previous signal frame */ ++ float *lsfdeqold, /* (i) the dequantized lsf coefficients of ++ the previous signal frame */ ++ int length, /* (i) should equate LPC_FILTERORDER */ ++ iLBC_Enc_Inst_t *iLBCenc_inst ++ /* (i/o) the encoder state structure */ ++){ ++ int i, pos, lp_length; ++ float lp[LPC_FILTERORDER + 1], *lsf2, *lsfdeq2; ++ ++ lsf2 = lsf + length; ++ lsfdeq2 = lsfdeq + length; ++ lp_length = length + 1; ++ ++ if (iLBCenc_inst->mode==30) { ++ /* sub-frame 1: Interpolation between old and first ++ set of lsf coefficients */ ++ ++ LSFinterpolate2a_enc(lp, lsfdeqold, lsfdeq, ++ lsf_weightTbl_30ms[0], length); ++ memcpy(syntdenum,lp,lp_length*sizeof(float)); ++ LSFinterpolate2a_enc(lp, lsfold, lsf, ++ ++ ++ lsf_weightTbl_30ms[0], length); ++ bwexpand(weightdenum, lp, LPC_CHIRP_WEIGHTDENUM, lp_length); ++ ++ /* sub-frame 2 to 6: Interpolation between first ++ and second set of lsf coefficients */ ++ ++ pos = lp_length; ++ for (i = 1; i < iLBCenc_inst->nsub; i++) { ++ LSFinterpolate2a_enc(lp, lsfdeq, lsfdeq2, ++ lsf_weightTbl_30ms[i], length); ++ memcpy(syntdenum + pos,lp,lp_length*sizeof(float)); ++ ++ LSFinterpolate2a_enc(lp, lsf, lsf2, ++ lsf_weightTbl_30ms[i], length); ++ bwexpand(weightdenum + pos, lp, ++ LPC_CHIRP_WEIGHTDENUM, lp_length); ++ pos += lp_length; ++ } ++ } ++ else { ++ pos = 0; ++ for (i = 0; i < iLBCenc_inst->nsub; i++) { ++ LSFinterpolate2a_enc(lp, lsfdeqold, lsfdeq, ++ lsf_weightTbl_20ms[i], length); ++ memcpy(syntdenum+pos,lp,lp_length*sizeof(float)); ++ LSFinterpolate2a_enc(lp, lsfold, lsf, ++ lsf_weightTbl_20ms[i], length); ++ bwexpand(weightdenum+pos, lp, ++ LPC_CHIRP_WEIGHTDENUM, lp_length); ++ pos += lp_length; ++ } ++ } ++ ++ /* update memory */ ++ ++ if (iLBCenc_inst->mode==30) { ++ memcpy(lsfold, lsf2, length*sizeof(float)); ++ memcpy(lsfdeqold, lsfdeq2, length*sizeof(float)); ++ } ++ else { ++ memcpy(lsfold, lsf, length*sizeof(float)); ++ memcpy(lsfdeqold, lsfdeq, length*sizeof(float)); ++ } ++} ++ ++/*----------------------------------------------------------------* ++ * lsf quantizer (subrutine to LPCencode) ++ *---------------------------------------------------------------*/ ++ ++static void SimplelsfQ( ++ float *lsfdeq, /* (o) dequantized lsf coefficients ++ (dimension FILTERORDER) */ ++ int *index, /* (o) quantization index */ ++ float *lsf, /* (i) the lsf coefficient vector to be ++ ++ ++ quantized (dimension FILTERORDER ) */ ++ int lpc_n /* (i) number of lsf sets to quantize */ ++){ ++ /* Quantize first LSF with memoryless split VQ */ ++ SplitVQ(lsfdeq, index, lsf, lsfCbTbl, LSF_NSPLIT, ++ dim_lsfCbTbl, size_lsfCbTbl); ++ ++ if (lpc_n==2) { ++ /* Quantize second LSF with memoryless split VQ */ ++ SplitVQ(lsfdeq + LPC_FILTERORDER, index + LSF_NSPLIT, ++ lsf + LPC_FILTERORDER, lsfCbTbl, LSF_NSPLIT, ++ dim_lsfCbTbl, size_lsfCbTbl); ++ } ++} ++ ++/*----------------------------------------------------------------* ++ * lpc encoder ++ *---------------------------------------------------------------*/ ++ ++void LPCencode( ++ float *syntdenum, /* (i/o) synthesis filter coefficients ++ before/after encoding */ ++ float *weightdenum, /* (i/o) weighting denumerator ++ coefficients before/after ++ encoding */ ++ int *lsf_index, /* (o) lsf quantization index */ ++ float *data, /* (i) lsf coefficients to quantize */ ++ iLBC_Enc_Inst_t *iLBCenc_inst ++ /* (i/o) the encoder state structure */ ++){ ++ float lsf[LPC_FILTERORDER * LPC_N_MAX]; ++ float lsfdeq[LPC_FILTERORDER * LPC_N_MAX]; ++ int change=0; ++ ++ SimpleAnalysis(lsf, data, iLBCenc_inst); ++ SimplelsfQ(lsfdeq, lsf_index, lsf, iLBCenc_inst->lpc_n); ++ change=LSF_check(lsfdeq, LPC_FILTERORDER, iLBCenc_inst->lpc_n); ++ SimpleInterpolateLSF(syntdenum, weightdenum, ++ lsf, lsfdeq, iLBCenc_inst->lsfold, ++ iLBCenc_inst->lsfdeqold, LPC_FILTERORDER, iLBCenc_inst); ++} ++ ++ ++ +diff -druN codecs/ilbc.orig/LPCencode.h codecs/ilbc/LPCencode.h +--- codecs/ilbc.orig/LPCencode.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/LPCencode.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,29 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ LPCencode.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#ifndef __iLBC_LPCENCOD_H ++#define __iLBC_LPCENCOD_H ++ ++void LPCencode( ++ float *syntdenum, /* (i/o) synthesis filter coefficients ++ before/after encoding */ ++ float *weightdenum, /* (i/o) weighting denumerator coefficients ++ before/after encoding */ ++ int *lsf_index, /* (o) lsf quantization index */ ++ float *data, /* (i) lsf coefficients to quantize */ ++ iLBC_Enc_Inst_t *iLBCenc_inst ++ /* (i/o) the encoder state structure */ ++); ++ ++#endif ++ ++ +diff -druN codecs/ilbc.orig/Makefile codecs/ilbc/Makefile +--- codecs/ilbc.orig/Makefile 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/Makefile 2007-10-29 15:12:16.000000000 -0700 +@@ -0,0 +1,20 @@ ++LIB=libilbc.a ++CFLAGS+=-fPIC ++ ++OBJS=anaFilter.o iCBSearch.o packing.o \ ++ constants.o gainquant.o iLBC_decode.o StateConstructW.o \ ++ createCB.o getCBvec.o iLBC_encode.o StateSearchW.o doCPLC.o \ ++ helpfun.o syntFilter.o enhancer.o hpInput.o LPCdecode.o \ ++ filter.o hpOutput.o LPCencode.o FrameClassify.o iCBConstruct.o lsf.o ++ ++include $(ASTTOPDIR)/Makefile.rules ++ ++all: $(LIB) ++ ++$(LIB): $(OBJS) ++ $(ECHO_PREFIX) echo " [AR] $^ -> $@" ++ $(CMD_PREFIX) $(AR) cr $@ $^ ++ $(CMD_PREFIX) $(RANLIB) $@ ++ ++clean: ++ rm -f $(LIB) *.o .*.d *.s *.i +diff -druN codecs/ilbc.orig/StateConstructW.c codecs/ilbc/StateConstructW.c +--- codecs/ilbc.orig/StateConstructW.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/StateConstructW.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,76 @@ ++ ++/****************************************************************** ++ ++ ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ StateConstructW.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#include <math.h> ++#include <string.h> ++ ++#include "iLBC_define.h" ++#include "StateConstructW.h" ++#include "constants.h" ++#include "filter.h" ++ ++/*----------------------------------------------------------------* ++ * decoding of the start state ++ *---------------------------------------------------------------*/ ++ ++void StateConstructW( ++ int idxForMax, /* (i) 6-bit index for the quantization of ++ max amplitude */ ++ int *idxVec, /* (i) vector of quantization indexes */ ++ float *syntDenum, /* (i) synthesis filter denumerator */ ++ float *out, /* (o) the decoded state vector */ ++ int len /* (i) length of a state vector */ ++){ ++ float maxVal, tmpbuf[LPC_FILTERORDER+2*STATE_LEN], *tmp, ++ numerator[LPC_FILTERORDER+1]; ++ float foutbuf[LPC_FILTERORDER+2*STATE_LEN], *fout; ++ int k,tmpi; ++ ++ /* decoding of the maximum value */ ++ ++ maxVal = state_frgqTbl[idxForMax]; ++ maxVal = (float)pow(10,maxVal)/(float)4.5; ++ ++ /* initialization of buffers and coefficients */ ++ ++ memset(tmpbuf, 0, LPC_FILTERORDER*sizeof(float)); ++ memset(foutbuf, 0, LPC_FILTERORDER*sizeof(float)); ++ for (k=0; k<LPC_FILTERORDER; k++) { ++ numerator[k]=syntDenum[LPC_FILTERORDER-k]; ++ } ++ numerator[LPC_FILTERORDER]=syntDenum[0]; ++ tmp = &tmpbuf[LPC_FILTERORDER]; ++ fout = &foutbuf[LPC_FILTERORDER]; ++ ++ /* decoding of the sample values */ ++ ++ for (k=0; k<len; k++) { ++ tmpi = len-1-k; ++ /* maxVal = 1/scal */ ++ ++ ++ tmp[k] = maxVal*state_sq3Tbl[idxVec[tmpi]]; ++ } ++ ++ /* circular convolution with all-pass filter */ ++ ++ memset(tmp+len, 0, len*sizeof(float)); ++ ZeroPoleFilter(tmp, numerator, syntDenum, 2*len, ++ LPC_FILTERORDER, fout); ++ for (k=0;k<len;k++) { ++ out[k] = fout[len-1-k]+fout[2*len-1-k]; ++ } ++} ++ ++ +diff -druN codecs/ilbc.orig/StateConstructW.h codecs/ilbc/StateConstructW.h +--- codecs/ilbc.orig/StateConstructW.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/StateConstructW.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,27 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ StateConstructW.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#ifndef __iLBC_STATECONSTRUCTW_H ++#define __iLBC_STATECONSTRUCTW_H ++ ++void StateConstructW( ++ int idxForMax, /* (i) 6-bit index for the quantization of ++ max amplitude */ ++ int *idxVec, /* (i) vector of quantization indexes */ ++ float *syntDenum, /* (i) synthesis filter denumerator */ ++ float *out, /* (o) the decoded state vector */ ++ int len /* (i) length of a state vector */ ++); ++ ++#endif ++ ++ +diff -druN codecs/ilbc.orig/StateSearchW.c codecs/ilbc/StateSearchW.c +--- codecs/ilbc.orig/StateSearchW.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/StateSearchW.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,194 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ StateSearchW.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#include <math.h> ++#include <string.h> ++ ++#include "iLBC_define.h" ++#include "StateSearchW.h" ++#include "constants.h" ++#include "filter.h" ++#include "helpfun.h" ++ ++/*----------------------------------------------------------------* ++ * predictive noise shaping encoding of scaled start state ++ * (subrutine for StateSearchW) ++ *---------------------------------------------------------------*/ ++ ++void AbsQuantW( ++ iLBC_Enc_Inst_t *iLBCenc_inst, ++ /* (i) Encoder instance */ ++ float *in, /* (i) vector to encode */ ++ float *syntDenum, /* (i) denominator of synthesis filter */ ++ float *weightDenum, /* (i) denominator of weighting filter */ ++ int *out, /* (o) vector of quantizer indexes */ ++ int len, /* (i) length of vector to encode and ++ vector of quantizer indexes */ ++ int state_first /* (i) position of start state in the ++ 80 vec */ ++){ ++ float *syntOut; ++ float syntOutBuf[LPC_FILTERORDER+STATE_SHORT_LEN_30MS]; ++ float toQ, xq; ++ int n; ++ int index; ++ ++ /* initialization of buffer for filtering */ ++ ++ memset(syntOutBuf, 0, LPC_FILTERORDER*sizeof(float)); ++ ++ ++ ++ /* initialization of pointer for filtering */ ++ ++ syntOut = &syntOutBuf[LPC_FILTERORDER]; ++ ++ /* synthesis and weighting filters on input */ ++ ++ if (state_first) { ++ AllPoleFilter (in, weightDenum, SUBL, LPC_FILTERORDER); ++ } else { ++ AllPoleFilter (in, weightDenum, ++ iLBCenc_inst->state_short_len-SUBL, ++ LPC_FILTERORDER); ++ } ++ ++ /* encoding loop */ ++ ++ for (n=0; n<len; n++) { ++ ++ /* time update of filter coefficients */ ++ ++ if ((state_first)&&(n==SUBL)){ ++ syntDenum += (LPC_FILTERORDER+1); ++ weightDenum += (LPC_FILTERORDER+1); ++ ++ /* synthesis and weighting filters on input */ ++ AllPoleFilter (&in[n], weightDenum, len-n, ++ LPC_FILTERORDER); ++ ++ } else if ((state_first==0)&& ++ (n==(iLBCenc_inst->state_short_len-SUBL))) { ++ syntDenum += (LPC_FILTERORDER+1); ++ weightDenum += (LPC_FILTERORDER+1); ++ ++ /* synthesis and weighting filters on input */ ++ AllPoleFilter (&in[n], weightDenum, len-n, ++ LPC_FILTERORDER); ++ ++ } ++ ++ /* prediction of synthesized and weighted input */ ++ ++ syntOut[n] = 0.0; ++ AllPoleFilter (&syntOut[n], weightDenum, 1, ++ LPC_FILTERORDER); ++ ++ /* quantization */ ++ ++ toQ = in[n]-syntOut[n]; ++ sort_sq(&xq, &index, toQ, state_sq3Tbl, 8); ++ out[n]=index; ++ syntOut[n] = state_sq3Tbl[out[n]]; ++ ++ /* update of the prediction filter */ ++ ++ ++ ++ AllPoleFilter(&syntOut[n], weightDenum, 1, ++ LPC_FILTERORDER); ++ } ++} ++ ++/*----------------------------------------------------------------* ++ * encoding of start state ++ *---------------------------------------------------------------*/ ++ ++void StateSearchW( ++ iLBC_Enc_Inst_t *iLBCenc_inst, ++ /* (i) Encoder instance */ ++ float *residual,/* (i) target residual vector */ ++ float *syntDenum, /* (i) lpc synthesis filter */ ++ float *weightDenum, /* (i) weighting filter denuminator */ ++ int *idxForMax, /* (o) quantizer index for maximum ++ amplitude */ ++ int *idxVec, /* (o) vector of quantization indexes */ ++ int len, /* (i) length of all vectors */ ++ int state_first /* (i) position of start state in the ++ 80 vec */ ++){ ++ float dtmp, maxVal; ++ float tmpbuf[LPC_FILTERORDER+2*STATE_SHORT_LEN_30MS]; ++ float *tmp, numerator[1+LPC_FILTERORDER]; ++ float foutbuf[LPC_FILTERORDER+2*STATE_SHORT_LEN_30MS], *fout; ++ int k; ++ float qmax, scal; ++ ++ /* initialization of buffers and filter coefficients */ ++ ++ memset(tmpbuf, 0, LPC_FILTERORDER*sizeof(float)); ++ memset(foutbuf, 0, LPC_FILTERORDER*sizeof(float)); ++ for (k=0; k<LPC_FILTERORDER; k++) { ++ numerator[k]=syntDenum[LPC_FILTERORDER-k]; ++ } ++ numerator[LPC_FILTERORDER]=syntDenum[0]; ++ tmp = &tmpbuf[LPC_FILTERORDER]; ++ fout = &foutbuf[LPC_FILTERORDER]; ++ ++ /* circular convolution with the all-pass filter */ ++ ++ memcpy(tmp, residual, len*sizeof(float)); ++ memset(tmp+len, 0, len*sizeof(float)); ++ ZeroPoleFilter(tmp, numerator, syntDenum, 2*len, ++ LPC_FILTERORDER, fout); ++ for (k=0; k<len; k++) { ++ fout[k] += fout[k+len]; ++ } ++ ++ /* identification of the maximum amplitude value */ ++ ++ maxVal = fout[0]; ++ ++ ++ for (k=1; k<len; k++) { ++ ++ if (fout[k]*fout[k] > maxVal*maxVal){ ++ maxVal = fout[k]; ++ } ++ } ++ maxVal=(float)fabs(maxVal); ++ ++ /* encoding of the maximum amplitude value */ ++ ++ if (maxVal < 10.0) { ++ maxVal = 10.0; ++ } ++ maxVal = (float)log10(maxVal); ++ sort_sq(&dtmp, idxForMax, maxVal, state_frgqTbl, 64); ++ ++ /* decoding of the maximum amplitude representation value, ++ and corresponding scaling of start state */ ++ ++ maxVal=state_frgqTbl[*idxForMax]; ++ qmax = (float)pow(10,maxVal); ++ scal = (float)(4.5)/qmax; ++ for (k=0; k<len; k++){ ++ fout[k] *= scal; ++ } ++ ++ /* predictive noise shaping encoding of scaled start state */ ++ ++ AbsQuantW(iLBCenc_inst, fout,syntDenum, ++ weightDenum,idxVec, len, state_first); ++} ++ ++ +diff -druN codecs/ilbc.orig/StateSearchW.h codecs/ilbc/StateSearchW.h +--- codecs/ilbc.orig/StateSearchW.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/StateSearchW.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,48 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ StateSearchW.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#ifndef __iLBC_STATESEARCHW_H ++#define __iLBC_STATESEARCHW_H ++ ++void AbsQuantW( ++ iLBC_Enc_Inst_t *iLBCenc_inst, ++ /* (i) Encoder instance */ ++ float *in, /* (i) vector to encode */ ++ float *syntDenum, /* (i) denominator of synthesis filter */ ++ float *weightDenum, /* (i) denominator of weighting filter */ ++ int *out, /* (o) vector of quantizer indexes */ ++ int len, /* (i) length of vector to encode and ++ vector of quantizer indexes */ ++ int state_first /* (i) position of start state in the ++ 80 vec */ ++); ++ ++void StateSearchW( ++ iLBC_Enc_Inst_t *iLBCenc_inst, ++ /* (i) Encoder instance */ ++ float *residual,/* (i) target residual vector */ ++ float *syntDenum, /* (i) lpc synthesis filter */ ++ float *weightDenum, /* (i) weighting filter denuminator */ ++ int *idxForMax, /* (o) quantizer index for maximum ++ amplitude */ ++ int *idxVec, /* (o) vector of quantization indexes */ ++ int len, /* (i) length of all vectors */ ++ int state_first /* (i) position of start state in the ++ ++ ++ 80 vec */ ++); ++ ++ ++#endif ++ ++ +diff -druN codecs/ilbc.orig/anaFilter.c codecs/ilbc/anaFilter.c +--- codecs/ilbc.orig/anaFilter.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/anaFilter.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,71 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ anaFilter.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#include <string.h> ++#include "anaFilter.h" ++#include "iLBC_define.h" ++ ++/*----------------------------------------------------------------* ++ * LP analysis filter. ++ ++ ++ *---------------------------------------------------------------*/ ++ ++void anaFilter( ++ float *In, /* (i) Signal to be filtered */ ++ float *a, /* (i) LP parameters */ ++ int len,/* (i) Length of signal */ ++ float *Out, /* (o) Filtered signal */ ++ float *mem /* (i/o) Filter state */ ++){ ++ int i, j; ++ float *po, *pi, *pm, *pa; ++ ++ po = Out; ++ ++ /* Filter first part using memory from past */ ++ ++ for (i=0; i<LPC_FILTERORDER; i++) { ++ pi = &In[i]; ++ pm = &mem[LPC_FILTERORDER-1]; ++ pa = a; ++ *po=0.0; ++ for (j=0; j<=i; j++) { ++ *po+=(*pa++)*(*pi--); ++ } ++ for (j=i+1; j<LPC_FILTERORDER+1; j++) { ++ ++ *po+=(*pa++)*(*pm--); ++ } ++ po++; ++ } ++ ++ /* Filter last part where the state is entierly ++ in the input vector */ ++ ++ for (i=LPC_FILTERORDER; i<len; i++) { ++ pi = &In[i]; ++ pa = a; ++ *po=0.0; ++ for (j=0; j<LPC_FILTERORDER+1; j++) { ++ *po+=(*pa++)*(*pi--); ++ } ++ po++; ++ } ++ ++ /* Update state vector */ ++ ++ memcpy(mem, &In[len-LPC_FILTERORDER], ++ LPC_FILTERORDER*sizeof(float)); ++} ++ ++ +diff -druN codecs/ilbc.orig/anaFilter.h codecs/ilbc/anaFilter.h +--- codecs/ilbc.orig/anaFilter.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/anaFilter.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,26 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ anaFilter.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#ifndef __iLBC_ANAFILTER_H ++#define __iLBC_ANAFILTER_H ++ ++void anaFilter( ++ float *In, /* (i) Signal to be filtered */ ++ float *a, /* (i) LP parameters */ ++ int len,/* (i) Length of signal */ ++ float *Out, /* (o) Filtered signal */ ++ float *mem /* (i/o) Filter state */ ++); ++ ++#endif ++ ++ +diff -druN codecs/ilbc.orig/constants.c codecs/ilbc/constants.c +--- codecs/ilbc.orig/constants.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/constants.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,729 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ constants.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#include "iLBC_define.h" ++ ++/* ULP bit allocation */ ++ ++ /* 20 ms frame */ ++ ++const iLBC_ULP_Inst_t ULP_20msTbl = { ++ /* LSF */ ++ { {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0}, ++ {0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}, ++ /* Start state location, gain and samples */ ++ {2,0,0,0,0}, ++ {1,0,0,0,0}, ++ {6,0,0,0,0}, ++ {0,1,2,0,0}, ++ /* extra CB index and extra CB gain */ ++ {{6,0,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}}, ++ {{2,0,3,0,0}, {1,1,2,0,0}, {0,0,3,0,0}}, ++ /* CB index and CB gain */ ++ { {{7,0,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}}, ++ {{0,0,8,0,0}, {0,0,8,0,0}, {0,0,8,0,0}}, ++ {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}, ++ {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}}, ++ { {{1,2,2,0,0}, {1,1,2,0,0}, {0,0,3,0,0}}, ++ {{1,1,3,0,0}, {0,2,2,0,0}, {0,0,3,0,0}}, ++ {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}, ++ {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}} ++}; ++ ++ /* 30 ms frame */ ++ ++const iLBC_ULP_Inst_t ULP_30msTbl = { ++ /* LSF */ ++ { {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0}, ++ ++ ++ {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0}}, ++ /* Start state location, gain and samples */ ++ {3,0,0,0,0}, ++ {1,0,0,0,0}, ++ {6,0,0,0,0}, ++ {0,1,2,0,0}, ++ /* extra CB index and extra CB gain */ ++ {{4,2,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}}, ++ {{1,1,3,0,0}, {1,1,2,0,0}, {0,0,3,0,0}}, ++ /* CB index and CB gain */ ++ { {{6,1,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}}, ++ {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}}, ++ {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}}, ++ {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}}}, ++ { {{1,2,2,0,0}, {1,2,1,0,0}, {0,0,3,0,0}}, ++ {{0,2,3,0,0}, {0,2,2,0,0}, {0,0,3,0,0}}, ++ {{0,1,4,0,0}, {0,1,3,0,0}, {0,0,3,0,0}}, ++ {{0,1,4,0,0}, {0,1,3,0,0}, {0,0,3,0,0}}} ++}; ++ ++/* HP Filters */ ++ ++float hpi_zero_coefsTbl[3] = { ++ (float)0.92727436, (float)-1.8544941, (float)0.92727436 ++}; ++float hpi_pole_coefsTbl[3] = { ++ (float)1.0, (float)-1.9059465, (float)0.9114024 ++}; ++float hpo_zero_coefsTbl[3] = { ++ (float)0.93980581, (float)-1.8795834, (float)0.93980581 ++}; ++float hpo_pole_coefsTbl[3] = { ++ (float)1.0, (float)-1.9330735, (float)0.93589199 ++}; ++ ++/* LP Filter */ ++ ++float lpFilt_coefsTbl[FILTERORDER_DS]={ ++ (float)-0.066650, (float)0.125000, (float)0.316650, ++ (float)0.414063, (float)0.316650, ++ (float)0.125000, (float)-0.066650 ++}; ++ ++/* State quantization tables */ ++ ++float state_sq3Tbl[8] = { ++ (float)-3.719849, (float)-2.177490, (float)-1.130005, ++ (float)-0.309692, (float)0.444214, (float)1.329712, ++ (float)2.436279, (float)3.983887 ++}; ++ ++float state_frgqTbl[64] = { ++ (float)1.000085, (float)1.071695, (float)1.140395, ++ (float)1.206868, (float)1.277188, (float)1.351503, ++ ++ ++ (float)1.429380, (float)1.500727, (float)1.569049, ++ (float)1.639599, (float)1.707071, (float)1.781531, ++ (float)1.840799, (float)1.901550, (float)1.956695, ++ (float)2.006750, (float)2.055474, (float)2.102787, ++ (float)2.142819, (float)2.183592, (float)2.217962, ++ (float)2.257177, (float)2.295739, (float)2.332967, ++ (float)2.369248, (float)2.402792, (float)2.435080, ++ (float)2.468598, (float)2.503394, (float)2.539284, ++ (float)2.572944, (float)2.605036, (float)2.636331, ++ (float)2.668939, (float)2.698780, (float)2.729101, ++ (float)2.759786, (float)2.789834, (float)2.818679, ++ (float)2.848074, (float)2.877470, (float)2.906899, ++ (float)2.936655, (float)2.967804, (float)3.000115, ++ (float)3.033367, (float)3.066355, (float)3.104231, ++ (float)3.141499, (float)3.183012, (float)3.222952, ++ (float)3.265433, (float)3.308441, (float)3.350823, ++ (float)3.395275, (float)3.442793, (float)3.490801, ++ (float)3.542514, (float)3.604064, (float)3.666050, ++ (float)3.740994, (float)3.830749, (float)3.938770, ++ (float)4.101764 ++}; ++ ++/* CB tables */ ++ ++int search_rangeTbl[5][CB_NSTAGES]={{58,58,58}, {108,44,44}, ++ {108,108,108}, {108,108,108}, {108,108,108}}; ++int stMemLTbl=85; ++int memLfTbl[NASUB_MAX]={147,147,147,147}; ++ ++/* expansion filter(s) */ ++ ++float cbfiltersTbl[CB_FILTERLEN]={ ++ (float)-0.034180, (float)0.108887, (float)-0.184326, ++ (float)0.806152, (float)0.713379, (float)-0.144043, ++ (float)0.083740, (float)-0.033691 ++}; ++ ++/* Gain Quantization */ ++ ++float gain_sq3Tbl[8]={ ++ (float)-1.000000, (float)-0.659973, (float)-0.330017, ++ (float)0.000000, (float)0.250000, (float)0.500000, ++ (float)0.750000, (float)1.00000}; ++ ++float gain_sq4Tbl[16]={ ++ (float)-1.049988, (float)-0.900024, (float)-0.750000, ++ (float)-0.599976, (float)-0.450012, (float)-0.299988, ++ (float)-0.150024, (float)0.000000, (float)0.150024, ++ (float)0.299988, (float)0.450012, (float)0.599976, ++ (float)0.750000, (float)0.900024, (float)1.049988, ++ (float)1.200012}; ++ ++float gain_sq5Tbl[32]={ ++ (float)0.037476, (float)0.075012, (float)0.112488, ++ ++ ++ (float)0.150024, (float)0.187500, (float)0.224976, ++ (float)0.262512, (float)0.299988, (float)0.337524, ++ (float)0.375000, (float)0.412476, (float)0.450012, ++ (float)0.487488, (float)0.525024, (float)0.562500, ++ (float)0.599976, (float)0.637512, (float)0.674988, ++ (float)0.712524, (float)0.750000, (float)0.787476, ++ (float)0.825012, (float)0.862488, (float)0.900024, ++ (float)0.937500, (float)0.974976, (float)1.012512, ++ (float)1.049988, (float)1.087524, (float)1.125000, ++ (float)1.162476, (float)1.200012}; ++ ++/* Enhancer - Upsamling a factor 4 (ENH_UPS0 = 4) */ ++float polyphaserTbl[ENH_UPS0*(2*ENH_FL0+1)]={ ++ (float)0.000000, (float)0.000000, (float)0.000000, ++(float)1.000000, ++ (float)0.000000, (float)0.000000, (float)0.000000, ++ (float)0.015625, (float)-0.076904, (float)0.288330, ++(float)0.862061, ++ (float)-0.106445, (float)0.018799, (float)-0.015625, ++ (float)0.023682, (float)-0.124268, (float)0.601563, ++(float)0.601563, ++ (float)-0.124268, (float)0.023682, (float)-0.023682, ++ (float)0.018799, (float)-0.106445, (float)0.862061, ++(float)0.288330, ++ (float)-0.076904, (float)0.015625, (float)-0.018799}; ++ ++float enh_plocsTbl[ENH_NBLOCKS_TOT] = {(float)40.0, (float)120.0, ++ (float)200.0, (float)280.0, (float)360.0, ++ (float)440.0, (float)520.0, (float)600.0}; ++ ++/* LPC analysis and quantization */ ++ ++int dim_lsfCbTbl[LSF_NSPLIT] = {3, 3, 4}; ++int size_lsfCbTbl[LSF_NSPLIT] = {64,128,128}; ++ ++ ++float lsfmeanTbl[LPC_FILTERORDER] = { ++ (float)0.281738, (float)0.445801, (float)0.663330, ++ (float)0.962524, (float)1.251831, (float)1.533081, ++ (float)1.850586, (float)2.137817, (float)2.481445, ++ (float)2.777344}; ++ ++float lsf_weightTbl_30ms[6] = {(float)(1.0/2.0), (float)1.0, ++(float)(2.0/3.0), ++ (float)(1.0/3.0), (float)0.0, (float)0.0}; ++ ++float lsf_weightTbl_20ms[4] = {(float)(3.0/4.0), (float)(2.0/4.0), ++ (float)(1.0/4.0), (float)(0.0)}; ++ ++/* Hanning LPC window */ ++float lpc_winTbl[BLOCKL_MAX]={ ++ (float)0.000183, (float)0.000671, (float)0.001526, ++ (float)0.002716, (float)0.004242, (float)0.006104, ++ (float)0.008301, (float)0.010834, (float)0.013702, ++ ++ ++ (float)0.016907, (float)0.020416, (float)0.024261, ++ (float)0.028442, (float)0.032928, (float)0.037750, ++ (float)0.042877, (float)0.048309, (float)0.054047, ++ (float)0.060089, (float)0.066437, (float)0.073090, ++ (float)0.080017, (float)0.087219, (float)0.094727, ++ (float)0.102509, (float)0.110535, (float)0.118835, ++ (float)0.127411, (float)0.136230, (float)0.145294, ++ (float)0.154602, (float)0.164154, (float)0.173920, ++ (float)0.183899, (float)0.194122, (float)0.204529, ++ (float)0.215149, (float)0.225952, (float)0.236938, ++ (float)0.248108, (float)0.259460, (float)0.270966, ++ (float)0.282654, (float)0.294464, (float)0.306396, ++ (float)0.318481, (float)0.330688, (float)0.343018, ++ (float)0.355438, (float)0.367981, (float)0.380585, ++ (float)0.393280, (float)0.406067, (float)0.418884, ++ (float)0.431763, (float)0.444702, (float)0.457672, ++ (float)0.470673, (float)0.483704, (float)0.496735, ++ (float)0.509766, (float)0.522797, (float)0.535828, ++ (float)0.548798, (float)0.561768, (float)0.574677, ++ (float)0.587524, (float)0.600342, (float)0.613068, ++ (float)0.625732, (float)0.638306, (float)0.650787, ++ (float)0.663147, (float)0.675415, (float)0.687561, ++ (float)0.699585, (float)0.711487, (float)0.723206, ++ (float)0.734802, (float)0.746216, (float)0.757477, ++ (float)0.768585, (float)0.779480, (float)0.790192, ++ (float)0.800720, (float)0.811005, (float)0.821106, ++ (float)0.830994, (float)0.840668, (float)0.850067, ++ (float)0.859253, (float)0.868225, (float)0.876892, ++ (float)0.885345, (float)0.893524, (float)0.901428, ++ (float)0.909058, (float)0.916412, (float)0.923492, ++ (float)0.930267, (float)0.936768, (float)0.942963, ++ (float)0.948853, (float)0.954437, (float)0.959717, ++ (float)0.964691, (float)0.969360, (float)0.973694, ++ (float)0.977692, (float)0.981384, (float)0.984741, ++ (float)0.987762, (float)0.990479, (float)0.992828, ++ (float)0.994873, (float)0.996552, (float)0.997925, ++ (float)0.998932, (float)0.999603, (float)0.999969, ++ (float)0.999969, (float)0.999603, (float)0.998932, ++ (float)0.997925, (float)0.996552, (float)0.994873, ++ (float)0.992828, (float)0.990479, (float)0.987762, ++ (float)0.984741, (float)0.981384, (float)0.977692, ++ (float)0.973694, (float)0.969360, (float)0.964691, ++ (float)0.959717, (float)0.954437, (float)0.948853, ++ (float)0.942963, (float)0.936768, (float)0.930267, ++ (float)0.923492, (float)0.916412, (float)0.909058, ++ (float)0.901428, (float)0.893524, (float)0.885345, ++ (float)0.876892, (float)0.868225, (float)0.859253, ++ (float)0.850067, (float)0.840668, (float)0.830994, ++ (float)0.821106, (float)0.811005, (float)0.800720, ++ (float)0.790192, (float)0.779480, (float)0.768585, ++ (float)0.757477, (float)0.746216, (float)0.734802, ++ (float)0.723206, (float)0.711487, (float)0.699585, ++ (float)0.687561, (float)0.675415, (float)0.663147, ++ (float)0.650787, (float)0.638306, (float)0.625732, ++ ++ ++ (float)0.613068, (float)0.600342, (float)0.587524, ++ (float)0.574677, (float)0.561768, (float)0.548798, ++ (float)0.535828, (float)0.522797, (float)0.509766, ++ (float)0.496735, (float)0.483704, (float)0.470673, ++ (float)0.457672, (float)0.444702, (float)0.431763, ++ (float)0.418884, (float)0.406067, (float)0.393280, ++ (float)0.380585, (float)0.367981, (float)0.355438, ++ (float)0.343018, (float)0.330688, (float)0.318481, ++ (float)0.306396, (float)0.294464, (float)0.282654, ++ (float)0.270966, (float)0.259460, (float)0.248108, ++ (float)0.236938, (float)0.225952, (float)0.215149, ++ (float)0.204529, (float)0.194122, (float)0.183899, ++ (float)0.173920, (float)0.164154, (float)0.154602, ++ (float)0.145294, (float)0.136230, (float)0.127411, ++ (float)0.118835, (float)0.110535, (float)0.102509, ++ (float)0.094727, (float)0.087219, (float)0.080017, ++ (float)0.073090, (float)0.066437, (float)0.060089, ++ (float)0.054047, (float)0.048309, (float)0.042877, ++ (float)0.037750, (float)0.032928, (float)0.028442, ++ (float)0.024261, (float)0.020416, (float)0.016907, ++ (float)0.013702, (float)0.010834, (float)0.008301, ++ (float)0.006104, (float)0.004242, (float)0.002716, ++ (float)0.001526, (float)0.000671, (float)0.000183 ++}; ++ ++/* Asymmetric LPC window */ ++float lpc_asymwinTbl[BLOCKL_MAX]={ ++ (float)0.000061, (float)0.000214, (float)0.000458, ++ (float)0.000824, (float)0.001282, (float)0.001831, ++ (float)0.002472, (float)0.003235, (float)0.004120, ++ (float)0.005066, (float)0.006134, (float)0.007294, ++ (float)0.008545, (float)0.009918, (float)0.011383, ++ (float)0.012939, (float)0.014587, (float)0.016357, ++ (float)0.018219, (float)0.020172, (float)0.022217, ++ (float)0.024353, (float)0.026611, (float)0.028961, ++ (float)0.031372, (float)0.033905, (float)0.036530, ++ (float)0.039276, (float)0.042084, (float)0.044983, ++ (float)0.047974, (float)0.051086, (float)0.054260, ++ (float)0.057526, (float)0.060883, (float)0.064331, ++ (float)0.067871, (float)0.071503, (float)0.075226, ++ (float)0.079010, (float)0.082916, (float)0.086884, ++ (float)0.090942, (float)0.095062, (float)0.099304, ++ (float)0.103607, (float)0.107971, (float)0.112427, ++ (float)0.116974, (float)0.121582, (float)0.126282, ++ (float)0.131073, (float)0.135895, (float)0.140839, ++ (float)0.145813, (float)0.150879, (float)0.156006, ++ (float)0.161224, (float)0.166504, (float)0.171844, ++ (float)0.177246, (float)0.182709, (float)0.188263, ++ (float)0.193848, (float)0.199524, (float)0.205231, ++ (float)0.211029, (float)0.216858, (float)0.222778, ++ (float)0.228729, (float)0.234741, (float)0.240814, ++ (float)0.246918, (float)0.253082, (float)0.259308, ++ (float)0.265564, (float)0.271881, (float)0.278259, ++ (float)0.284668, (float)0.291107, (float)0.297607, ++ ++ ++ (float)0.304138, (float)0.310730, (float)0.317322, ++ (float)0.323975, (float)0.330658, (float)0.337372, ++ (float)0.344147, (float)0.350922, (float)0.357727, ++ (float)0.364594, (float)0.371460, (float)0.378357, ++ (float)0.385284, (float)0.392212, (float)0.399170, ++ (float)0.406158, (float)0.413177, (float)0.420197, ++ (float)0.427246, (float)0.434296, (float)0.441376, ++ (float)0.448456, (float)0.455536, (float)0.462646, ++ (float)0.469757, (float)0.476868, (float)0.483978, ++ (float)0.491089, (float)0.498230, (float)0.505341, ++ (float)0.512451, (float)0.519592, (float)0.526703, ++ (float)0.533813, (float)0.540924, (float)0.548004, ++ (float)0.555084, (float)0.562164, (float)0.569244, ++ (float)0.576294, (float)0.583313, (float)0.590332, ++ (float)0.597321, (float)0.604309, (float)0.611267, ++ (float)0.618195, (float)0.625092, (float)0.631989, ++ (float)0.638855, (float)0.645660, (float)0.652466, ++ (float)0.659241, (float)0.665985, (float)0.672668, ++ (float)0.679352, (float)0.685974, (float)0.692566, ++ (float)0.699127, (float)0.705658, (float)0.712128, ++ (float)0.718536, (float)0.724945, (float)0.731262, ++ (float)0.737549, (float)0.743805, (float)0.750000, ++ (float)0.756134, (float)0.762238, (float)0.768280, ++ (float)0.774261, (float)0.780182, (float)0.786072, ++ (float)0.791870, (float)0.797638, (float)0.803314, ++ (float)0.808960, (float)0.814514, (float)0.820038, ++ (float)0.825470, (float)0.830841, (float)0.836151, ++ (float)0.841400, (float)0.846558, (float)0.851654, ++ (float)0.856689, (float)0.861633, (float)0.866516, ++ (float)0.871338, (float)0.876068, (float)0.880737, ++ (float)0.885315, (float)0.889801, (float)0.894226, ++ (float)0.898560, (float)0.902832, (float)0.907013, ++ (float)0.911102, (float)0.915100, (float)0.919037, ++ (float)0.922882, (float)0.926636, (float)0.930328, ++ (float)0.933899, (float)0.937408, (float)0.940796, ++ (float)0.944122, (float)0.947357, (float)0.950470, ++ (float)0.953522, (float)0.956482, (float)0.959351, ++ (float)0.962097, (float)0.964783, (float)0.967377, ++ (float)0.969849, (float)0.972229, (float)0.974518, ++ (float)0.976715, (float)0.978821, (float)0.980835, ++ (float)0.982727, (float)0.984528, (float)0.986237, ++ (float)0.987854, (float)0.989380, (float)0.990784, ++ (float)0.992096, (float)0.993317, (float)0.994415, ++ (float)0.995422, (float)0.996338, (float)0.997162, ++ (float)0.997864, (float)0.998474, (float)0.998962, ++ (float)0.999390, (float)0.999695, (float)0.999878, ++ (float)0.999969, (float)0.999969, (float)0.996918, ++ (float)0.987701, (float)0.972382, (float)0.951050, ++ (float)0.923889, (float)0.891022, (float)0.852631, ++ (float)0.809021, (float)0.760406, (float)0.707092, ++ (float)0.649445, (float)0.587799, (float)0.522491, ++ (float)0.453979, (float)0.382690, (float)0.309021, ++ (float)0.233459, (float)0.156433, (float)0.078461 ++}; ++ ++ ++ ++/* Lag window for LPC */ ++float lpc_lagwinTbl[LPC_FILTERORDER + 1]={ ++ (float)1.000100, (float)0.998890, (float)0.995569, ++ (float)0.990057, (float)0.982392, ++ (float)0.972623, (float)0.960816, (float)0.947047, ++ (float)0.931405, (float)0.913989, (float)0.894909}; ++ ++/* LSF quantization*/ ++float lsfCbTbl[64 * 3 + 128 * 3 + 128 * 4] = { ++(float)0.155396, (float)0.273193, (float)0.451172, ++(float)0.390503, (float)0.648071, (float)1.002075, ++(float)0.440186, (float)0.692261, (float)0.955688, ++(float)0.343628, (float)0.642334, (float)1.071533, ++(float)0.318359, (float)0.491577, (float)0.670532, ++(float)0.193115, (float)0.375488, (float)0.725708, ++(float)0.364136, (float)0.510376, (float)0.658691, ++(float)0.297485, (float)0.527588, (float)0.842529, ++(float)0.227173, (float)0.365967, (float)0.563110, ++(float)0.244995, (float)0.396729, (float)0.636475, ++(float)0.169434, (float)0.300171, (float)0.520264, ++(float)0.312866, (float)0.464478, (float)0.643188, ++(float)0.248535, (float)0.429932, (float)0.626099, ++(float)0.236206, (float)0.491333, (float)0.817139, ++(float)0.334961, (float)0.625122, (float)0.895752, ++(float)0.343018, (float)0.518555, (float)0.698608, ++(float)0.372803, (float)0.659790, (float)0.945435, ++(float)0.176880, (float)0.316528, (float)0.581421, ++(float)0.416382, (float)0.625977, (float)0.805176, ++(float)0.303223, (float)0.568726, (float)0.915039, ++(float)0.203613, (float)0.351440, (float)0.588135, ++(float)0.221191, (float)0.375000, (float)0.614746, ++(float)0.199951, (float)0.323364, (float)0.476074, ++(float)0.300781, (float)0.433350, (float)0.566895, ++(float)0.226196, (float)0.354004, (float)0.507568, ++(float)0.300049, (float)0.508179, (float)0.711670, ++(float)0.312012, (float)0.492676, (float)0.763428, ++(float)0.329956, (float)0.541016, (float)0.795776, ++(float)0.373779, (float)0.604614, (float)0.928833, ++(float)0.210571, (float)0.452026, (float)0.755249, ++(float)0.271118, (float)0.473267, (float)0.662476, ++(float)0.285522, (float)0.436890, (float)0.634399, ++(float)0.246704, (float)0.565552, (float)0.859009, ++(float)0.270508, (float)0.406250, (float)0.553589, ++(float)0.361450, (float)0.578491, (float)0.813843, ++(float)0.342651, (float)0.482788, (float)0.622437, ++(float)0.340332, (float)0.549438, (float)0.743164, ++(float)0.200439, (float)0.336304, (float)0.540894, ++(float)0.407837, (float)0.644775, (float)0.895142, ++(float)0.294678, (float)0.454834, (float)0.699097, ++(float)0.193115, (float)0.344482, (float)0.643188, ++(float)0.275757, (float)0.420776, (float)0.598755, ++(float)0.380493, (float)0.608643, (float)0.861084, ++(float)0.222778, (float)0.426147, (float)0.676514, ++ ++ ++(float)0.407471, (float)0.700195, (float)1.053101, ++(float)0.218384, (float)0.377197, (float)0.669922, ++(float)0.313232, (float)0.454102, (float)0.600952, ++(float)0.347412, (float)0.571533, (float)0.874146, ++(float)0.238037, (float)0.405396, (float)0.729492, ++(float)0.223877, (float)0.412964, (float)0.822021, ++(float)0.395264, (float)0.582153, (float)0.743896, ++(float)0.247925, (float)0.485596, (float)0.720581, ++(float)0.229126, (float)0.496582, (float)0.907715, ++(float)0.260132, (float)0.566895, (float)1.012695, ++(float)0.337402, (float)0.611572, (float)0.978149, ++(float)0.267822, (float)0.447632, (float)0.769287, ++(float)0.250610, (float)0.381714, (float)0.530029, ++(float)0.430054, (float)0.805054, (float)1.221924, ++(float)0.382568, (float)0.544067, (float)0.701660, ++(float)0.383545, (float)0.710327, (float)1.149170, ++(float)0.271362, (float)0.529053, (float)0.775513, ++(float)0.246826, (float)0.393555, (float)0.588623, ++(float)0.266846, (float)0.422119, (float)0.676758, ++(float)0.311523, (float)0.580688, (float)0.838623, ++(float)1.331177, (float)1.576782, (float)1.779541, ++(float)1.160034, (float)1.401978, (float)1.768188, ++(float)1.161865, (float)1.525146, (float)1.715332, ++(float)0.759521, (float)0.913940, (float)1.119873, ++(float)0.947144, (float)1.121338, (float)1.282471, ++(float)1.015015, (float)1.557007, (float)1.804932, ++(float)1.172974, (float)1.402100, (float)1.692627, ++(float)1.087524, (float)1.474243, (float)1.665405, ++(float)0.899536, (float)1.105225, (float)1.406250, ++(float)1.148438, (float)1.484741, (float)1.796265, ++(float)0.785645, (float)1.209839, (float)1.567749, ++(float)0.867798, (float)1.166504, (float)1.450684, ++(float)0.922485, (float)1.229858, (float)1.420898, ++(float)0.791260, (float)1.123291, (float)1.409546, ++(float)0.788940, (float)0.966064, (float)1.340332, ++(float)1.051147, (float)1.272827, (float)1.556641, ++(float)0.866821, (float)1.181152, (float)1.538818, ++(float)0.906738, (float)1.373535, (float)1.607910, ++(float)1.244751, (float)1.581421, (float)1.933838, ++(float)0.913940, (float)1.337280, (float)1.539673, ++(float)0.680542, (float)0.959229, (float)1.662720, ++(float)0.887207, (float)1.430542, (float)1.800781, ++(float)0.912598, (float)1.433594, (float)1.683960, ++(float)0.860474, (float)1.060303, (float)1.455322, ++(float)1.005127, (float)1.381104, (float)1.706909, ++(float)0.800781, (float)1.363892, (float)1.829102, ++(float)0.781860, (float)1.124390, (float)1.505981, ++(float)1.003662, (float)1.471436, (float)1.684692, ++(float)0.981323, (float)1.309570, (float)1.618042, ++(float)1.228760, (float)1.554321, (float)1.756470, ++(float)0.734375, (float)0.895752, (float)1.225586, ++(float)0.841797, (float)1.055664, (float)1.249268, ++(float)0.920166, (float)1.119385, (float)1.486206, ++(float)0.894409, (float)1.539063, (float)1.828979, ++ ++ ++(float)1.283691, (float)1.543335, (float)1.858276, ++(float)0.676025, (float)0.933105, (float)1.490845, ++(float)0.821289, (float)1.491821, (float)1.739868, ++(float)0.923218, (float)1.144653, (float)1.580566, ++(float)1.057251, (float)1.345581, (float)1.635864, ++(float)0.888672, (float)1.074951, (float)1.353149, ++(float)0.942749, (float)1.195435, (float)1.505493, ++(float)1.492310, (float)1.788086, (float)2.039673, ++(float)1.070313, (float)1.634399, (float)1.860962, ++(float)1.253296, (float)1.488892, (float)1.686035, ++(float)0.647095, (float)0.864014, (float)1.401855, ++(float)0.866699, (float)1.254883, (float)1.453369, ++(float)1.063965, (float)1.532593, (float)1.731323, ++(float)1.167847, (float)1.521484, (float)1.884033, ++(float)0.956055, (float)1.502075, (float)1.745605, ++(float)0.928711, (float)1.288574, (float)1.479614, ++(float)1.088013, (float)1.380737, (float)1.570801, ++(float)0.905029, (float)1.186768, (float)1.371948, ++(float)1.057861, (float)1.421021, (float)1.617432, ++(float)1.108276, (float)1.312500, (float)1.501465, ++(float)0.979492, (float)1.416992, (float)1.624268, ++(float)1.276001, (float)1.661011, (float)2.007935, ++(float)0.993042, (float)1.168579, (float)1.331665, ++(float)0.778198, (float)0.944946, (float)1.235962, ++(float)1.223755, (float)1.491333, (float)1.815674, ++(float)0.852661, (float)1.350464, (float)1.722290, ++(float)1.134766, (float)1.593140, (float)1.787354, ++(float)1.051392, (float)1.339722, (float)1.531006, ++(float)0.803589, (float)1.271240, (float)1.652100, ++(float)0.755737, (float)1.143555, (float)1.639404, ++(float)0.700928, (float)0.837280, (float)1.130371, ++(float)0.942749, (float)1.197876, (float)1.669800, ++(float)0.993286, (float)1.378296, (float)1.566528, ++(float)0.801025, (float)1.095337, (float)1.298950, ++(float)0.739990, (float)1.032959, (float)1.383667, ++(float)0.845703, (float)1.072266, (float)1.543823, ++(float)0.915649, (float)1.072266, (float)1.224487, ++(float)1.021973, (float)1.226196, (float)1.481323, ++(float)0.999878, (float)1.204102, (float)1.555908, ++(float)0.722290, (float)0.913940, (float)1.340210, ++(float)0.673340, (float)0.835938, (float)1.259521, ++(float)0.832397, (float)1.208374, (float)1.394165, ++(float)0.962158, (float)1.576172, (float)1.912842, ++(float)1.166748, (float)1.370850, (float)1.556763, ++(float)0.946289, (float)1.138550, (float)1.400391, ++(float)1.035034, (float)1.218262, (float)1.386475, ++(float)1.393799, (float)1.717773, (float)2.000244, ++(float)0.972656, (float)1.260986, (float)1.760620, ++(float)1.028198, (float)1.288452, (float)1.484619, ++(float)0.773560, (float)1.258057, (float)1.756714, ++(float)1.080322, (float)1.328003, (float)1.742676, ++(float)0.823975, (float)1.450806, (float)1.917725, ++(float)0.859009, (float)1.016602, (float)1.191895, ++(float)0.843994, (float)1.131104, (float)1.645020, ++ ++ ++(float)1.189697, (float)1.702759, (float)1.894409, ++(float)1.346680, (float)1.763184, (float)2.066040, ++(float)0.980469, (float)1.253784, (float)1.441650, ++(float)1.338135, (float)1.641968, (float)1.932739, ++(float)1.223267, (float)1.424194, (float)1.626465, ++(float)0.765747, (float)1.004150, (float)1.579102, ++(float)1.042847, (float)1.269165, (float)1.647461, ++(float)0.968750, (float)1.257568, (float)1.555786, ++(float)0.826294, (float)0.993408, (float)1.275146, ++(float)0.742310, (float)0.950439, (float)1.430542, ++(float)1.054321, (float)1.439819, (float)1.828003, ++(float)1.072998, (float)1.261719, (float)1.441895, ++(float)0.859375, (float)1.036377, (float)1.314819, ++(float)0.895752, (float)1.267212, (float)1.605591, ++(float)0.805420, (float)0.962891, (float)1.142334, ++(float)0.795654, (float)1.005493, (float)1.468506, ++(float)1.105347, (float)1.313843, (float)1.584839, ++(float)0.792236, (float)1.221802, (float)1.465698, ++(float)1.170532, (float)1.467651, (float)1.664063, ++(float)0.838257, (float)1.153198, (float)1.342163, ++(float)0.968018, (float)1.198242, (float)1.391235, ++(float)1.250122, (float)1.623535, (float)1.823608, ++(float)0.711670, (float)1.058350, (float)1.512085, ++(float)1.204834, (float)1.454468, (float)1.739136, ++(float)1.137451, (float)1.421753, (float)1.620117, ++(float)0.820435, (float)1.322754, (float)1.578247, ++(float)0.798706, (float)1.005005, (float)1.213867, ++(float)0.980713, (float)1.324951, (float)1.512939, ++(float)1.112305, (float)1.438843, (float)1.735596, ++(float)1.135498, (float)1.356689, (float)1.635742, ++(float)1.101318, (float)1.387451, (float)1.686523, ++(float)0.849854, (float)1.276978, (float)1.523438, ++(float)1.377930, (float)1.627563, (float)1.858154, ++(float)0.884888, (float)1.095459, (float)1.287476, ++(float)1.289795, (float)1.505859, (float)1.756592, ++(float)0.817505, (float)1.384155, (float)1.650513, ++(float)1.446655, (float)1.702148, (float)1.931885, ++(float)0.835815, (float)1.023071, (float)1.385376, ++(float)0.916626, (float)1.139038, (float)1.335327, ++(float)0.980103, (float)1.174072, (float)1.453735, ++(float)1.705688, (float)2.153809, (float)2.398315, (float)2.743408, ++(float)1.797119, (float)2.016846, (float)2.445679, (float)2.701904, ++(float)1.990356, (float)2.219116, (float)2.576416, (float)2.813477, ++(float)1.849365, (float)2.190918, (float)2.611572, (float)2.835083, ++(float)1.657959, (float)1.854370, (float)2.159058, (float)2.726196, ++(float)1.437744, (float)1.897705, (float)2.253174, (float)2.655396, ++(float)2.028687, (float)2.247314, (float)2.542358, (float)2.875854, ++(float)1.736938, (float)1.922119, (float)2.185913, (float)2.743408, ++(float)1.521606, (float)1.870972, (float)2.526855, (float)2.786987, ++(float)1.841431, (float)2.050659, (float)2.463623, (float)2.857666, ++(float)1.590088, (float)2.067261, (float)2.427979, (float)2.794434, ++(float)1.746826, (float)2.057373, (float)2.320190, (float)2.800781, ++(float)1.734619, (float)1.940552, (float)2.306030, (float)2.826416, ++(float)1.786255, (float)2.204468, (float)2.457520, (float)2.795288, ++ ++ ++(float)1.861084, (float)2.170532, (float)2.414551, (float)2.763672, ++(float)2.001465, (float)2.307617, (float)2.552734, (float)2.811890, ++(float)1.784424, (float)2.124146, (float)2.381592, (float)2.645508, ++(float)1.888794, (float)2.135864, (float)2.418579, (float)2.861206, ++(float)2.301147, (float)2.531250, (float)2.724976, (float)2.913086, ++(float)1.837769, (float)2.051270, (float)2.261963, (float)2.553223, ++(float)2.012939, (float)2.221191, (float)2.440186, (float)2.678101, ++(float)1.429565, (float)1.858276, (float)2.582275, (float)2.845703, ++(float)1.622803, (float)1.897705, (float)2.367310, (float)2.621094, ++(float)1.581543, (float)1.960449, (float)2.515869, (float)2.736450, ++(float)1.419434, (float)1.933960, (float)2.394653, (float)2.746704, ++(float)1.721924, (float)2.059570, (float)2.421753, (float)2.769653, ++(float)1.911011, (float)2.220703, (float)2.461060, (float)2.740723, ++(float)1.581177, (float)1.860840, (float)2.516968, (float)2.874634, ++(float)1.870361, (float)2.098755, (float)2.432373, (float)2.656494, ++(float)2.059692, (float)2.279785, (float)2.495605, (float)2.729370, ++(float)1.815674, (float)2.181519, (float)2.451538, (float)2.680542, ++(float)1.407959, (float)1.768311, (float)2.343018, (float)2.668091, ++(float)2.168701, (float)2.394653, (float)2.604736, (float)2.829346, ++(float)1.636230, (float)1.865723, (float)2.329102, (float)2.824219, ++(float)1.878906, (float)2.139526, (float)2.376709, (float)2.679810, ++(float)1.765381, (float)1.971802, (float)2.195435, (float)2.586914, ++(float)2.164795, (float)2.410889, (float)2.673706, (float)2.903198, ++(float)2.071899, (float)2.331055, (float)2.645874, (float)2.907104, ++(float)2.026001, (float)2.311523, (float)2.594849, (float)2.863892, ++(float)1.948975, (float)2.180786, (float)2.514893, (float)2.797852, ++(float)1.881836, (float)2.130859, (float)2.478149, (float)2.804199, ++(float)2.238159, (float)2.452759, (float)2.652832, (float)2.868286, ++(float)1.897949, (float)2.101685, (float)2.524292, (float)2.880127, ++(float)1.856445, (float)2.074585, (float)2.541016, (float)2.791748, ++(float)1.695557, (float)2.199097, (float)2.506226, (float)2.742676, ++(float)1.612671, (float)1.877075, (float)2.435425, (float)2.732910, ++(float)1.568848, (float)1.786499, (float)2.194580, (float)2.768555, ++(float)1.953369, (float)2.164551, (float)2.486938, (float)2.874023, ++(float)1.388306, (float)1.725342, (float)2.384521, (float)2.771851, ++(float)2.115356, (float)2.337769, (float)2.592896, (float)2.864014, ++(float)1.905762, (float)2.111328, (float)2.363525, (float)2.789307, ++(float)1.882568, (float)2.332031, (float)2.598267, (float)2.827637, ++(float)1.683594, (float)2.088745, (float)2.361938, (float)2.608643, ++(float)1.874023, (float)2.182129, (float)2.536133, (float)2.766968, ++(float)1.861938, (float)2.070435, (float)2.309692, (float)2.700562, ++(float)1.722168, (float)2.107422, (float)2.477295, (float)2.837646, ++(float)1.926880, (float)2.184692, (float)2.442627, (float)2.663818, ++(float)2.123901, (float)2.337280, (float)2.553101, (float)2.777466, ++(float)1.588135, (float)1.911499, (float)2.212769, (float)2.543945, ++(float)2.053955, (float)2.370850, (float)2.712158, (float)2.939941, ++(float)2.210449, (float)2.519653, (float)2.770386, (float)2.958618, ++(float)2.199463, (float)2.474731, (float)2.718262, (float)2.919922, ++(float)1.960083, (float)2.175415, (float)2.608032, (float)2.888794, ++(float)1.953735, (float)2.185181, (float)2.428223, (float)2.809570, ++(float)1.615234, (float)2.036499, (float)2.576538, (float)2.834595, ++(float)1.621094, (float)2.028198, (float)2.431030, (float)2.664673, ++(float)1.824951, (float)2.267456, (float)2.514526, (float)2.747925, ++(float)1.994263, (float)2.229126, (float)2.475220, (float)2.833984, ++ ++ ++(float)1.746338, (float)2.011353, (float)2.588257, (float)2.826904, ++(float)1.562866, (float)2.135986, (float)2.471680, (float)2.687256, ++(float)1.748901, (float)2.083496, (float)2.460938, (float)2.686279, ++(float)1.758057, (float)2.131470, (float)2.636597, (float)2.891602, ++(float)2.071289, (float)2.299072, (float)2.550781, (float)2.814331, ++(float)1.839600, (float)2.094360, (float)2.496460, (float)2.723999, ++(float)1.882202, (float)2.088257, (float)2.636841, (float)2.923096, ++(float)1.957886, (float)2.153198, (float)2.384399, (float)2.615234, ++(float)1.992920, (float)2.351196, (float)2.654419, (float)2.889771, ++(float)2.012817, (float)2.262451, (float)2.643799, (float)2.903076, ++(float)2.025635, (float)2.254761, (float)2.508423, (float)2.784058, ++(float)2.316040, (float)2.589355, (float)2.794189, (float)2.963623, ++(float)1.741211, (float)2.279541, (float)2.578491, (float)2.816284, ++(float)1.845337, (float)2.055786, (float)2.348511, (float)2.822021, ++(float)1.679932, (float)1.926514, (float)2.499756, (float)2.835693, ++(float)1.722534, (float)1.946899, (float)2.448486, (float)2.728760, ++(float)1.829834, (float)2.043213, (float)2.580444, (float)2.867676, ++(float)1.676636, (float)2.071655, (float)2.322510, (float)2.704834, ++(float)1.791504, (float)2.113525, (float)2.469727, (float)2.784058, ++(float)1.977051, (float)2.215088, (float)2.497437, (float)2.726929, ++(float)1.800171, (float)2.106689, (float)2.357788, (float)2.738892, ++(float)1.827759, (float)2.170166, (float)2.525879, (float)2.852417, ++(float)1.918335, (float)2.132813, (float)2.488403, (float)2.728149, ++(float)1.916748, (float)2.225098, (float)2.542603, (float)2.857666, ++(float)1.761230, (float)1.976074, (float)2.507446, (float)2.884521, ++(float)2.053711, (float)2.367432, (float)2.608032, (float)2.837646, ++(float)1.595337, (float)2.000977, (float)2.307129, (float)2.578247, ++(float)1.470581, (float)2.031250, (float)2.375854, (float)2.647583, ++(float)1.801392, (float)2.128052, (float)2.399780, (float)2.822876, ++(float)1.853638, (float)2.066650, (float)2.429199, (float)2.751465, ++(float)1.956299, (float)2.163696, (float)2.394775, (float)2.734253, ++(float)1.963623, (float)2.275757, (float)2.585327, (float)2.865234, ++(float)1.887451, (float)2.105469, (float)2.331787, (float)2.587402, ++(float)2.120117, (float)2.443359, (float)2.733887, (float)2.941406, ++(float)1.506348, (float)1.766968, (float)2.400513, (float)2.851807, ++(float)1.664551, (float)1.981079, (float)2.375732, (float)2.774414, ++(float)1.720703, (float)1.978882, (float)2.391479, (float)2.640991, ++(float)1.483398, (float)1.814819, (float)2.434448, (float)2.722290, ++(float)1.769043, (float)2.136597, (float)2.563721, (float)2.774414, ++(float)1.810791, (float)2.049316, (float)2.373901, (float)2.613647, ++(float)1.788330, (float)2.005981, (float)2.359131, (float)2.723145, ++(float)1.785156, (float)1.993164, (float)2.399780, (float)2.832520, ++(float)1.695313, (float)2.022949, (float)2.522583, (float)2.745117, ++(float)1.584106, (float)1.965576, (float)2.299927, (float)2.715576, ++(float)1.894897, (float)2.249878, (float)2.655884, (float)2.897705, ++(float)1.720581, (float)1.995728, (float)2.299438, (float)2.557007, ++(float)1.619385, (float)2.173950, (float)2.574219, (float)2.787964, ++(float)1.883179, (float)2.220459, (float)2.474365, (float)2.825073, ++(float)1.447632, (float)2.045044, (float)2.555542, (float)2.744873, ++(float)1.502686, (float)2.156616, (float)2.653320, (float)2.846558, ++(float)1.711548, (float)1.944092, (float)2.282959, (float)2.685791, ++(float)1.499756, (float)1.867554, (float)2.341064, (float)2.578857, ++(float)1.916870, (float)2.135132, (float)2.568237, (float)2.826050, ++(float)1.498047, (float)1.711182, (float)2.223267, (float)2.755127, ++ ++ ++(float)1.808716, (float)1.997559, (float)2.256470, (float)2.758545, ++(float)2.088501, (float)2.402710, (float)2.667358, (float)2.890259, ++(float)1.545044, (float)1.819214, (float)2.324097, (float)2.692993, ++(float)1.796021, (float)2.012573, (float)2.505737, (float)2.784912, ++(float)1.786499, (float)2.041748, (float)2.290405, (float)2.650757, ++(float)1.938232, (float)2.264404, (float)2.529053, (float)2.796143 ++}; ++ ++ +diff -druN codecs/ilbc.orig/constants.h codecs/ilbc/constants.h +--- codecs/ilbc.orig/constants.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/constants.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,74 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ constants.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++ ++ ++******************************************************************/ ++ ++#ifndef __iLBC_CONSTANTS_H ++#define __iLBC_CONSTANTS_H ++ ++#include "iLBC_define.h" ++ ++ ++/* ULP bit allocation */ ++ ++extern const iLBC_ULP_Inst_t ULP_20msTbl; ++extern const iLBC_ULP_Inst_t ULP_30msTbl; ++ ++/* high pass filters */ ++ ++extern float hpi_zero_coefsTbl[]; ++extern float hpi_pole_coefsTbl[]; ++extern float hpo_zero_coefsTbl[]; ++extern float hpo_pole_coefsTbl[]; ++ ++/* low pass filters */ ++extern float lpFilt_coefsTbl[]; ++ ++/* LPC analysis and quantization */ ++ ++extern float lpc_winTbl[]; ++extern float lpc_asymwinTbl[]; ++extern float lpc_lagwinTbl[]; ++extern float lsfCbTbl[]; ++extern float lsfmeanTbl[]; ++extern int dim_lsfCbTbl[]; ++extern int size_lsfCbTbl[]; ++extern float lsf_weightTbl_30ms[]; ++extern float lsf_weightTbl_20ms[]; ++ ++/* state quantization tables */ ++ ++extern float state_sq3Tbl[]; ++extern float state_frgqTbl[]; ++ ++/* gain quantization tables */ ++ ++extern float gain_sq3Tbl[]; ++extern float gain_sq4Tbl[]; ++extern float gain_sq5Tbl[]; ++ ++/* adaptive codebook definitions */ ++ ++extern int search_rangeTbl[5][CB_NSTAGES]; ++extern int memLfTbl[]; ++extern int stMemLTbl; ++extern float cbfiltersTbl[CB_FILTERLEN]; ++ ++ ++ ++/* enhancer definitions */ ++ ++extern float polyphaserTbl[]; ++extern float enh_plocsTbl[]; ++ ++#endif ++ +diff -druN codecs/ilbc.orig/createCB.c codecs/ilbc/createCB.c +--- codecs/ilbc.orig/createCB.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/createCB.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,216 @@ ++ ++ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ createCB.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#include "iLBC_define.h" ++#include "createCB.h" ++#include "constants.h" ++#include <string.h> ++#include <math.h> ++ ++/*----------------------------------------------------------------* ++ * Construct an additional codebook vector by filtering the ++ * initial codebook buffer. This vector is then used to expand ++ * the codebook with an additional section. ++ *---------------------------------------------------------------*/ ++ ++void filteredCBvecs( ++ float *cbvectors, /* (o) Codebook vectors for the ++ higher section */ ++ float *mem, /* (i) Buffer to create codebook ++ vector from */ ++ int lMem /* (i) Length of buffer */ ++){ ++ int j, k; ++ float *pp, *pp1; ++ float tempbuff2[CB_MEML+CB_FILTERLEN]; ++ float *pos; ++ ++ memset(tempbuff2, 0, (CB_HALFFILTERLEN-1)*sizeof(float)); ++ memcpy(&tempbuff2[CB_HALFFILTERLEN-1], mem, lMem*sizeof(float)); ++ memset(&tempbuff2[lMem+CB_HALFFILTERLEN-1], 0, ++ (CB_HALFFILTERLEN+1)*sizeof(float)); ++ ++ /* Create codebook vector for higher section by filtering */ ++ ++ /* do filtering */ ++ pos=cbvectors; ++ memset(pos, 0, lMem*sizeof(float)); ++ for (k=0; k<lMem; k++) { ++ pp=&tempbuff2[k]; ++ pp1=&cbfiltersTbl[CB_FILTERLEN-1]; ++ for (j=0;j<CB_FILTERLEN;j++) { ++ (*pos)+=(*pp++)*(*pp1--); ++ } ++ pos++; ++ } ++} ++ ++ ++ ++/*----------------------------------------------------------------* ++ * Search the augmented part of the codebook to find the best ++ * measure. ++ *----------------------------------------------------------------*/ ++ ++void searchAugmentedCB( ++ int low, /* (i) Start index for the search */ ++ int high, /* (i) End index for the search */ ++ int stage, /* (i) Current stage */ ++ int startIndex, /* (i) Codebook index for the first ++ aug vector */ ++ float *target, /* (i) Target vector for encoding */ ++ float *buffer, /* (i) Pointer to the end of the buffer for ++ augmented codebook construction */ ++ float *max_measure, /* (i/o) Currently maximum measure */ ++ int *best_index,/* (o) Currently the best index */ ++ float *gain, /* (o) Currently the best gain */ ++ float *energy, /* (o) Energy of augmented codebook ++ vectors */ ++ float *invenergy/* (o) Inv energy of augmented codebook ++ vectors */ ++) { ++ int icount, ilow, j, tmpIndex; ++ float *pp, *ppo, *ppi, *ppe, crossDot, alfa; ++ float weighted, measure, nrjRecursive; ++ float ftmp; ++ ++ /* Compute the energy for the first (low-5) ++ noninterpolated samples */ ++ nrjRecursive = (float) 0.0; ++ pp = buffer - low + 1; ++ for (j=0; j<(low-5); j++) { ++ nrjRecursive += ( (*pp)*(*pp) ); ++ pp++; ++ } ++ ppe = buffer - low; ++ ++ ++ for (icount=low; icount<=high; icount++) { ++ ++ /* Index of the codebook vector used for retrieving ++ energy values */ ++ tmpIndex = startIndex+icount-20; ++ ++ ilow = icount-4; ++ ++ /* Update the energy recursively to save complexity */ ++ nrjRecursive = nrjRecursive + (*ppe)*(*ppe); ++ ppe--; ++ energy[tmpIndex] = nrjRecursive; ++ ++ /* Compute cross dot product for the first (low-5) ++ samples */ ++ crossDot = (float) 0.0; ++ ++ ++ pp = buffer-icount; ++ for (j=0; j<ilow; j++) { ++ crossDot += target[j]*(*pp++); ++ } ++ ++ /* interpolation */ ++ alfa = (float) 0.2; ++ ppo = buffer-4; ++ ppi = buffer-icount-4; ++ for (j=ilow; j<icount; j++) { ++ weighted = ((float)1.0-alfa)*(*ppo)+alfa*(*ppi); ++ ppo++; ++ ppi++; ++ energy[tmpIndex] += weighted*weighted; ++ crossDot += target[j]*weighted; ++ alfa += (float)0.2; ++ } ++ ++ /* Compute energy and cross dot product for the ++ remaining samples */ ++ pp = buffer - icount; ++ for (j=icount; j<SUBL; j++) { ++ energy[tmpIndex] += (*pp)*(*pp); ++ crossDot += target[j]*(*pp++); ++ } ++ ++ if (energy[tmpIndex]>0.0) { ++ invenergy[tmpIndex]=(float)1.0/(energy[tmpIndex]+EPS); ++ } else { ++ invenergy[tmpIndex] = (float) 0.0; ++ } ++ ++ if (stage==0) { ++ measure = (float)-10000000.0; ++ ++ if (crossDot > 0.0) { ++ measure = crossDot*crossDot*invenergy[tmpIndex]; ++ } ++ } ++ else { ++ measure = crossDot*crossDot*invenergy[tmpIndex]; ++ } ++ ++ /* check if measure is better */ ++ ftmp = crossDot*invenergy[tmpIndex]; ++ ++ if ((measure>*max_measure) && (fabs(ftmp)<CB_MAXGAIN)) { ++ *best_index = tmpIndex; ++ *max_measure = measure; ++ *gain = ftmp; ++ } ++ } ++} ++ ++ ++ ++ ++/*----------------------------------------------------------------* ++ * Recreate a specific codebook vector from the augmented part. ++ * ++ *----------------------------------------------------------------*/ ++ ++void createAugmentedVec( ++ int index, /* (i) Index for the augmented vector ++ to be created */ ++ float *buffer, /* (i) Pointer to the end of the buffer for ++ augmented codebook construction */ ++ float *cbVec/* (o) The construced codebook vector */ ++) { ++ int ilow, j; ++ float *pp, *ppo, *ppi, alfa, alfa1, weighted; ++ ++ ilow = index-5; ++ ++ /* copy the first noninterpolated part */ ++ ++ pp = buffer-index; ++ memcpy(cbVec,pp,sizeof(float)*index); ++ ++ /* interpolation */ ++ ++ alfa1 = (float)0.2; ++ alfa = 0.0; ++ ppo = buffer-5; ++ ppi = buffer-index-5; ++ for (j=ilow; j<index; j++) { ++ weighted = ((float)1.0-alfa)*(*ppo)+alfa*(*ppi); ++ ppo++; ++ ppi++; ++ cbVec[j] = weighted; ++ alfa += alfa1; ++ } ++ ++ /* copy the second noninterpolated part */ ++ ++ pp = buffer - index; ++ memcpy(cbVec+index,pp,sizeof(float)*(SUBL-index)); ++} ++ ++ +diff -druN codecs/ilbc.orig/createCB.h codecs/ilbc/createCB.h +--- codecs/ilbc.orig/createCB.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/createCB.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,56 @@ ++ ++/****************************************************************** ++ ++ ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ createCB.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#ifndef __iLBC_CREATECB_H ++#define __iLBC_CREATECB_H ++ ++void filteredCBvecs( ++ float *cbvectors, /* (o) Codebook vector for the ++ higher section */ ++ float *mem, /* (i) Buffer to create codebook ++ vectors from */ ++ int lMem /* (i) Length of buffer */ ++); ++ ++void searchAugmentedCB( ++ int low, /* (i) Start index for the search */ ++ int high, /* (i) End index for the search */ ++ int stage, /* (i) Current stage */ ++ int startIndex, /* (i) CB index for the first ++ augmented vector */ ++ float *target, /* (i) Target vector for encoding */ ++ float *buffer, /* (i) Pointer to the end of the ++ buffer for augmented codebook ++ construction */ ++ float *max_measure, /* (i/o) Currently maximum measure */ ++ int *best_index,/* (o) Currently the best index */ ++ float *gain, /* (o) Currently the best gain */ ++ float *energy, /* (o) Energy of augmented ++ codebook vectors */ ++ float *invenergy/* (o) Inv energy of aug codebook ++ vectors */ ++); ++ ++void createAugmentedVec( ++ int index, /* (i) Index for the aug vector ++ to be created */ ++ float *buffer, /* (i) Pointer to the end of the ++ buffer for augmented codebook ++ construction */ ++ float *cbVec /* (o) The construced codebook vector */ ++); ++ ++#endif ++ ++ +diff -druN codecs/ilbc.orig/doCPLC.c codecs/ilbc/doCPLC.c +--- codecs/ilbc.orig/doCPLC.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/doCPLC.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,259 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ doCPLC.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#include <math.h> ++#include <string.h> ++#include <stdio.h> ++ ++#include "iLBC_define.h" ++#include "doCPLC.h" ++ ++/*----------------------------------------------------------------* ++ * Compute cross correlation and pitch gain for pitch prediction ++ * of last subframe at given lag. ++ *---------------------------------------------------------------*/ ++ ++static void compCorr( ++ float *cc, /* (o) cross correlation coefficient */ ++ float *gc, /* (o) gain */ ++ float *pm, ++ float *buffer, /* (i) signal buffer */ ++ int lag, /* (i) pitch lag */ ++ int bLen, /* (i) length of buffer */ ++ int sRange /* (i) correlation search length */ ++){ ++ ++ ++ int i; ++ float ftmp1, ftmp2, ftmp3; ++ ++ /* Guard against getting outside buffer */ ++ if ((bLen-sRange-lag)<0) { ++ sRange=bLen-lag; ++ } ++ ++ ftmp1 = 0.0; ++ ftmp2 = 0.0; ++ ftmp3 = 0.0; ++ for (i=0; i<sRange; i++) { ++ ftmp1 += buffer[bLen-sRange+i] * ++ buffer[bLen-sRange+i-lag]; ++ ftmp2 += buffer[bLen-sRange+i-lag] * ++ buffer[bLen-sRange+i-lag]; ++ ftmp3 += buffer[bLen-sRange+i] * ++ buffer[bLen-sRange+i]; ++ } ++ ++ if (ftmp2 > 0.0) { ++ *cc = ftmp1*ftmp1/ftmp2; ++ *gc = (float)fabs(ftmp1/ftmp2); ++ *pm=(float)fabs(ftmp1)/ ++ ((float)sqrt(ftmp2)*(float)sqrt(ftmp3)); ++ } ++ else { ++ *cc = 0.0; ++ *gc = 0.0; ++ *pm=0.0; ++ } ++} ++ ++/*----------------------------------------------------------------* ++ * Packet loss concealment routine. Conceals a residual signal ++ * and LP parameters. If no packet loss, update state. ++ *---------------------------------------------------------------*/ ++ ++void doThePLC( ++ float *PLCresidual, /* (o) concealed residual */ ++ float *PLClpc, /* (o) concealed LP parameters */ ++ int PLI, /* (i) packet loss indicator ++ 0 - no PL, 1 = PL */ ++ float *decresidual, /* (i) decoded residual */ ++ float *lpc, /* (i) decoded LPC (only used for no PL) */ ++ int inlag, /* (i) pitch lag */ ++ iLBC_Dec_Inst_t *iLBCdec_inst ++ /* (i/o) decoder instance */ ++){ ++ int lag=20, randlag; ++ float gain, maxcc; ++ float use_gain; ++ float gain_comp, maxcc_comp, per, max_per; ++ int i, pick, use_lag; ++ ++ ++ float ftmp, randvec[BLOCKL_MAX], pitchfact, energy; ++ ++ /* Packet Loss */ ++ ++ if (PLI == 1) { ++ ++ iLBCdec_inst->consPLICount += 1; ++ ++ /* if previous frame not lost, ++ determine pitch pred. gain */ ++ ++ if (iLBCdec_inst->prevPLI != 1) { ++ ++ /* Search around the previous lag to find the ++ best pitch period */ ++ ++ lag=inlag-3; ++ compCorr(&maxcc, &gain, &max_per, ++ iLBCdec_inst->prevResidual, ++ lag, iLBCdec_inst->blockl, 60); ++ for (i=inlag-2;i<=inlag+3;i++) { ++ compCorr(&maxcc_comp, &gain_comp, &per, ++ iLBCdec_inst->prevResidual, ++ i, iLBCdec_inst->blockl, 60); ++ ++ if (maxcc_comp>maxcc) { ++ maxcc=maxcc_comp; ++ gain=gain_comp; ++ lag=i; ++ max_per=per; ++ } ++ } ++ ++ } ++ ++ /* previous frame lost, use recorded lag and periodicity */ ++ ++ else { ++ lag=iLBCdec_inst->prevLag; ++ max_per=iLBCdec_inst->per; ++ } ++ ++ /* downscaling */ ++ ++ use_gain=1.0; ++ if (iLBCdec_inst->consPLICount*iLBCdec_inst->blockl>320) ++ use_gain=(float)0.9; ++ else if (iLBCdec_inst->consPLICount* ++ iLBCdec_inst->blockl>2*320) ++ use_gain=(float)0.7; ++ else if (iLBCdec_inst->consPLICount* ++ iLBCdec_inst->blockl>3*320) ++ use_gain=(float)0.5; ++ else if (iLBCdec_inst->consPLICount* ++ ++ ++ iLBCdec_inst->blockl>4*320) ++ use_gain=(float)0.0; ++ ++ /* mix noise and pitch repeatition */ ++ ftmp=(float)sqrt(max_per); ++ if (ftmp>(float)0.7) ++ pitchfact=(float)1.0; ++ else if (ftmp>(float)0.4) ++ pitchfact=(ftmp-(float)0.4)/((float)0.7-(float)0.4); ++ else ++ pitchfact=0.0; ++ ++ ++ /* avoid repetition of same pitch cycle */ ++ use_lag=lag; ++ if (lag<80) { ++ use_lag=2*lag; ++ } ++ ++ /* compute concealed residual */ ++ ++ energy = 0.0; ++ for (i=0; i<iLBCdec_inst->blockl; i++) { ++ ++ /* noise component */ ++ ++ iLBCdec_inst->seed=(iLBCdec_inst->seed*69069L+1) & ++ (0x80000000L-1); ++ randlag = 50 + ((signed long) iLBCdec_inst->seed)%70; ++ pick = i - randlag; ++ ++ if (pick < 0) { ++ randvec[i] = ++ iLBCdec_inst->prevResidual[ ++ iLBCdec_inst->blockl+pick]; ++ } else { ++ randvec[i] = randvec[pick]; ++ } ++ ++ /* pitch repeatition component */ ++ pick = i - use_lag; ++ ++ if (pick < 0) { ++ PLCresidual[i] = ++ iLBCdec_inst->prevResidual[ ++ iLBCdec_inst->blockl+pick]; ++ } else { ++ PLCresidual[i] = PLCresidual[pick]; ++ } ++ ++ /* mix random and periodicity component */ ++ ++ if (i<80) ++ PLCresidual[i] = use_gain*(pitchfact * ++ ++ ++ PLCresidual[i] + ++ ((float)1.0 - pitchfact) * randvec[i]); ++ else if (i<160) ++ PLCresidual[i] = (float)0.95*use_gain*(pitchfact * ++ PLCresidual[i] + ++ ((float)1.0 - pitchfact) * randvec[i]); ++ else ++ PLCresidual[i] = (float)0.9*use_gain*(pitchfact * ++ PLCresidual[i] + ++ ((float)1.0 - pitchfact) * randvec[i]); ++ ++ energy += PLCresidual[i] * PLCresidual[i]; ++ } ++ ++ /* less than 30 dB, use only noise */ ++ ++ if (sqrt(energy/(float)iLBCdec_inst->blockl) < 30.0) { ++ gain=0.0; ++ for (i=0; i<iLBCdec_inst->blockl; i++) { ++ PLCresidual[i] = randvec[i]; ++ } ++ } ++ ++ /* use old LPC */ ++ ++ memcpy(PLClpc,iLBCdec_inst->prevLpc, ++ (LPC_FILTERORDER+1)*sizeof(float)); ++ ++ } ++ ++ /* no packet loss, copy input */ ++ ++ else { ++ memcpy(PLCresidual, decresidual, ++ iLBCdec_inst->blockl*sizeof(float)); ++ memcpy(PLClpc, lpc, (LPC_FILTERORDER+1)*sizeof(float)); ++ iLBCdec_inst->consPLICount = 0; ++ } ++ ++ /* update state */ ++ ++ if (PLI) { ++ iLBCdec_inst->prevLag = lag; ++ iLBCdec_inst->per=max_per; ++ } ++ ++ iLBCdec_inst->prevPLI = PLI; ++ memcpy(iLBCdec_inst->prevLpc, PLClpc, ++ (LPC_FILTERORDER+1)*sizeof(float)); ++ memcpy(iLBCdec_inst->prevResidual, PLCresidual, ++ iLBCdec_inst->blockl*sizeof(float)); ++} ++ ++ ++ ++ +diff -druN codecs/ilbc.orig/doCPLC.h codecs/ilbc/doCPLC.h +--- codecs/ilbc.orig/doCPLC.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/doCPLC.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,32 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ doCPLC.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++ ++ ++******************************************************************/ ++ ++#ifndef __iLBC_DOLPC_H ++#define __iLBC_DOLPC_H ++ ++void doThePLC( ++ float *PLCresidual, /* (o) concealed residual */ ++ float *PLClpc, /* (o) concealed LP parameters */ ++ int PLI, /* (i) packet loss indicator ++ 0 - no PL, 1 = PL */ ++ float *decresidual, /* (i) decoded residual */ ++ float *lpc, /* (i) decoded LPC (only used for no PL) */ ++ int inlag, /* (i) pitch lag */ ++ iLBC_Dec_Inst_t *iLBCdec_inst ++ /* (i/o) decoder instance */ ++); ++ ++#endif ++ ++ +diff -druN codecs/ilbc.orig/enhancer.c codecs/ilbc/enhancer.c +--- codecs/ilbc.orig/enhancer.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/enhancer.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,665 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ enhancer.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#include <math.h> ++#include <string.h> ++#include "iLBC_define.h" ++#include "enhancer.h" ++#include "constants.h" ++#include "filter.h" ++ ++/*----------------------------------------------------------------* ++ ++ ++ * Find index in array such that the array element with said ++ * index is the element of said array closest to "value" ++ * according to the squared-error criterion ++ *---------------------------------------------------------------*/ ++ ++static void NearestNeighbor( ++ int *index, /* (o) index of array element closest ++ to value */ ++ float *array, /* (i) data array */ ++ float value,/* (i) value */ ++ int arlength/* (i) dimension of data array */ ++){ ++ int i; ++ float bestcrit,crit; ++ ++ crit=array[0]-value; ++ bestcrit=crit*crit; ++ *index=0; ++ for (i=1; i<arlength; i++) { ++ crit=array[i]-value; ++ crit=crit*crit; ++ ++ if (crit<bestcrit) { ++ bestcrit=crit; ++ *index=i; ++ } ++ } ++} ++ ++/*----------------------------------------------------------------* ++ * compute cross correlation between sequences ++ *---------------------------------------------------------------*/ ++ ++static void mycorr1( ++ float* corr, /* (o) correlation of seq1 and seq2 */ ++ float* seq1, /* (i) first sequence */ ++ int dim1, /* (i) dimension first seq1 */ ++ const float *seq2, /* (i) second sequence */ ++ int dim2 /* (i) dimension seq2 */ ++){ ++ int i,j; ++ ++ for (i=0; i<=dim1-dim2; i++) { ++ corr[i]=0.0; ++ for (j=0; j<dim2; j++) { ++ corr[i] += seq1[i+j] * seq2[j]; ++ } ++ } ++} ++ ++/*----------------------------------------------------------------* ++ * upsample finite array assuming zeros outside bounds ++ *---------------------------------------------------------------*/ ++ ++ ++ ++static void enh_upsample( ++ float* useq1, /* (o) upsampled output sequence */ ++ float* seq1,/* (i) unupsampled sequence */ ++ int dim1, /* (i) dimension seq1 */ ++ int hfl /* (i) polyphase filter length=2*hfl+1 */ ++){ ++ float *pu,*ps; ++ int i,j,k,q,filterlength,hfl2; ++ const float *polyp[ENH_UPS0]; /* pointers to ++ polyphase columns */ ++ const float *pp; ++ ++ /* define pointers for filter */ ++ ++ filterlength=2*hfl+1; ++ ++ if ( filterlength > dim1 ) { ++ hfl2=(int) (dim1/2); ++ for (j=0; j<ENH_UPS0; j++) { ++ polyp[j]=polyphaserTbl+j*filterlength+hfl-hfl2; ++ } ++ hfl=hfl2; ++ filterlength=2*hfl+1; ++ } ++ else { ++ for (j=0; j<ENH_UPS0; j++) { ++ polyp[j]=polyphaserTbl+j*filterlength; ++ } ++ } ++ ++ /* filtering: filter overhangs left side of sequence */ ++ ++ pu=useq1; ++ for (i=hfl; i<filterlength; i++) { ++ for (j=0; j<ENH_UPS0; j++) { ++ *pu=0.0; ++ pp = polyp[j]; ++ ps = seq1+i; ++ for (k=0; k<=i; k++) { ++ *pu += *ps-- * *pp++; ++ } ++ pu++; ++ } ++ } ++ ++ /* filtering: simple convolution=inner products */ ++ ++ for (i=filterlength; i<dim1; i++) { ++ for (j=0;j<ENH_UPS0; j++){ ++ *pu=0.0; ++ pp = polyp[j]; ++ ps = seq1+i; ++ for (k=0; k<filterlength; k++) { ++ *pu += *ps-- * *pp++; ++ ++ ++ } ++ pu++; ++ } ++ } ++ ++ /* filtering: filter overhangs right side of sequence */ ++ ++ for (q=1; q<=hfl; q++) { ++ for (j=0; j<ENH_UPS0; j++) { ++ *pu=0.0; ++ pp = polyp[j]+q; ++ ps = seq1+dim1-1; ++ for (k=0; k<filterlength-q; k++) { ++ *pu += *ps-- * *pp++; ++ } ++ pu++; ++ } ++ } ++} ++ ++ ++/*----------------------------------------------------------------* ++ * find segment starting near idata+estSegPos that has highest ++ * correlation with idata+centerStartPos through ++ * idata+centerStartPos+ENH_BLOCKL-1 segment is found at a ++ * resolution of ENH_UPSO times the original of the original ++ * sampling rate ++ *---------------------------------------------------------------*/ ++ ++static void refiner( ++ float *seg, /* (o) segment array */ ++ float *updStartPos, /* (o) updated start point */ ++ float* idata, /* (i) original data buffer */ ++ int idatal, /* (i) dimension of idata */ ++ int centerStartPos, /* (i) beginning center segment */ ++ float estSegPos,/* (i) estimated beginning other segment */ ++ float period /* (i) estimated pitch period */ ++){ ++ int estSegPosRounded,searchSegStartPos,searchSegEndPos,corrdim; ++ int tloc,tloc2,i,st,en,fraction; ++ float vect[ENH_VECTL],corrVec[ENH_CORRDIM],maxv; ++ float corrVecUps[ENH_CORRDIM*ENH_UPS0]; ++ ++ /* defining array bounds */ ++ ++ estSegPosRounded=(int)(estSegPos - 0.5); ++ ++ searchSegStartPos=estSegPosRounded-ENH_SLOP; ++ ++ if (searchSegStartPos<0) { ++ searchSegStartPos=0; ++ } ++ searchSegEndPos=estSegPosRounded+ENH_SLOP; ++ ++ ++ ++ if (searchSegEndPos+ENH_BLOCKL >= idatal) { ++ searchSegEndPos=idatal-ENH_BLOCKL-1; ++ } ++ corrdim=searchSegEndPos-searchSegStartPos+1; ++ ++ /* compute upsampled correlation (corr33) and find ++ location of max */ ++ ++ mycorr1(corrVec,idata+searchSegStartPos, ++ corrdim+ENH_BLOCKL-1,idata+centerStartPos,ENH_BLOCKL); ++ enh_upsample(corrVecUps,corrVec,corrdim,ENH_FL0); ++ tloc=0; maxv=corrVecUps[0]; ++ for (i=1; i<ENH_UPS0*corrdim; i++) { ++ ++ if (corrVecUps[i]>maxv) { ++ tloc=i; ++ maxv=corrVecUps[i]; ++ } ++ } ++ ++ /* make vector can be upsampled without ever running outside ++ bounds */ ++ ++ *updStartPos= (float)searchSegStartPos + ++ (float)tloc/(float)ENH_UPS0+(float)1.0; ++ tloc2=(int)(tloc/ENH_UPS0); ++ ++ if (tloc>tloc2*ENH_UPS0) { ++ tloc2++; ++ } ++ st=searchSegStartPos+tloc2-ENH_FL0; ++ ++ if (st<0) { ++ memset(vect,0,-st*sizeof(float)); ++ memcpy(&vect[-st],idata, (ENH_VECTL+st)*sizeof(float)); ++ } ++ else { ++ en=st+ENH_VECTL; ++ ++ if (en>idatal) { ++ memcpy(vect, &idata[st], ++ (ENH_VECTL-(en-idatal))*sizeof(float)); ++ memset(&vect[ENH_VECTL-(en-idatal)], 0, ++ (en-idatal)*sizeof(float)); ++ } ++ else { ++ memcpy(vect, &idata[st], ENH_VECTL*sizeof(float)); ++ } ++ } ++ fraction=tloc2*ENH_UPS0-tloc; ++ ++ /* compute the segment (this is actually a convolution) */ ++ ++ mycorr1(seg,vect,ENH_VECTL,polyphaserTbl+(2*ENH_FL0+1)*fraction, ++ ++ ++ 2*ENH_FL0+1); ++} ++ ++/*----------------------------------------------------------------* ++ * find the smoothed output data ++ *---------------------------------------------------------------*/ ++ ++static void smath( ++ float *odata, /* (o) smoothed output */ ++ float *sseq,/* (i) said second sequence of waveforms */ ++ int hl, /* (i) 2*hl+1 is sseq dimension */ ++ float alpha0/* (i) max smoothing energy fraction */ ++){ ++ int i,k; ++ float w00,w10,w11,A,B,C,*psseq,err,errs; ++ float surround[BLOCKL_MAX]; /* shape contributed by other than ++ current */ ++ float wt[2*ENH_HL+1]; /* waveform weighting to get ++ surround shape */ ++ float denom; ++ ++ /* create shape of contribution from all waveforms except the ++ current one */ ++ ++ for (i=1; i<=2*hl+1; i++) { ++ wt[i-1] = (float)0.5*(1 - (float)cos(2*PI*i/(2*hl+2))); ++ } ++ wt[hl]=0.0; /* for clarity, not used */ ++ for (i=0; i<ENH_BLOCKL; i++) { ++ surround[i]=sseq[i]*wt[0]; ++ } ++ for (k=1; k<hl; k++) { ++ psseq=sseq+k*ENH_BLOCKL; ++ for(i=0;i<ENH_BLOCKL; i++) { ++ surround[i]+=psseq[i]*wt[k]; ++ } ++ } ++ for (k=hl+1; k<=2*hl; k++) { ++ psseq=sseq+k*ENH_BLOCKL; ++ for(i=0;i<ENH_BLOCKL; i++) { ++ surround[i]+=psseq[i]*wt[k]; ++ } ++ } ++ ++ /* compute some inner products */ ++ ++ w00 = w10 = w11 = 0.0; ++ psseq=sseq+hl*ENH_BLOCKL; /* current block */ ++ for (i=0; i<ENH_BLOCKL;i++) { ++ w00+=psseq[i]*psseq[i]; ++ w11+=surround[i]*surround[i]; ++ w10+=surround[i]*psseq[i]; ++ } ++ ++ ++ ++ if (fabs(w11) < 1.0) { ++ w11=1.0; ++ } ++ C = (float)sqrt( w00/w11); ++ ++ /* first try enhancement without power-constraint */ ++ ++ errs=0.0; ++ psseq=sseq+hl*ENH_BLOCKL; ++ for (i=0; i<ENH_BLOCKL; i++) { ++ odata[i]=C*surround[i]; ++ err=psseq[i]-odata[i]; ++ errs+=err*err; ++ } ++ ++ /* if constraint violated by first try, add constraint */ ++ ++ if (errs > alpha0 * w00) { ++ if ( w00 < 1) { ++ w00=1; ++ } ++ denom = (w11*w00-w10*w10)/(w00*w00); ++ ++ if (denom > 0.0001) { /* eliminates numerical problems ++ for if smooth */ ++ A = (float)sqrt( (alpha0- alpha0*alpha0/4)/denom); ++ B = -alpha0/2 - A * w10/w00; ++ B = B+1; ++ } ++ else { /* essentially no difference between cycles; ++ smoothing not needed */ ++ A= 0.0; ++ B= 1.0; ++ } ++ ++ /* create smoothed sequence */ ++ ++ psseq=sseq+hl*ENH_BLOCKL; ++ for (i=0; i<ENH_BLOCKL; i++) { ++ odata[i]=A*surround[i]+B*psseq[i]; ++ } ++ } ++} ++ ++/*----------------------------------------------------------------* ++ * get the pitch-synchronous sample sequence ++ *---------------------------------------------------------------*/ ++ ++static void getsseq( ++ float *sseq, /* (o) the pitch-synchronous sequence */ ++ float *idata, /* (i) original data */ ++ int idatal, /* (i) dimension of data */ ++ int centerStartPos, /* (i) where current block starts */ ++ float *period, /* (i) rough-pitch-period array */ ++ ++ ++ float *plocs, /* (i) where periods of period array ++ are taken */ ++ int periodl, /* (i) dimension period array */ ++ int hl /* (i) 2*hl+1 is the number of sequences */ ++){ ++ int i,centerEndPos,q; ++ float blockStartPos[2*ENH_HL+1]; ++ int lagBlock[2*ENH_HL+1]; ++ float plocs2[ENH_PLOCSL]; ++ float *psseq; ++ ++ centerEndPos=centerStartPos+ENH_BLOCKL-1; ++ ++ /* present */ ++ ++ NearestNeighbor(lagBlock+hl,plocs, ++ (float)0.5*(centerStartPos+centerEndPos),periodl); ++ ++ blockStartPos[hl]=(float)centerStartPos; ++ psseq=sseq+ENH_BLOCKL*hl; ++ memcpy(psseq, idata+centerStartPos, ENH_BLOCKL*sizeof(float)); ++ ++ /* past */ ++ ++ for (q=hl-1; q>=0; q--) { ++ blockStartPos[q]=blockStartPos[q+1]-period[lagBlock[q+1]]; ++ NearestNeighbor(lagBlock+q,plocs, ++ blockStartPos[q]+ ++ ENH_BLOCKL_HALF-period[lagBlock[q+1]], periodl); ++ ++ ++ if (blockStartPos[q]-ENH_OVERHANG>=0) { ++ refiner(sseq+q*ENH_BLOCKL, blockStartPos+q, idata, ++ idatal, centerStartPos, blockStartPos[q], ++ period[lagBlock[q+1]]); ++ } else { ++ psseq=sseq+q*ENH_BLOCKL; ++ memset(psseq, 0, ENH_BLOCKL*sizeof(float)); ++ } ++ } ++ ++ /* future */ ++ ++ for (i=0; i<periodl; i++) { ++ plocs2[i]=plocs[i]-period[i]; ++ } ++ for (q=hl+1; q<=2*hl; q++) { ++ NearestNeighbor(lagBlock+q,plocs2, ++ blockStartPos[q-1]+ENH_BLOCKL_HALF,periodl); ++ ++ blockStartPos[q]=blockStartPos[q-1]+period[lagBlock[q]]; ++ if (blockStartPos[q]+ENH_BLOCKL+ENH_OVERHANG<idatal) { ++ refiner(sseq+ENH_BLOCKL*q, blockStartPos+q, idata, ++ idatal, centerStartPos, blockStartPos[q], ++ ++ ++ period[lagBlock[q]]); ++ } ++ else { ++ psseq=sseq+q*ENH_BLOCKL; ++ memset(psseq, 0, ENH_BLOCKL*sizeof(float)); ++ } ++ } ++} ++ ++/*----------------------------------------------------------------* ++ * perform enhancement on idata+centerStartPos through ++ * idata+centerStartPos+ENH_BLOCKL-1 ++ *---------------------------------------------------------------*/ ++ ++static void enhancer( ++ float *odata, /* (o) smoothed block, dimension blockl */ ++ float *idata, /* (i) data buffer used for enhancing */ ++ int idatal, /* (i) dimension idata */ ++ int centerStartPos, /* (i) first sample current block ++ within idata */ ++ float alpha0, /* (i) max correction-energy-fraction ++ (in [0,1]) */ ++ float *period, /* (i) pitch period array */ ++ float *plocs, /* (i) locations where period array ++ values valid */ ++ int periodl /* (i) dimension of period and plocs */ ++){ ++ float sseq[(2*ENH_HL+1)*ENH_BLOCKL]; ++ ++ /* get said second sequence of segments */ ++ ++ getsseq(sseq,idata,idatal,centerStartPos,period, ++ plocs,periodl,ENH_HL); ++ ++ /* compute the smoothed output from said second sequence */ ++ ++ smath(odata,sseq,ENH_HL,alpha0); ++ ++} ++ ++/*----------------------------------------------------------------* ++ * cross correlation ++ *---------------------------------------------------------------*/ ++ ++float xCorrCoef( ++ float *target, /* (i) first array */ ++ float *regressor, /* (i) second array */ ++ int subl /* (i) dimension arrays */ ++){ ++ int i; ++ float ftmp1, ftmp2; ++ ++ ftmp1 = 0.0; ++ ftmp2 = 0.0; ++ ++ ++ for (i=0; i<subl; i++) { ++ ftmp1 += target[i]*regressor[i]; ++ ftmp2 += regressor[i]*regressor[i]; ++ } ++ ++ if (ftmp1 > 0.0) { ++ return (float)(ftmp1*ftmp1/ftmp2); ++ } ++ else { ++ return (float)0.0; ++ } ++} ++ ++/*----------------------------------------------------------------* ++ * interface for enhancer ++ *---------------------------------------------------------------*/ ++ ++int enhancerInterface( ++ float *out, /* (o) enhanced signal */ ++ float *in, /* (i) unenhanced signal */ ++ iLBC_Dec_Inst_t *iLBCdec_inst /* (i) buffers etc */ ++){ ++ float *enh_buf, *enh_period; ++ int iblock, isample; ++ int lag=0, ilag, i, ioffset; ++ float cc, maxcc; ++ float ftmp1, ftmp2; ++ float *inPtr, *enh_bufPtr1, *enh_bufPtr2; ++ float plc_pred[ENH_BLOCKL]; ++ ++ float lpState[6], downsampled[(ENH_NBLOCKS*ENH_BLOCKL+120)/2]; ++ int inLen=ENH_NBLOCKS*ENH_BLOCKL+120; ++ int start, plc_blockl, inlag; ++ ++ enh_buf=iLBCdec_inst->enh_buf; ++ enh_period=iLBCdec_inst->enh_period; ++ ++ memmove(enh_buf, &enh_buf[iLBCdec_inst->blockl], ++ (ENH_BUFL-iLBCdec_inst->blockl)*sizeof(float)); ++ ++ memcpy(&enh_buf[ENH_BUFL-iLBCdec_inst->blockl], in, ++ iLBCdec_inst->blockl*sizeof(float)); ++ ++ if (iLBCdec_inst->mode==30) ++ plc_blockl=ENH_BLOCKL; ++ else ++ plc_blockl=40; ++ ++ /* when 20 ms frame, move processing one block */ ++ ioffset=0; ++ if (iLBCdec_inst->mode==20) ioffset=1; ++ ++ i=3-ioffset; ++ memmove(enh_period, &enh_period[i], ++ ++ ++ (ENH_NBLOCKS_TOT-i)*sizeof(float)); ++ ++ /* Set state information to the 6 samples right before ++ the samples to be downsampled. */ ++ ++ memcpy(lpState, ++ enh_buf+(ENH_NBLOCKS_EXTRA+ioffset)*ENH_BLOCKL-126, ++ 6*sizeof(float)); ++ ++ /* Down sample a factor 2 to save computations */ ++ ++ DownSample(enh_buf+(ENH_NBLOCKS_EXTRA+ioffset)*ENH_BLOCKL-120, ++ lpFilt_coefsTbl, inLen-ioffset*ENH_BLOCKL, ++ lpState, downsampled); ++ ++ /* Estimate the pitch in the down sampled domain. */ ++ for (iblock = 0; iblock<ENH_NBLOCKS-ioffset; iblock++) { ++ ++ lag = 10; ++ maxcc = xCorrCoef(downsampled+60+iblock* ++ ENH_BLOCKL_HALF, downsampled+60+iblock* ++ ENH_BLOCKL_HALF-lag, ENH_BLOCKL_HALF); ++ for (ilag=11; ilag<60; ilag++) { ++ cc = xCorrCoef(downsampled+60+iblock* ++ ENH_BLOCKL_HALF, downsampled+60+iblock* ++ ENH_BLOCKL_HALF-ilag, ENH_BLOCKL_HALF); ++ ++ if (cc > maxcc) { ++ maxcc = cc; ++ lag = ilag; ++ } ++ } ++ ++ /* Store the estimated lag in the non-downsampled domain */ ++ enh_period[iblock+ENH_NBLOCKS_EXTRA+ioffset] = (float)lag*2; ++ ++ ++ } ++ ++ ++ /* PLC was performed on the previous packet */ ++ if (iLBCdec_inst->prev_enh_pl==1) { ++ ++ inlag=(int)enh_period[ENH_NBLOCKS_EXTRA+ioffset]; ++ ++ lag = inlag-1; ++ maxcc = xCorrCoef(in, in+lag, plc_blockl); ++ for (ilag=inlag; ilag<=inlag+1; ilag++) { ++ cc = xCorrCoef(in, in+ilag, plc_blockl); ++ ++ if (cc > maxcc) { ++ maxcc = cc; ++ lag = ilag; ++ } ++ } ++ ++ ++ ++ enh_period[ENH_NBLOCKS_EXTRA+ioffset-1]=(float)lag; ++ ++ /* compute new concealed residual for the old lookahead, ++ mix the forward PLC with a backward PLC from ++ the new frame */ ++ ++ inPtr=&in[lag-1]; ++ ++ enh_bufPtr1=&plc_pred[plc_blockl-1]; ++ ++ if (lag>plc_blockl) { ++ start=plc_blockl; ++ } else { ++ start=lag; ++ } ++ ++ for (isample = start; isample>0; isample--) { ++ *enh_bufPtr1-- = *inPtr--; ++ } ++ ++ enh_bufPtr2=&enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl]; ++ for (isample = (plc_blockl-1-lag); isample>=0; isample--) ++{ ++ *enh_bufPtr1-- = *enh_bufPtr2--; ++ } ++ ++ /* limit energy change */ ++ ftmp2=0.0; ++ ftmp1=0.0; ++ for (i=0;i<plc_blockl;i++) { ++ ftmp2+=enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl-i]* ++ enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl-i]; ++ ftmp1+=plc_pred[i]*plc_pred[i]; ++ } ++ ftmp1=(float)sqrt(ftmp1/(float)plc_blockl); ++ ftmp2=(float)sqrt(ftmp2/(float)plc_blockl); ++ if (ftmp1>(float)2.0*ftmp2 && ftmp1>0.0) { ++ for (i=0;i<plc_blockl-10;i++) { ++ plc_pred[i]*=(float)2.0*ftmp2/ftmp1; ++ } ++ for (i=plc_blockl-10;i<plc_blockl;i++) { ++ plc_pred[i]*=(float)(i-plc_blockl+10)* ++ ((float)1.0-(float)2.0*ftmp2/ftmp1)/(float)(10)+ ++ (float)2.0*ftmp2/ftmp1; ++ } ++ } ++ ++ enh_bufPtr1=&enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl]; ++ for (i=0; i<plc_blockl; i++) { ++ ftmp1 = (float) (i+1) / (float) (plc_blockl+1); ++ *enh_bufPtr1 *= ftmp1; ++ *enh_bufPtr1 += ((float)1.0-ftmp1)* ++ plc_pred[plc_blockl-1-i]; ++ enh_bufPtr1--; ++ } ++ ++ ++ } ++ ++ if (iLBCdec_inst->mode==20) { ++ /* Enhancer with 40 samples delay */ ++ for (iblock = 0; iblock<2; iblock++) { ++ enhancer(out+iblock*ENH_BLOCKL, enh_buf, ++ ENH_BUFL, (5+iblock)*ENH_BLOCKL+40, ++ ENH_ALPHA0, enh_period, enh_plocsTbl, ++ ENH_NBLOCKS_TOT); ++ } ++ } else if (iLBCdec_inst->mode==30) { ++ /* Enhancer with 80 samples delay */ ++ for (iblock = 0; iblock<3; iblock++) { ++ enhancer(out+iblock*ENH_BLOCKL, enh_buf, ++ ENH_BUFL, (4+iblock)*ENH_BLOCKL, ++ ENH_ALPHA0, enh_period, enh_plocsTbl, ++ ENH_NBLOCKS_TOT); ++ } ++ } ++ ++ return (lag*2); ++} ++ ++ +diff -druN codecs/ilbc.orig/enhancer.h codecs/ilbc/enhancer.h +--- codecs/ilbc.orig/enhancer.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/enhancer.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,33 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ enhancer.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#ifndef __ENHANCER_H ++#define __ENHANCER_H ++ ++#include "iLBC_define.h" ++ ++float xCorrCoef( ++ float *target, /* (i) first array */ ++ float *regressor, /* (i) second array */ ++ int subl /* (i) dimension arrays */ ++); ++ ++int enhancerInterface( ++ float *out, /* (o) the enhanced recidual signal */ ++ float *in, /* (i) the recidual signal to enhance */ ++ iLBC_Dec_Inst_t *iLBCdec_inst ++ /* (i/o) the decoder state structure */ ++); ++ ++#endif ++ ++ +diff -druN codecs/ilbc.orig/filter.c codecs/ilbc/filter.c +--- codecs/ilbc.orig/filter.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/filter.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,168 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ filter.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++ ++ ++#include "iLBC_define.h" ++#include "filter.h" ++ ++/*----------------------------------------------------------------* ++ * all-pole filter ++ *---------------------------------------------------------------*/ ++ ++void AllPoleFilter( ++ float *InOut, /* (i/o) on entrance InOut[-orderCoef] to ++ InOut[-1] contain the state of the ++ filter (delayed samples). InOut[0] to ++ InOut[lengthInOut-1] contain the filter ++ input, on en exit InOut[-orderCoef] to ++ InOut[-1] is unchanged and InOut[0] to ++ InOut[lengthInOut-1] contain filtered ++ samples */ ++ float *Coef,/* (i) filter coefficients, Coef[0] is assumed ++ to be 1.0 */ ++ int lengthInOut,/* (i) number of input/output samples */ ++ int orderCoef /* (i) number of filter coefficients */ ++){ ++ int n,k; ++ ++ for(n=0;n<lengthInOut;n++){ ++ for(k=1;k<=orderCoef;k++){ ++ *InOut -= Coef[k]*InOut[-k]; ++ } ++ InOut++; ++ } ++} ++ ++/*----------------------------------------------------------------* ++ * all-zero filter ++ *---------------------------------------------------------------*/ ++ ++void AllZeroFilter( ++ float *In, /* (i) In[0] to In[lengthInOut-1] contain ++ filter input samples */ ++ float *Coef,/* (i) filter coefficients (Coef[0] is assumed ++ to be 1.0) */ ++ int lengthInOut,/* (i) number of input/output samples */ ++ int orderCoef, /* (i) number of filter coefficients */ ++ float *Out /* (i/o) on entrance Out[-orderCoef] to Out[-1] ++ contain the filter state, on exit Out[0] ++ to Out[lengthInOut-1] contain filtered ++ samples */ ++){ ++ int n,k; ++ ++ for(n=0;n<lengthInOut;n++){ ++ *Out = Coef[0]*In[0]; ++ for(k=1;k<=orderCoef;k++){ ++ *Out += Coef[k]*In[-k]; ++ } ++ ++ ++ Out++; ++ In++; ++ } ++} ++ ++/*----------------------------------------------------------------* ++ * pole-zero filter ++ *---------------------------------------------------------------*/ ++ ++void ZeroPoleFilter( ++ float *In, /* (i) In[0] to In[lengthInOut-1] contain ++ filter input samples In[-orderCoef] to ++ In[-1] contain state of all-zero ++ section */ ++ float *ZeroCoef,/* (i) filter coefficients for all-zero ++ section (ZeroCoef[0] is assumed to ++ be 1.0) */ ++ float *PoleCoef,/* (i) filter coefficients for all-pole section ++ (ZeroCoef[0] is assumed to be 1.0) */ ++ int lengthInOut,/* (i) number of input/output samples */ ++ int orderCoef, /* (i) number of filter coefficients */ ++ float *Out /* (i/o) on entrance Out[-orderCoef] to Out[-1] ++ contain state of all-pole section. On ++ exit Out[0] to Out[lengthInOut-1] ++ contain filtered samples */ ++){ ++ AllZeroFilter(In,ZeroCoef,lengthInOut,orderCoef,Out); ++ AllPoleFilter(Out,PoleCoef,lengthInOut,orderCoef); ++} ++ ++/*----------------------------------------------------------------* ++ * downsample (LP filter and decimation) ++ *---------------------------------------------------------------*/ ++ ++void DownSample ( ++ float *In, /* (i) input samples */ ++ float *Coef, /* (i) filter coefficients */ ++ int lengthIn, /* (i) number of input samples */ ++ float *state, /* (i) filter state */ ++ float *Out /* (o) downsampled output */ ++){ ++ float o; ++ float *Out_ptr = Out; ++ float *Coef_ptr, *In_ptr; ++ float *state_ptr; ++ int i, j, stop; ++ ++ /* LP filter and decimate at the same time */ ++ ++ for (i = DELAY_DS; i < lengthIn; i+=FACTOR_DS) ++ { ++ Coef_ptr = &Coef[0]; ++ In_ptr = &In[i]; ++ state_ptr = &state[FILTERORDER_DS-2]; ++ ++ ++ ++ o = (float)0.0; ++ ++ stop = (i < FILTERORDER_DS) ? i + 1 : FILTERORDER_DS; ++ ++ for (j = 0; j < stop; j++) ++ { ++ o += *Coef_ptr++ * (*In_ptr--); ++ } ++ for (j = i + 1; j < FILTERORDER_DS; j++) ++ { ++ o += *Coef_ptr++ * (*state_ptr--); ++ } ++ ++ *Out_ptr++ = o; ++ } ++ ++ /* Get the last part (use zeros as input for the future) */ ++ ++ for (i=(lengthIn+FACTOR_DS); i<(lengthIn+DELAY_DS); ++ i+=FACTOR_DS) { ++ ++ o=(float)0.0; ++ ++ if (i<lengthIn) { ++ Coef_ptr = &Coef[0]; ++ In_ptr = &In[i]; ++ for (j=0; j<FILTERORDER_DS; j++) { ++ o += *Coef_ptr++ * (*Out_ptr--); ++ } ++ } else { ++ Coef_ptr = &Coef[i-lengthIn]; ++ In_ptr = &In[lengthIn-1]; ++ for (j=0; j<FILTERORDER_DS-(i-lengthIn); j++) { ++ o += *Coef_ptr++ * (*In_ptr--); ++ } ++ } ++ *Out_ptr++ = o; ++ } ++} ++ ++ +diff -druN codecs/ilbc.orig/filter.h codecs/ilbc/filter.h +--- codecs/ilbc.orig/filter.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/filter.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,73 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ filter.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#ifndef __iLBC_FILTER_H ++#define __iLBC_FILTER_H ++ ++void AllPoleFilter( ++ float *InOut, /* (i/o) on entrance InOut[-orderCoef] to ++ InOut[-1] contain the state of the ++ filter (delayed samples). InOut[0] to ++ InOut[lengthInOut-1] contain the filter ++ input, on en exit InOut[-orderCoef] to ++ InOut[-1] is unchanged and InOut[0] to ++ InOut[lengthInOut-1] contain filtered ++ samples */ ++ float *Coef,/* (i) filter coefficients, Coef[0] is assumed ++ to be 1.0 */ ++ int lengthInOut,/* (i) number of input/output samples */ ++ int orderCoef /* (i) number of filter coefficients */ ++); ++ ++ ++ ++void AllZeroFilter( ++ float *In, /* (i) In[0] to In[lengthInOut-1] contain ++ filter input samples */ ++ float *Coef,/* (i) filter coefficients (Coef[0] is assumed ++ to be 1.0) */ ++ int lengthInOut,/* (i) number of input/output samples */ ++ int orderCoef, /* (i) number of filter coefficients */ ++ float *Out /* (i/o) on entrance Out[-orderCoef] to Out[-1] ++ contain the filter state, on exit Out[0] ++ to Out[lengthInOut-1] contain filtered ++ samples */ ++); ++ ++void ZeroPoleFilter( ++ float *In, /* (i) In[0] to In[lengthInOut-1] contain filter ++ input samples In[-orderCoef] to In[-1] ++ contain state of all-zero section */ ++ float *ZeroCoef,/* (i) filter coefficients for all-zero ++ section (ZeroCoef[0] is assumed to ++ be 1.0) */ ++ float *PoleCoef,/* (i) filter coefficients for all-pole section ++ (ZeroCoef[0] is assumed to be 1.0) */ ++ int lengthInOut,/* (i) number of input/output samples */ ++ int orderCoef, /* (i) number of filter coefficients */ ++ float *Out /* (i/o) on entrance Out[-orderCoef] to Out[-1] ++ contain state of all-pole section. On ++ exit Out[0] to Out[lengthInOut-1] ++ contain filtered samples */ ++); ++ ++void DownSample ( ++ float *In, /* (i) input samples */ ++ float *Coef, /* (i) filter coefficients */ ++ int lengthIn, /* (i) number of input samples */ ++ float *state, /* (i) filter state */ ++ float *Out /* (o) downsampled output */ ++); ++ ++#endif ++ ++ +diff -druN codecs/ilbc.orig/gainquant.c codecs/ilbc/gainquant.c +--- codecs/ilbc.orig/gainquant.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/gainquant.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,107 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ gainquant.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++ ++ ++******************************************************************/ ++ ++#include <string.h> ++#include <math.h> ++#include "constants.h" ++#include "gainquant.h" ++#include "filter.h" ++ ++/*----------------------------------------------------------------* ++ * quantizer for the gain in the gain-shape coding of residual ++ *---------------------------------------------------------------*/ ++ ++float gainquant(/* (o) quantized gain value */ ++ float in, /* (i) gain value */ ++ float maxIn,/* (i) maximum of gain value */ ++ int cblen, /* (i) number of quantization indices */ ++ int *index /* (o) quantization index */ ++){ ++ int i, tindex; ++ float minmeasure,measure, *cb, scale; ++ ++ /* ensure a lower bound on the scaling factor */ ++ ++ scale=maxIn; ++ ++ if (scale<0.1) { ++ scale=(float)0.1; ++ } ++ ++ /* select the quantization table */ ++ ++ if (cblen == 8) { ++ cb = gain_sq3Tbl; ++ } else if (cblen == 16) { ++ cb = gain_sq4Tbl; ++ } else { ++ cb = gain_sq5Tbl; ++ } ++ ++ /* select the best index in the quantization table */ ++ ++ minmeasure=10000000.0; ++ tindex=0; ++ for (i=0; i<cblen; i++) { ++ measure=(in-scale*cb[i])*(in-scale*cb[i]); ++ ++ if (measure<minmeasure) { ++ tindex=i; ++ minmeasure=measure; ++ } ++ } ++ *index=tindex; ++ ++ /* return the quantized value */ ++ ++ ++ ++ return scale*cb[tindex]; ++} ++ ++/*----------------------------------------------------------------* ++ * decoder for quantized gains in the gain-shape coding of ++ * residual ++ *---------------------------------------------------------------*/ ++ ++float gaindequant( /* (o) quantized gain value */ ++ int index, /* (i) quantization index */ ++ float maxIn,/* (i) maximum of unquantized gain */ ++ int cblen /* (i) number of quantization indices */ ++){ ++ float scale; ++ ++ /* obtain correct scale factor */ ++ ++ scale=(float)fabs(maxIn); ++ ++ if (scale<0.1) { ++ scale=(float)0.1; ++ } ++ ++ /* select the quantization table and return the decoded value */ ++ ++ if (cblen==8) { ++ return scale*gain_sq3Tbl[index]; ++ } else if (cblen==16) { ++ return scale*gain_sq4Tbl[index]; ++ } ++ else if (cblen==32) { ++ return scale*gain_sq5Tbl[index]; ++ } ++ ++ return 0.0; ++} ++ ++ +diff -druN codecs/ilbc.orig/gainquant.h codecs/ilbc/gainquant.h +--- codecs/ilbc.orig/gainquant.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/gainquant.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,31 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ gainquant.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#ifndef __iLBC_GAINQUANT_H ++#define __iLBC_GAINQUANT_H ++ ++float gainquant(/* (o) quantized gain value */ ++ float in, /* (i) gain value */ ++ float maxIn,/* (i) maximum of gain value */ ++ int cblen, /* (i) number of quantization indices */ ++ int *index /* (o) quantization index */ ++); ++ ++float gaindequant( /* (o) quantized gain value */ ++ int index, /* (i) quantization index */ ++ float maxIn,/* (i) maximum of unquantized gain */ ++ int cblen /* (i) number of quantization indices */ ++); ++ ++#endif ++ ++ +diff -druN codecs/ilbc.orig/getCBvec.c codecs/ilbc/getCBvec.c +--- codecs/ilbc.orig/getCBvec.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/getCBvec.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,181 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ getCBvec.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#include "iLBC_define.h" ++#include "getCBvec.h" ++#include "constants.h" ++#include <string.h> ++ ++/*----------------------------------------------------------------* ++ * Construct codebook vector for given index. ++ *---------------------------------------------------------------*/ ++ ++void getCBvec( ++ float *cbvec, /* (o) Constructed codebook vector */ ++ float *mem, /* (i) Codebook buffer */ ++ int index, /* (i) Codebook index */ ++ int lMem, /* (i) Length of codebook buffer */ ++ int cbveclen/* (i) Codebook vector length */ ++){ ++ int j, k, n, memInd, sFilt; ++ float tmpbuf[CB_MEML]; ++ int base_size; ++ int ilow, ihigh; ++ float alfa, alfa1; ++ ++ /* Determine size of codebook sections */ ++ ++ base_size=lMem-cbveclen+1; ++ ++ if (cbveclen==SUBL) { ++ base_size+=cbveclen/2; ++ } ++ ++ /* No filter -> First codebook section */ ++ ++ ++ ++ if (index<lMem-cbveclen+1) { ++ ++ /* first non-interpolated vectors */ ++ ++ k=index+cbveclen; ++ /* get vector */ ++ memcpy(cbvec, mem+lMem-k, cbveclen*sizeof(float)); ++ ++ } else if (index < base_size) { ++ ++ k=2*(index-(lMem-cbveclen+1))+cbveclen; ++ ++ ihigh=k/2; ++ ilow=ihigh-5; ++ ++ /* Copy first noninterpolated part */ ++ ++ memcpy(cbvec, mem+lMem-k/2, ilow*sizeof(float)); ++ ++ /* interpolation */ ++ ++ alfa1=(float)0.2; ++ alfa=0.0; ++ for (j=ilow; j<ihigh; j++) { ++ cbvec[j]=((float)1.0-alfa)*mem[lMem-k/2+j]+ ++ alfa*mem[lMem-k+j]; ++ alfa+=alfa1; ++ } ++ ++ /* Copy second noninterpolated part */ ++ ++ memcpy(cbvec+ihigh, mem+lMem-k+ihigh, ++ (cbveclen-ihigh)*sizeof(float)); ++ ++ } ++ ++ /* Higher codebbok section based on filtering */ ++ ++ else { ++ ++ /* first non-interpolated vectors */ ++ ++ if (index-base_size<lMem-cbveclen+1) { ++ float tempbuff2[CB_MEML+CB_FILTERLEN+1]; ++ float *pos; ++ float *pp, *pp1; ++ ++ memset(tempbuff2, 0, ++ CB_HALFFILTERLEN*sizeof(float)); ++ memcpy(&tempbuff2[CB_HALFFILTERLEN], mem, ++ lMem*sizeof(float)); ++ memset(&tempbuff2[lMem+CB_HALFFILTERLEN], 0, ++ (CB_HALFFILTERLEN+1)*sizeof(float)); ++ ++ ++ ++ k=index-base_size+cbveclen; ++ sFilt=lMem-k; ++ memInd=sFilt+1-CB_HALFFILTERLEN; ++ ++ /* do filtering */ ++ pos=cbvec; ++ memset(pos, 0, cbveclen*sizeof(float)); ++ for (n=0; n<cbveclen; n++) { ++ pp=&tempbuff2[memInd+n+CB_HALFFILTERLEN]; ++ pp1=&cbfiltersTbl[CB_FILTERLEN-1]; ++ for (j=0; j<CB_FILTERLEN; j++) { ++ (*pos)+=(*pp++)*(*pp1--); ++ } ++ pos++; ++ } ++ } ++ ++ /* interpolated vectors */ ++ ++ else { ++ float tempbuff2[CB_MEML+CB_FILTERLEN+1]; ++ ++ float *pos; ++ float *pp, *pp1; ++ int i; ++ ++ memset(tempbuff2, 0, ++ CB_HALFFILTERLEN*sizeof(float)); ++ memcpy(&tempbuff2[CB_HALFFILTERLEN], mem, ++ lMem*sizeof(float)); ++ memset(&tempbuff2[lMem+CB_HALFFILTERLEN], 0, ++ (CB_HALFFILTERLEN+1)*sizeof(float)); ++ ++ k=2*(index-base_size- ++ (lMem-cbveclen+1))+cbveclen; ++ sFilt=lMem-k; ++ memInd=sFilt+1-CB_HALFFILTERLEN; ++ ++ /* do filtering */ ++ pos=&tmpbuf[sFilt]; ++ memset(pos, 0, k*sizeof(float)); ++ for (i=0; i<k; i++) { ++ pp=&tempbuff2[memInd+i+CB_HALFFILTERLEN]; ++ pp1=&cbfiltersTbl[CB_FILTERLEN-1]; ++ for (j=0; j<CB_FILTERLEN; j++) { ++ (*pos)+=(*pp++)*(*pp1--); ++ } ++ pos++; ++ } ++ ++ ihigh=k/2; ++ ilow=ihigh-5; ++ ++ ++ ++ /* Copy first noninterpolated part */ ++ ++ memcpy(cbvec, tmpbuf+lMem-k/2, ++ ilow*sizeof(float)); ++ ++ /* interpolation */ ++ ++ alfa1=(float)0.2; ++ alfa=0.0; ++ for (j=ilow; j<ihigh; j++) { ++ cbvec[j]=((float)1.0-alfa)* ++ tmpbuf[lMem-k/2+j]+alfa*tmpbuf[lMem-k+j]; ++ alfa+=alfa1; ++ } ++ ++ /* Copy second noninterpolated part */ ++ ++ memcpy(cbvec+ihigh, tmpbuf+lMem-k+ihigh, ++ (cbveclen-ihigh)*sizeof(float)); ++ } ++ } ++} ++ ++ +diff -druN codecs/ilbc.orig/getCBvec.h codecs/ilbc/getCBvec.h +--- codecs/ilbc.orig/getCBvec.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/getCBvec.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,28 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ getCBvec.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#ifndef __iLBC_GETCBVEC_H ++#define __iLBC_GETCBVEC_H ++ ++ ++ ++void getCBvec( ++ float *cbvec, /* (o) Constructed codebook vector */ ++ float *mem, /* (i) Codebook buffer */ ++ int index, /* (i) Codebook index */ ++ int lMem, /* (i) Length of codebook buffer */ ++ int cbveclen/* (i) Codebook vector length */ ++); ++ ++#endif ++ ++ +diff -druN codecs/ilbc.orig/helpfun.c codecs/ilbc/helpfun.c +--- codecs/ilbc.orig/helpfun.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/helpfun.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,308 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ helpfun.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#include <math.h> ++ ++#include "iLBC_define.h" ++#include "helpfun.h" ++#include "constants.h" ++ ++/*----------------------------------------------------------------* ++ * calculation of auto correlation ++ *---------------------------------------------------------------*/ ++ ++void autocorr( ++ float *r, /* (o) autocorrelation vector */ ++ const float *x, /* (i) data vector */ ++ int N, /* (i) length of data vector */ ++ int order /* largest lag for calculated ++ autocorrelations */ ++){ ++ int lag, n; ++ float sum; ++ ++ for (lag = 0; lag <= order; lag++) { ++ sum = 0; ++ for (n = 0; n < N - lag; n++) { ++ sum += x[n] * x[n+lag]; ++ } ++ r[lag] = sum; ++ } ++} ++ ++ ++ ++/*----------------------------------------------------------------* ++ * window multiplication ++ *---------------------------------------------------------------*/ ++ ++void window( ++ float *z, /* (o) the windowed data */ ++ const float *x, /* (i) the original data vector */ ++ const float *y, /* (i) the window */ ++ int N /* (i) length of all vectors */ ++){ ++ int i; ++ ++ for (i = 0; i < N; i++) { ++ z[i] = x[i] * y[i]; ++ } ++} ++ ++/*----------------------------------------------------------------* ++ * levinson-durbin solution for lpc coefficients ++ *---------------------------------------------------------------*/ ++ ++void levdurb( ++ float *a, /* (o) lpc coefficient vector starting ++ with 1.0 */ ++ float *k, /* (o) reflection coefficients */ ++ float *r, /* (i) autocorrelation vector */ ++ int order /* (i) order of lpc filter */ ++){ ++ float sum, alpha; ++ int m, m_h, i; ++ ++ a[0] = 1.0; ++ ++ if (r[0] < EPS) { /* if r[0] <= 0, set LPC coeff. to zero */ ++ for (i = 0; i < order; i++) { ++ k[i] = 0; ++ a[i+1] = 0; ++ } ++ } else { ++ a[1] = k[0] = -r[1]/r[0]; ++ alpha = r[0] + r[1] * k[0]; ++ for (m = 1; m < order; m++){ ++ sum = r[m + 1]; ++ for (i = 0; i < m; i++){ ++ sum += a[i+1] * r[m - i]; ++ } ++ k[m] = -sum / alpha; ++ alpha += k[m] * sum; ++ m_h = (m + 1) >> 1; ++ for (i = 0; i < m_h; i++){ ++ sum = a[i+1] + k[m] * a[m - i]; ++ a[m - i] += k[m] * a[i+1]; ++ a[i+1] = sum; ++ ++ ++ } ++ a[m+1] = k[m]; ++ } ++ } ++} ++ ++/*----------------------------------------------------------------* ++ * interpolation between vectors ++ *---------------------------------------------------------------*/ ++ ++void interpolate( ++ float *out, /* (o) the interpolated vector */ ++ float *in1, /* (i) the first vector for the ++ interpolation */ ++ float *in2, /* (i) the second vector for the ++ interpolation */ ++ float coef, /* (i) interpolation weights */ ++ int length /* (i) length of all vectors */ ++){ ++ int i; ++ float invcoef; ++ ++ invcoef = (float)1.0 - coef; ++ for (i = 0; i < length; i++) { ++ out[i] = coef * in1[i] + invcoef * in2[i]; ++ } ++} ++ ++/*----------------------------------------------------------------* ++ * lpc bandwidth expansion ++ *---------------------------------------------------------------*/ ++ ++void bwexpand( ++ float *out, /* (o) the bandwidth expanded lpc ++ coefficients */ ++ float *in, /* (i) the lpc coefficients before bandwidth ++ expansion */ ++ float coef, /* (i) the bandwidth expansion factor */ ++ int length /* (i) the length of lpc coefficient vectors */ ++){ ++ int i; ++ float chirp; ++ ++ chirp = coef; ++ ++ out[0] = in[0]; ++ for (i = 1; i < length; i++) { ++ out[i] = chirp * in[i]; ++ chirp *= coef; ++ } ++} ++ ++/*----------------------------------------------------------------* ++ * vector quantization ++ ++ ++ *---------------------------------------------------------------*/ ++ ++void vq( ++ float *Xq, /* (o) the quantized vector */ ++ int *index, /* (o) the quantization index */ ++ const float *CB,/* (i) the vector quantization codebook */ ++ float *X, /* (i) the vector to quantize */ ++ int n_cb, /* (i) the number of vectors in the codebook */ ++ int dim /* (i) the dimension of all vectors */ ++){ ++ int i, j; ++ int pos, minindex; ++ float dist, tmp, mindist; ++ ++ pos = 0; ++ mindist = FLOAT_MAX; ++ minindex = 0; ++ for (j = 0; j < n_cb; j++) { ++ dist = X[0] - CB[pos]; ++ dist *= dist; ++ for (i = 1; i < dim; i++) { ++ tmp = X[i] - CB[pos + i]; ++ dist += tmp*tmp; ++ } ++ ++ if (dist < mindist) { ++ mindist = dist; ++ minindex = j; ++ } ++ pos += dim; ++ } ++ for (i = 0; i < dim; i++) { ++ Xq[i] = CB[minindex*dim + i]; ++ } ++ *index = minindex; ++} ++ ++/*----------------------------------------------------------------* ++ * split vector quantization ++ *---------------------------------------------------------------*/ ++ ++void SplitVQ( ++ float *qX, /* (o) the quantized vector */ ++ int *index, /* (o) a vector of indexes for all vector ++ codebooks in the split */ ++ float *X, /* (i) the vector to quantize */ ++ const float *CB,/* (i) the quantizer codebook */ ++ int nsplit, /* the number of vector splits */ ++ const int *dim, /* the dimension of X and qX */ ++ const int *cbsize /* the number of vectors in the codebook */ ++){ ++ int cb_pos, X_pos, i; ++ ++ cb_pos = 0; ++ ++ ++ X_pos= 0; ++ for (i = 0; i < nsplit; i++) { ++ vq(qX + X_pos, index + i, CB + cb_pos, X + X_pos, ++ cbsize[i], dim[i]); ++ X_pos += dim[i]; ++ cb_pos += dim[i] * cbsize[i]; ++ } ++} ++ ++/*----------------------------------------------------------------* ++ * scalar quantization ++ *---------------------------------------------------------------*/ ++ ++void sort_sq( ++ float *xq, /* (o) the quantized value */ ++ int *index, /* (o) the quantization index */ ++ float x, /* (i) the value to quantize */ ++ const float *cb,/* (i) the quantization codebook */ ++ int cb_size /* (i) the size of the quantization codebook */ ++){ ++ int i; ++ ++ if (x <= cb[0]) { ++ *index = 0; ++ *xq = cb[0]; ++ } else { ++ i = 0; ++ while ((x > cb[i]) && i < cb_size - 1) { ++ i++; ++ } ++ ++ if (x > ((cb[i] + cb[i - 1])/2)) { ++ *index = i; ++ *xq = cb[i]; ++ } else { ++ *index = i - 1; ++ *xq = cb[i - 1]; ++ } ++ } ++} ++ ++/*----------------------------------------------------------------* ++ * check for stability of lsf coefficients ++ *---------------------------------------------------------------*/ ++ ++int LSF_check( /* (o) 1 for stable lsf vectors and 0 for ++ nonstable ones */ ++ float *lsf, /* (i) a table of lsf vectors */ ++ int dim, /* (i) the dimension of each lsf vector */ ++ int NoAn /* (i) the number of lsf vectors in the ++ table */ ++){ ++ int k,n,m, Nit=2, change=0,pos; ++ float tmp; ++ ++ ++ static float eps=(float)0.039; /* 50 Hz */ ++ static float eps2=(float)0.0195; ++ static float maxlsf=(float)3.14; /* 4000 Hz */ ++ static float minlsf=(float)0.01; /* 0 Hz */ ++ ++ /* LSF separation check*/ ++ ++ for (n=0; n<Nit; n++) { /* Run through a couple of times */ ++ for (m=0; m<NoAn; m++) { /* Number of analyses per frame */ ++ for (k=0; k<(dim-1); k++) { ++ pos=m*dim+k; ++ ++ if ((lsf[pos+1]-lsf[pos])<eps) { ++ ++ if (lsf[pos+1]<lsf[pos]) { ++ tmp=lsf[pos+1]; ++ lsf[pos+1]= lsf[pos]+eps2; ++ lsf[pos]= lsf[pos+1]-eps2; ++ } else { ++ lsf[pos]-=eps2; ++ lsf[pos+1]+=eps2; ++ } ++ change=1; ++ } ++ ++ if (lsf[pos]<minlsf) { ++ lsf[pos]=minlsf; ++ change=1; ++ } ++ ++ if (lsf[pos]>maxlsf) { ++ lsf[pos]=maxlsf; ++ change=1; ++ } ++ } ++ } ++ } ++ ++ return change; ++} ++ ++ +diff -druN codecs/ilbc.orig/helpfun.h codecs/ilbc/helpfun.h +--- codecs/ilbc.orig/helpfun.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/helpfun.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,101 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ helpfun.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#ifndef __iLBC_HELPFUN_H ++#define __iLBC_HELPFUN_H ++ ++void autocorr( ++ float *r, /* (o) autocorrelation vector */ ++ const float *x, /* (i) data vector */ ++ int N, /* (i) length of data vector */ ++ int order /* largest lag for calculated ++ autocorrelations */ ++); ++ ++void window( ++ float *z, /* (o) the windowed data */ ++ const float *x, /* (i) the original data vector */ ++ const float *y, /* (i) the window */ ++ int N /* (i) length of all vectors */ ++); ++ ++ ++ ++void levdurb( ++ float *a, /* (o) lpc coefficient vector starting ++ with 1.0 */ ++ float *k, /* (o) reflection coefficients */ ++ float *r, /* (i) autocorrelation vector */ ++ int order /* (i) order of lpc filter */ ++); ++ ++void interpolate( ++ float *out, /* (o) the interpolated vector */ ++ float *in1, /* (i) the first vector for the ++ interpolation */ ++ float *in2, /* (i) the second vector for the ++ interpolation */ ++ float coef, /* (i) interpolation weights */ ++ int length /* (i) length of all vectors */ ++); ++ ++void bwexpand( ++ float *out, /* (o) the bandwidth expanded lpc ++ coefficients */ ++ float *in, /* (i) the lpc coefficients before bandwidth ++ expansion */ ++ float coef, /* (i) the bandwidth expansion factor */ ++ int length /* (i) the length of lpc coefficient vectors */ ++); ++ ++void vq( ++ float *Xq, /* (o) the quantized vector */ ++ int *index, /* (o) the quantization index */ ++ const float *CB,/* (i) the vector quantization codebook */ ++ float *X, /* (i) the vector to quantize */ ++ int n_cb, /* (i) the number of vectors in the codebook */ ++ int dim /* (i) the dimension of all vectors */ ++); ++ ++void SplitVQ( ++ float *qX, /* (o) the quantized vector */ ++ int *index, /* (o) a vector of indexes for all vector ++ codebooks in the split */ ++ float *X, /* (i) the vector to quantize */ ++ const float *CB,/* (i) the quantizer codebook */ ++ int nsplit, /* the number of vector splits */ ++ const int *dim, /* the dimension of X and qX */ ++ const int *cbsize /* the number of vectors in the codebook */ ++); ++ ++ ++void sort_sq( ++ float *xq, /* (o) the quantized value */ ++ int *index, /* (o) the quantization index */ ++ float x, /* (i) the value to quantize */ ++ const float *cb,/* (i) the quantization codebook */ ++ ++ ++ int cb_size /* (i) the size of the quantization codebook */ ++); ++ ++int LSF_check( /* (o) 1 for stable lsf vectors and 0 for ++ nonstable ones */ ++ float *lsf, /* (i) a table of lsf vectors */ ++ int dim, /* (i) the dimension of each lsf vector */ ++ int NoAn /* (i) the number of lsf vectors in the ++ table */ ++); ++ ++#endif ++ ++ +diff -druN codecs/ilbc.orig/hpInput.c codecs/ilbc/hpInput.c +--- codecs/ilbc.orig/hpInput.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/hpInput.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,60 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ hpInput.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#include "constants.h" ++#include "hpInput.h" ++ ++/*----------------------------------------------------------------* ++ * Input high-pass filter ++ *---------------------------------------------------------------*/ ++ ++void hpInput( ++ float *In, /* (i) vector to filter */ ++ int len, /* (i) length of vector to filter */ ++ float *Out, /* (o) the resulting filtered vector */ ++ float *mem /* (i/o) the filter state */ ++){ ++ int i; ++ float *pi, *po; ++ ++ /* all-zero section*/ ++ ++ pi = &In[0]; ++ po = &Out[0]; ++ for (i=0; i<len; i++) { ++ *po = hpi_zero_coefsTbl[0] * (*pi); ++ *po += hpi_zero_coefsTbl[1] * mem[0]; ++ *po += hpi_zero_coefsTbl[2] * mem[1]; ++ ++ mem[1] = mem[0]; ++ mem[0] = *pi; ++ po++; ++ ++ ++ pi++; ++ ++ } ++ ++ /* all-pole section*/ ++ ++ po = &Out[0]; ++ for (i=0; i<len; i++) { ++ *po -= hpi_pole_coefsTbl[1] * mem[2]; ++ *po -= hpi_pole_coefsTbl[2] * mem[3]; ++ ++ mem[3] = mem[2]; ++ mem[2] = *po; ++ po++; ++ } ++} ++ ++ +diff -druN codecs/ilbc.orig/hpInput.h codecs/ilbc/hpInput.h +--- codecs/ilbc.orig/hpInput.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/hpInput.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,27 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ hpInput.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++ ++ ++#ifndef __iLBC_HPINPUT_H ++#define __iLBC_HPINPUT_H ++ ++void hpInput( ++ float *In, /* (i) vector to filter */ ++ int len, /* (i) length of vector to filter */ ++ float *Out, /* (o) the resulting filtered vector */ ++ float *mem /* (i/o) the filter state */ ++); ++ ++#endif ++ ++ +diff -druN codecs/ilbc.orig/hpOutput.c codecs/ilbc/hpOutput.c +--- codecs/ilbc.orig/hpOutput.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/hpOutput.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,59 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ hpOutput.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++ ++ ++******************************************************************/ ++ ++#include "constants.h" ++#include "hpOutput.h" ++/*----------------------------------------------------------------* ++ * Output high-pass filter ++ *---------------------------------------------------------------*/ ++ ++void hpOutput( ++ float *In, /* (i) vector to filter */ ++ int len,/* (i) length of vector to filter */ ++ float *Out, /* (o) the resulting filtered vector */ ++ float *mem /* (i/o) the filter state */ ++){ ++ int i; ++ float *pi, *po; ++ ++ /* all-zero section*/ ++ ++ pi = &In[0]; ++ po = &Out[0]; ++ for (i=0; i<len; i++) { ++ *po = hpo_zero_coefsTbl[0] * (*pi); ++ *po += hpo_zero_coefsTbl[1] * mem[0]; ++ *po += hpo_zero_coefsTbl[2] * mem[1]; ++ ++ mem[1] = mem[0]; ++ mem[0] = *pi; ++ po++; ++ pi++; ++ ++ } ++ ++ /* all-pole section*/ ++ ++ po = &Out[0]; ++ for (i=0; i<len; i++) { ++ *po -= hpo_pole_coefsTbl[1] * mem[2]; ++ *po -= hpo_pole_coefsTbl[2] * mem[3]; ++ ++ mem[3] = mem[2]; ++ mem[2] = *po; ++ po++; ++ } ++} ++ ++ +diff -druN codecs/ilbc.orig/hpOutput.h codecs/ilbc/hpOutput.h +--- codecs/ilbc.orig/hpOutput.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/hpOutput.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,25 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ hpOutput.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#ifndef __iLBC_HPOUTPUT_H ++#define __iLBC_HPOUTPUT_H ++ ++void hpOutput( ++ float *In, /* (i) vector to filter */ ++ int len,/* (i) length of vector to filter */ ++ float *Out, /* (o) the resulting filtered vector */ ++ float *mem /* (i/o) the filter state */ ++); ++ ++#endif ++ ++ +diff -druN codecs/ilbc.orig/iCBConstruct.c codecs/ilbc/iCBConstruct.c +--- codecs/ilbc.orig/iCBConstruct.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/iCBConstruct.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,108 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ iCBConstruct.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#include <math.h> ++ ++#include "iLBC_define.h" ++#include "iCBConstruct.h" ++#include "gainquant.h" ++#include "getCBvec.h" ++ ++/*----------------------------------------------------------------* ++ * Convert the codebook indexes to make the search easier ++ *---------------------------------------------------------------*/ ++ ++ ++ ++void index_conv_enc( ++ int *index /* (i/o) Codebook indexes */ ++){ ++ int k; ++ ++ for (k=1; k<CB_NSTAGES; k++) { ++ ++ if ((index[k]>=108)&&(index[k]<172)) { ++ index[k]-=64; ++ } else if (index[k]>=236) { ++ index[k]-=128; ++ } else { ++ /* ERROR */ ++ } ++ } ++} ++ ++void index_conv_dec( ++ int *index /* (i/o) Codebook indexes */ ++){ ++ int k; ++ ++ for (k=1; k<CB_NSTAGES; k++) { ++ ++ if ((index[k]>=44)&&(index[k]<108)) { ++ index[k]+=64; ++ } else if ((index[k]>=108)&&(index[k]<128)) { ++ index[k]+=128; ++ } else { ++ /* ERROR */ ++ } ++ } ++} ++ ++/*----------------------------------------------------------------* ++ * Construct decoded vector from codebook and gains. ++ *---------------------------------------------------------------*/ ++ ++void iCBConstruct( ++ float *decvector, /* (o) Decoded vector */ ++ int *index, /* (i) Codebook indices */ ++ int *gain_index,/* (i) Gain quantization indices */ ++ float *mem, /* (i) Buffer for codevector construction */ ++ int lMem, /* (i) Length of buffer */ ++ int veclen, /* (i) Length of vector */ ++ int nStages /* (i) Number of codebook stages */ ++){ ++ int j,k; ++ float gain[CB_NSTAGES]; ++ float cbvec[SUBL]; ++ ++ /* gain de-quantization */ ++ ++ gain[0] = gaindequant(gain_index[0], 1.0, 32); ++ ++ ++ if (nStages > 1) { ++ gain[1] = gaindequant(gain_index[1], ++ (float)fabs(gain[0]), 16); ++ } ++ if (nStages > 2) { ++ gain[2] = gaindequant(gain_index[2], ++ (float)fabs(gain[1]), 8); ++ } ++ ++ /* codebook vector construction and construction of ++ total vector */ ++ ++ getCBvec(cbvec, mem, index[0], lMem, veclen); ++ for (j=0;j<veclen;j++){ ++ decvector[j] = gain[0]*cbvec[j]; ++ } ++ if (nStages > 1) { ++ for (k=1; k<nStages; k++) { ++ getCBvec(cbvec, mem, index[k], lMem, veclen); ++ for (j=0;j<veclen;j++) { ++ decvector[j] += gain[k]*cbvec[j]; ++ } ++ } ++ } ++} ++ ++ +diff -druN codecs/ilbc.orig/iCBConstruct.h codecs/ilbc/iCBConstruct.h +--- codecs/ilbc.orig/iCBConstruct.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/iCBConstruct.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,38 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ ++ ++ iCBConstruct.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#ifndef __iLBC_ICBCONSTRUCT_H ++#define __iLBC_ICBCONSTRUCT_H ++ ++void index_conv_enc( ++ int *index /* (i/o) Codebook indexes */ ++); ++ ++void index_conv_dec( ++ int *index /* (i/o) Codebook indexes */ ++); ++ ++void iCBConstruct( ++ float *decvector, /* (o) Decoded vector */ ++ int *index, /* (i) Codebook indices */ ++ int *gain_index,/* (i) Gain quantization indices */ ++ float *mem, /* (i) Buffer for codevector construction */ ++ int lMem, /* (i) Length of buffer */ ++ int veclen, /* (i) Length of vector */ ++ int nStages /* (i) Number of codebook stages */ ++); ++ ++#endif ++ ++ +diff -druN codecs/ilbc.orig/iCBSearch.c codecs/ilbc/iCBSearch.c +--- codecs/ilbc.orig/iCBSearch.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/iCBSearch.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,480 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ iCBSearch.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#include <math.h> ++#include <string.h> ++ ++#include "iLBC_define.h" ++#include "iCBSearch.h" ++#include "gainquant.h" ++#include "createCB.h" ++#include "filter.h" ++#include "constants.h" ++ ++/*----------------------------------------------------------------* ++ * Search routine for codebook encoding and gain quantization. ++ *---------------------------------------------------------------*/ ++ ++void iCBSearch( ++ iLBC_Enc_Inst_t *iLBCenc_inst, ++ /* (i) the encoder state structure */ ++ int *index, /* (o) Codebook indices */ ++ int *gain_index,/* (o) Gain quantization indices */ ++ float *intarget,/* (i) Target vector for encoding */ ++ float *mem, /* (i) Buffer for codebook construction */ ++ int lMem, /* (i) Length of buffer */ ++ int lTarget, /* (i) Length of vector */ ++ int nStages, /* (i) Number of codebook stages */ ++ float *weightDenum, /* (i) weighting filter coefficients */ ++ float *weightState, /* (i) weighting filter state */ ++ int block /* (i) the sub-block number */ ++){ ++ int i, j, icount, stage, best_index, range, counter; ++ float max_measure, gain, measure, crossDot, ftmp; ++ float gains[CB_NSTAGES]; ++ float target[SUBL]; ++ int base_index, sInd, eInd, base_size; ++ int sIndAug=0, eIndAug=0; ++ float buf[CB_MEML+SUBL+2*LPC_FILTERORDER]; ++ ++ ++ float invenergy[CB_EXPAND*128], energy[CB_EXPAND*128]; ++ float *pp, *ppi=0, *ppo=0, *ppe=0; ++ float cbvectors[CB_MEML]; ++ float tene, cene, cvec[SUBL]; ++ float aug_vec[SUBL]; ++ ++ memset(cvec,0,SUBL*sizeof(float)); ++ ++ /* Determine size of codebook sections */ ++ ++ base_size=lMem-lTarget+1; ++ ++ if (lTarget==SUBL) { ++ base_size=lMem-lTarget+1+lTarget/2; ++ } ++ ++ /* setup buffer for weighting */ ++ ++ memcpy(buf,weightState,sizeof(float)*LPC_FILTERORDER); ++ memcpy(buf+LPC_FILTERORDER,mem,lMem*sizeof(float)); ++ memcpy(buf+LPC_FILTERORDER+lMem,intarget,lTarget*sizeof(float)); ++ ++ /* weighting */ ++ ++ AllPoleFilter(buf+LPC_FILTERORDER, weightDenum, ++ lMem+lTarget, LPC_FILTERORDER); ++ ++ /* Construct the codebook and target needed */ ++ ++ memcpy(target, buf+LPC_FILTERORDER+lMem, lTarget*sizeof(float)); ++ ++ tene=0.0; ++ for (i=0; i<lTarget; i++) { ++ tene+=target[i]*target[i]; ++ } ++ ++ /* Prepare search over one more codebook section. This section ++ is created by filtering the original buffer with a filter. */ ++ ++ filteredCBvecs(cbvectors, buf+LPC_FILTERORDER, lMem); ++ ++ /* The Main Loop over stages */ ++ ++ for (stage=0; stage<nStages; stage++) { ++ ++ range = search_rangeTbl[block][stage]; ++ ++ /* initialize search measure */ ++ ++ max_measure = (float)-10000000.0; ++ gain = (float)0.0; ++ best_index = 0; ++ ++ /* Compute cross dot product between the target ++ ++ ++ and the CB memory */ ++ ++ crossDot=0.0; ++ pp=buf+LPC_FILTERORDER+lMem-lTarget; ++ for (j=0; j<lTarget; j++) { ++ crossDot += target[j]*(*pp++); ++ } ++ ++ if (stage==0) { ++ ++ /* Calculate energy in the first block of ++ 'lTarget' sampels. */ ++ ppe = energy; ++ ppi = buf+LPC_FILTERORDER+lMem-lTarget-1; ++ ppo = buf+LPC_FILTERORDER+lMem-1; ++ ++ *ppe=0.0; ++ pp=buf+LPC_FILTERORDER+lMem-lTarget; ++ for (j=0; j<lTarget; j++) { ++ *ppe+=(*pp)*(*pp); ++ pp++; ++ } ++ ++ if (*ppe>0.0) { ++ invenergy[0] = (float) 1.0 / (*ppe + EPS); ++ } else { ++ invenergy[0] = (float) 0.0; ++ } ++ ppe++; ++ ++ measure=(float)-10000000.0; ++ ++ if (crossDot > 0.0) { ++ measure = crossDot*crossDot*invenergy[0]; ++ } ++ } ++ else { ++ measure = crossDot*crossDot*invenergy[0]; ++ } ++ ++ /* check if measure is better */ ++ ftmp = crossDot*invenergy[0]; ++ ++ if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) { ++ best_index = 0; ++ max_measure = measure; ++ gain = ftmp; ++ } ++ ++ /* loop over the main first codebook section, ++ full search */ ++ ++ for (icount=1; icount<range; icount++) { ++ ++ /* calculate measure */ ++ ++ ++ ++ crossDot=0.0; ++ pp = buf+LPC_FILTERORDER+lMem-lTarget-icount; ++ ++ for (j=0; j<lTarget; j++) { ++ crossDot += target[j]*(*pp++); ++ } ++ ++ if (stage==0) { ++ *ppe++ = energy[icount-1] + (*ppi)*(*ppi) - ++ (*ppo)*(*ppo); ++ ppo--; ++ ppi--; ++ ++ if (energy[icount]>0.0) { ++ invenergy[icount] = ++ (float)1.0/(energy[icount]+EPS); ++ } else { ++ invenergy[icount] = (float) 0.0; ++ } ++ ++ measure=(float)-10000000.0; ++ ++ if (crossDot > 0.0) { ++ measure = crossDot*crossDot*invenergy[icount]; ++ } ++ } ++ else { ++ measure = crossDot*crossDot*invenergy[icount]; ++ } ++ ++ /* check if measure is better */ ++ ftmp = crossDot*invenergy[icount]; ++ ++ if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) { ++ best_index = icount; ++ max_measure = measure; ++ gain = ftmp; ++ } ++ } ++ ++ /* Loop over augmented part in the first codebook ++ * section, full search. ++ * The vectors are interpolated. ++ */ ++ ++ if (lTarget==SUBL) { ++ ++ /* Search for best possible cb vector and ++ compute the CB-vectors' energy. */ ++ searchAugmentedCB(20, 39, stage, base_size-lTarget/2, ++ target, buf+LPC_FILTERORDER+lMem, ++ &max_measure, &best_index, &gain, energy, ++ invenergy); ++ ++ ++ } ++ ++ /* set search range for following codebook sections */ ++ ++ base_index=best_index; ++ ++ /* unrestricted search */ ++ ++ if (CB_RESRANGE == -1) { ++ sInd=0; ++ eInd=range-1; ++ sIndAug=20; ++ eIndAug=39; ++ } ++ ++ /* restriced search around best index from first ++ codebook section */ ++ ++ else { ++ /* Initialize search indices */ ++ sIndAug=0; ++ eIndAug=0; ++ sInd=base_index-CB_RESRANGE/2; ++ eInd=sInd+CB_RESRANGE; ++ ++ if (lTarget==SUBL) { ++ ++ if (sInd<0) { ++ ++ sIndAug = 40 + sInd; ++ eIndAug = 39; ++ sInd=0; ++ ++ } else if ( base_index < (base_size-20) ) { ++ ++ if (eInd > range) { ++ sInd -= (eInd-range); ++ eInd = range; ++ } ++ } else { /* base_index >= (base_size-20) */ ++ ++ if (sInd < (base_size-20)) { ++ sIndAug = 20; ++ sInd = 0; ++ eInd = 0; ++ eIndAug = 19 + CB_RESRANGE; ++ ++ if(eIndAug > 39) { ++ eInd = eIndAug-39; ++ eIndAug = 39; ++ } ++ } else { ++ sIndAug = 20 + sInd - (base_size-20); ++ eIndAug = 39; ++ ++ ++ sInd = 0; ++ eInd = CB_RESRANGE - (eIndAug-sIndAug+1); ++ } ++ } ++ ++ } else { /* lTarget = 22 or 23 */ ++ ++ if (sInd < 0) { ++ eInd -= sInd; ++ sInd = 0; ++ } ++ ++ if(eInd > range) { ++ sInd -= (eInd - range); ++ eInd = range; ++ } ++ } ++ } ++ ++ /* search of higher codebook section */ ++ ++ /* index search range */ ++ counter = sInd; ++ sInd += base_size; ++ eInd += base_size; ++ ++ ++ if (stage==0) { ++ ppe = energy+base_size; ++ *ppe=0.0; ++ ++ pp=cbvectors+lMem-lTarget; ++ for (j=0; j<lTarget; j++) { ++ *ppe+=(*pp)*(*pp); ++ pp++; ++ } ++ ++ ppi = cbvectors + lMem - 1 - lTarget; ++ ppo = cbvectors + lMem - 1; ++ ++ for (j=0; j<(range-1); j++) { ++ *(ppe+1) = *ppe + (*ppi)*(*ppi) - (*ppo)*(*ppo); ++ ppo--; ++ ppi--; ++ ppe++; ++ } ++ } ++ ++ /* loop over search range */ ++ ++ for (icount=sInd; icount<eInd; icount++) { ++ ++ /* calculate measure */ ++ ++ crossDot=0.0; ++ ++ ++ pp=cbvectors + lMem - (counter++) - lTarget; ++ ++ for (j=0;j<lTarget;j++) { ++ crossDot += target[j]*(*pp++); ++ } ++ ++ if (energy[icount]>0.0) { ++ invenergy[icount] =(float)1.0/(energy[icount]+EPS); ++ } else { ++ invenergy[icount] =(float)0.0; ++ } ++ ++ if (stage==0) { ++ ++ measure=(float)-10000000.0; ++ ++ if (crossDot > 0.0) { ++ measure = crossDot*crossDot* ++ invenergy[icount]; ++ } ++ } ++ else { ++ measure = crossDot*crossDot*invenergy[icount]; ++ } ++ ++ /* check if measure is better */ ++ ftmp = crossDot*invenergy[icount]; ++ ++ if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) { ++ best_index = icount; ++ max_measure = measure; ++ gain = ftmp; ++ } ++ } ++ ++ /* Search the augmented CB inside the limited range. */ ++ ++ if ((lTarget==SUBL)&&(sIndAug!=0)) { ++ searchAugmentedCB(sIndAug, eIndAug, stage, ++ 2*base_size-20, target, cbvectors+lMem, ++ &max_measure, &best_index, &gain, energy, ++ invenergy); ++ } ++ ++ /* record best index */ ++ ++ index[stage] = best_index; ++ ++ /* gain quantization */ ++ ++ if (stage==0){ ++ ++ if (gain<0.0){ ++ gain = 0.0; ++ ++ ++ } ++ ++ if (gain>CB_MAXGAIN) { ++ gain = (float)CB_MAXGAIN; ++ } ++ gain = gainquant(gain, 1.0, 32, &gain_index[stage]); ++ } ++ else { ++ if (stage==1) { ++ gain = gainquant(gain, (float)fabs(gains[stage-1]), ++ 16, &gain_index[stage]); ++ } else { ++ gain = gainquant(gain, (float)fabs(gains[stage-1]), ++ 8, &gain_index[stage]); ++ } ++ } ++ ++ /* Extract the best (according to measure) ++ codebook vector */ ++ ++ if (lTarget==(STATE_LEN-iLBCenc_inst->state_short_len)) { ++ ++ if (index[stage]<base_size) { ++ pp=buf+LPC_FILTERORDER+lMem-lTarget-index[stage]; ++ } else { ++ pp=cbvectors+lMem-lTarget- ++ index[stage]+base_size; ++ } ++ } else { ++ ++ if (index[stage]<base_size) { ++ if (index[stage]<(base_size-20)) { ++ pp=buf+LPC_FILTERORDER+lMem- ++ lTarget-index[stage]; ++ } else { ++ createAugmentedVec(index[stage]-base_size+40, ++ buf+LPC_FILTERORDER+lMem,aug_vec); ++ pp=aug_vec; ++ } ++ } else { ++ int filterno, position; ++ ++ filterno=index[stage]/base_size; ++ position=index[stage]-filterno*base_size; ++ ++ ++ if (position<(base_size-20)) { ++ pp=cbvectors+filterno*lMem-lTarget- ++ index[stage]+filterno*base_size; ++ } else { ++ createAugmentedVec( ++ index[stage]-(filterno+1)*base_size+40, ++ cbvectors+filterno*lMem,aug_vec); ++ pp=aug_vec; ++ ++ ++ } ++ } ++ } ++ ++ /* Subtract the best codebook vector, according ++ to measure, from the target vector */ ++ ++ for (j=0;j<lTarget;j++) { ++ cvec[j] += gain*(*pp); ++ target[j] -= gain*(*pp++); ++ } ++ ++ /* record quantized gain */ ++ ++ gains[stage]=gain; ++ ++ }/* end of Main Loop. for (stage=0;... */ ++ ++ /* Gain adjustment for energy matching */ ++ cene=0.0; ++ for (i=0; i<lTarget; i++) { ++ cene+=cvec[i]*cvec[i]; ++ } ++ j=gain_index[0]; ++ ++ for (i=gain_index[0]; i<32; i++) { ++ ftmp=cene*gain_sq5Tbl[i]*gain_sq5Tbl[i]; ++ ++ if ((ftmp<(tene*gains[0]*gains[0])) && ++ (gain_sq5Tbl[j]<(2.0*gains[0]))) { ++ j=i; ++ } ++ } ++ gain_index[0]=j; ++} ++ ++ +diff -druN codecs/ilbc.orig/iCBSearch.h codecs/ilbc/iCBSearch.h +--- codecs/ilbc.orig/iCBSearch.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/iCBSearch.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,35 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ iCBSearch.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#ifndef __iLBC_ICBSEARCH_H ++#define __iLBC_ICBSEARCH_H ++ ++void iCBSearch( ++ iLBC_Enc_Inst_t *iLBCenc_inst, ++ /* (i) the encoder state structure */ ++ int *index, /* (o) Codebook indices */ ++ int *gain_index,/* (o) Gain quantization indices */ ++ float *intarget,/* (i) Target vector for encoding */ ++ float *mem, /* (i) Buffer for codebook construction */ ++ int lMem, /* (i) Length of buffer */ ++ int lTarget, /* (i) Length of vector */ ++ int nStages, /* (i) Number of codebook stages */ ++ float *weightDenum, /* (i) weighting filter coefficients */ ++ ++ ++ float *weightState, /* (i) weighting filter state */ ++ int block /* (i) the sub-block number */ ++); ++ ++#endif ++ ++ +diff -druN codecs/ilbc.orig/iLBC_decode.c codecs/ilbc/iLBC_decode.c +--- codecs/ilbc.orig/iLBC_decode.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/iLBC_decode.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,619 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ iLBC_decode.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#include <math.h> ++#include <stdlib.h> ++ ++#include "iLBC_define.h" ++#include "iLBC_decode.h" ++#include "StateConstructW.h" ++#include "LPCdecode.h" ++#include "iCBConstruct.h" ++#include "doCPLC.h" ++#include "helpfun.h" ++#include "constants.h" ++#include "packing.h" ++#include "string.h" ++#include "enhancer.h" ++#include "hpOutput.h" ++#include "syntFilter.h" ++ ++/*----------------------------------------------------------------* ++ * Initiation of decoder instance. ++ *---------------------------------------------------------------*/ ++ ++short initDecode( /* (o) Number of decoded ++ samples */ ++ iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) Decoder instance */ ++ int mode, /* (i) frame size mode */ ++ int use_enhancer /* (i) 1 to use enhancer ++ 0 to run without ++ enhancer */ ++){ ++ int i; ++ ++ iLBCdec_inst->mode = mode; ++ ++ if (mode==30) { ++ iLBCdec_inst->blockl = BLOCKL_30MS; ++ iLBCdec_inst->nsub = NSUB_30MS; ++ iLBCdec_inst->nasub = NASUB_30MS; ++ iLBCdec_inst->lpc_n = LPC_N_30MS; ++ ++ ++ iLBCdec_inst->no_of_bytes = NO_OF_BYTES_30MS; ++ iLBCdec_inst->no_of_words = NO_OF_WORDS_30MS; ++ iLBCdec_inst->state_short_len=STATE_SHORT_LEN_30MS; ++ /* ULP init */ ++ iLBCdec_inst->ULP_inst=&ULP_30msTbl; ++ } ++ else if (mode==20) { ++ iLBCdec_inst->blockl = BLOCKL_20MS; ++ iLBCdec_inst->nsub = NSUB_20MS; ++ iLBCdec_inst->nasub = NASUB_20MS; ++ iLBCdec_inst->lpc_n = LPC_N_20MS; ++ iLBCdec_inst->no_of_bytes = NO_OF_BYTES_20MS; ++ iLBCdec_inst->no_of_words = NO_OF_WORDS_20MS; ++ iLBCdec_inst->state_short_len=STATE_SHORT_LEN_20MS; ++ /* ULP init */ ++ iLBCdec_inst->ULP_inst=&ULP_20msTbl; ++ } ++ else { ++ exit(2); ++ } ++ ++ memset(iLBCdec_inst->syntMem, 0, ++ LPC_FILTERORDER*sizeof(float)); ++ memcpy((*iLBCdec_inst).lsfdeqold, lsfmeanTbl, ++ LPC_FILTERORDER*sizeof(float)); ++ ++ memset(iLBCdec_inst->old_syntdenum, 0, ++ ((LPC_FILTERORDER + 1)*NSUB_MAX)*sizeof(float)); ++ for (i=0; i<NSUB_MAX; i++) ++ iLBCdec_inst->old_syntdenum[i*(LPC_FILTERORDER+1)]=1.0; ++ ++ iLBCdec_inst->last_lag = 20; ++ ++ iLBCdec_inst->prevLag = 120; ++ iLBCdec_inst->per = 0.0; ++ iLBCdec_inst->consPLICount = 0; ++ iLBCdec_inst->prevPLI = 0; ++ iLBCdec_inst->prevLpc[0] = 1.0; ++ memset(iLBCdec_inst->prevLpc+1,0, ++ LPC_FILTERORDER*sizeof(float)); ++ memset(iLBCdec_inst->prevResidual, 0, BLOCKL_MAX*sizeof(float)); ++ iLBCdec_inst->seed=777; ++ ++ memset(iLBCdec_inst->hpomem, 0, 4*sizeof(float)); ++ ++ iLBCdec_inst->use_enhancer = use_enhancer; ++ memset(iLBCdec_inst->enh_buf, 0, ENH_BUFL*sizeof(float)); ++ for (i=0;i<ENH_NBLOCKS_TOT;i++) ++ iLBCdec_inst->enh_period[i]=(float)40.0; ++ ++ iLBCdec_inst->prev_enh_pl = 0; ++ ++ return (iLBCdec_inst->blockl); ++} ++ ++ ++ ++/*----------------------------------------------------------------* ++ * frame residual decoder function (subrutine to iLBC_decode) ++ *---------------------------------------------------------------*/ ++ ++static void Decode( ++ iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) the decoder state ++ structure */ ++ float *decresidual, /* (o) decoded residual frame */ ++ int start, /* (i) location of start ++ state */ ++ int idxForMax, /* (i) codebook index for the ++ maximum value */ ++ int *idxVec, /* (i) codebook indexes for the ++ samples in the start ++ state */ ++ float *syntdenum, /* (i) the decoded synthesis ++ filter coefficients */ ++ int *cb_index, /* (i) the indexes for the ++ adaptive codebook */ ++ int *gain_index, /* (i) the indexes for the ++ corresponding gains */ ++ int *extra_cb_index, /* (i) the indexes for the ++ adaptive codebook part ++ of start state */ ++ int *extra_gain_index, /* (i) the indexes for the ++ corresponding gains */ ++ int state_first /* (i) 1 if non adaptive part ++ of start state comes ++ first 0 if that part ++ comes last */ ++){ ++ float reverseDecresidual[BLOCKL_MAX], mem[CB_MEML]; ++ int k, meml_gotten, Nfor, Nback, i; ++ int diff, start_pos; ++ int subcount, subframe; ++ ++ diff = STATE_LEN - iLBCdec_inst->state_short_len; ++ ++ if (state_first == 1) { ++ start_pos = (start-1)*SUBL; ++ } else { ++ start_pos = (start-1)*SUBL + diff; ++ } ++ ++ /* decode scalar part of start state */ ++ ++ StateConstructW(idxForMax, idxVec, ++ &syntdenum[(start-1)*(LPC_FILTERORDER+1)], ++ &decresidual[start_pos], iLBCdec_inst->state_short_len); ++ ++ ++ if (state_first) { /* put adaptive part in the end */ ++ ++ ++ ++ /* setup memory */ ++ ++ memset(mem, 0, ++ (CB_MEML-iLBCdec_inst->state_short_len)*sizeof(float)); ++ memcpy(mem+CB_MEML-iLBCdec_inst->state_short_len, ++ decresidual+start_pos, ++ iLBCdec_inst->state_short_len*sizeof(float)); ++ ++ /* construct decoded vector */ ++ ++ iCBConstruct( ++ &decresidual[start_pos+iLBCdec_inst->state_short_len], ++ extra_cb_index, extra_gain_index, mem+CB_MEML-stMemLTbl, ++ stMemLTbl, diff, CB_NSTAGES); ++ ++ } ++ else {/* put adaptive part in the beginning */ ++ ++ /* create reversed vectors for prediction */ ++ ++ for (k=0; k<diff; k++) { ++ reverseDecresidual[k] = ++ decresidual[(start+1)*SUBL-1- ++ (k+iLBCdec_inst->state_short_len)]; ++ } ++ ++ /* setup memory */ ++ ++ meml_gotten = iLBCdec_inst->state_short_len; ++ for (k=0; k<meml_gotten; k++){ ++ mem[CB_MEML-1-k] = decresidual[start_pos + k]; ++ } ++ memset(mem, 0, (CB_MEML-k)*sizeof(float)); ++ ++ /* construct decoded vector */ ++ ++ iCBConstruct(reverseDecresidual, extra_cb_index, ++ extra_gain_index, mem+CB_MEML-stMemLTbl, stMemLTbl, ++ diff, CB_NSTAGES); ++ ++ /* get decoded residual from reversed vector */ ++ ++ for (k=0; k<diff; k++) { ++ decresidual[start_pos-1-k] = reverseDecresidual[k]; ++ } ++ } ++ ++ /* counter for predicted sub-frames */ ++ ++ subcount=0; ++ ++ /* forward prediction of sub-frames */ ++ ++ Nfor = iLBCdec_inst->nsub-start-1; ++ ++ ++ ++ if ( Nfor > 0 ){ ++ ++ /* setup memory */ ++ ++ memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float)); ++ memcpy(mem+CB_MEML-STATE_LEN, decresidual+(start-1)*SUBL, ++ STATE_LEN*sizeof(float)); ++ ++ /* loop over sub-frames to encode */ ++ ++ for (subframe=0; subframe<Nfor; subframe++) { ++ ++ /* construct decoded vector */ ++ ++ iCBConstruct(&decresidual[(start+1+subframe)*SUBL], ++ cb_index+subcount*CB_NSTAGES, ++ gain_index+subcount*CB_NSTAGES, ++ mem+CB_MEML-memLfTbl[subcount], ++ memLfTbl[subcount], SUBL, CB_NSTAGES); ++ ++ /* update memory */ ++ ++ memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float)); ++ memcpy(mem+CB_MEML-SUBL, ++ &decresidual[(start+1+subframe)*SUBL], ++ SUBL*sizeof(float)); ++ ++ subcount++; ++ ++ } ++ ++ } ++ ++ /* backward prediction of sub-frames */ ++ ++ Nback = start-1; ++ ++ if ( Nback > 0 ) { ++ ++ /* setup memory */ ++ ++ meml_gotten = SUBL*(iLBCdec_inst->nsub+1-start); ++ ++ if ( meml_gotten > CB_MEML ) { ++ meml_gotten=CB_MEML; ++ } ++ for (k=0; k<meml_gotten; k++) { ++ mem[CB_MEML-1-k] = decresidual[(start-1)*SUBL + k]; ++ } ++ memset(mem, 0, (CB_MEML-k)*sizeof(float)); ++ ++ /* loop over subframes to decode */ ++ ++ ++ ++ for (subframe=0; subframe<Nback; subframe++) { ++ ++ /* construct decoded vector */ ++ ++ iCBConstruct(&reverseDecresidual[subframe*SUBL], ++ cb_index+subcount*CB_NSTAGES, ++ gain_index+subcount*CB_NSTAGES, ++ mem+CB_MEML-memLfTbl[subcount], memLfTbl[subcount], ++ SUBL, CB_NSTAGES); ++ ++ /* update memory */ ++ ++ memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float)); ++ memcpy(mem+CB_MEML-SUBL, ++ &reverseDecresidual[subframe*SUBL], ++ SUBL*sizeof(float)); ++ ++ subcount++; ++ } ++ ++ /* get decoded residual from reversed vector */ ++ ++ for (i=0; i<SUBL*Nback; i++) ++ decresidual[SUBL*Nback - i - 1] = ++ reverseDecresidual[i]; ++ } ++} ++ ++/*----------------------------------------------------------------* ++ * main decoder function ++ *---------------------------------------------------------------*/ ++ ++void iLBC_decode( ++ float *decblock, /* (o) decoded signal block */ ++ unsigned char *bytes, /* (i) encoded signal bits */ ++ iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) the decoder state ++ structure */ ++ int mode /* (i) 0: bad packet, PLC, ++ 1: normal */ ++){ ++ float data[BLOCKL_MAX]; ++ float lsfdeq[LPC_FILTERORDER*LPC_N_MAX]; ++ float PLCresidual[BLOCKL_MAX], PLClpc[LPC_FILTERORDER + 1]; ++ float zeros[BLOCKL_MAX], one[LPC_FILTERORDER + 1]; ++ int k, i, start, idxForMax, pos, lastpart, ulp; ++ int lag, ilag; ++ float cc, maxcc; ++ int idxVec[STATE_LEN]; ++ int check; ++ int gain_index[NASUB_MAX*CB_NSTAGES], ++ extra_gain_index[CB_NSTAGES]; ++ int cb_index[CB_NSTAGES*NASUB_MAX], extra_cb_index[CB_NSTAGES]; ++ int lsf_i[LSF_NSPLIT*LPC_N_MAX]; ++ int state_first; ++ ++ ++ int last_bit; ++ unsigned char *pbytes; ++ float weightdenum[(LPC_FILTERORDER + 1)*NSUB_MAX]; ++ int order_plus_one; ++ float syntdenum[NSUB_MAX*(LPC_FILTERORDER+1)]; ++ float decresidual[BLOCKL_MAX]; ++ ++ if (mode>0) { /* the data are good */ ++ ++ /* decode data */ ++ ++ pbytes=bytes; ++ pos=0; ++ ++ /* Set everything to zero before decoding */ ++ ++ for (k=0; k<LSF_NSPLIT*LPC_N_MAX; k++) { ++ lsf_i[k]=0; ++ } ++ start=0; ++ state_first=0; ++ idxForMax=0; ++ for (k=0; k<iLBCdec_inst->state_short_len; k++) { ++ idxVec[k]=0; ++ } ++ for (k=0; k<CB_NSTAGES; k++) { ++ extra_cb_index[k]=0; ++ } ++ for (k=0; k<CB_NSTAGES; k++) { ++ extra_gain_index[k]=0; ++ } ++ for (i=0; i<iLBCdec_inst->nasub; i++) { ++ for (k=0; k<CB_NSTAGES; k++) { ++ cb_index[i*CB_NSTAGES+k]=0; ++ } ++ } ++ for (i=0; i<iLBCdec_inst->nasub; i++) { ++ for (k=0; k<CB_NSTAGES; k++) { ++ gain_index[i*CB_NSTAGES+k]=0; ++ } ++ } ++ ++ /* loop over ULP classes */ ++ ++ for (ulp=0; ulp<3; ulp++) { ++ ++ /* LSF */ ++ for (k=0; k<LSF_NSPLIT*iLBCdec_inst->lpc_n; k++){ ++ unpack( &pbytes, &lastpart, ++ iLBCdec_inst->ULP_inst->lsf_bits[k][ulp], &pos); ++ packcombine(&lsf_i[k], lastpart, ++ iLBCdec_inst->ULP_inst->lsf_bits[k][ulp]); ++ } ++ ++ ++ ++ /* Start block info */ ++ ++ unpack( &pbytes, &lastpart, ++ iLBCdec_inst->ULP_inst->start_bits[ulp], &pos); ++ packcombine(&start, lastpart, ++ iLBCdec_inst->ULP_inst->start_bits[ulp]); ++ ++ unpack( &pbytes, &lastpart, ++ iLBCdec_inst->ULP_inst->startfirst_bits[ulp], &pos); ++ packcombine(&state_first, lastpart, ++ iLBCdec_inst->ULP_inst->startfirst_bits[ulp]); ++ ++ unpack( &pbytes, &lastpart, ++ iLBCdec_inst->ULP_inst->scale_bits[ulp], &pos); ++ packcombine(&idxForMax, lastpart, ++ iLBCdec_inst->ULP_inst->scale_bits[ulp]); ++ ++ for (k=0; k<iLBCdec_inst->state_short_len; k++) { ++ unpack( &pbytes, &lastpart, ++ iLBCdec_inst->ULP_inst->state_bits[ulp], &pos); ++ packcombine(idxVec+k, lastpart, ++ iLBCdec_inst->ULP_inst->state_bits[ulp]); ++ } ++ ++ /* 23/22 (20ms/30ms) sample block */ ++ ++ for (k=0; k<CB_NSTAGES; k++) { ++ unpack( &pbytes, &lastpart, ++ iLBCdec_inst->ULP_inst->extra_cb_index[k][ulp], ++ &pos); ++ packcombine(extra_cb_index+k, lastpart, ++ iLBCdec_inst->ULP_inst->extra_cb_index[k][ulp]); ++ } ++ for (k=0; k<CB_NSTAGES; k++) { ++ unpack( &pbytes, &lastpart, ++ iLBCdec_inst->ULP_inst->extra_cb_gain[k][ulp], ++ &pos); ++ packcombine(extra_gain_index+k, lastpart, ++ iLBCdec_inst->ULP_inst->extra_cb_gain[k][ulp]); ++ } ++ ++ /* The two/four (20ms/30ms) 40 sample sub-blocks */ ++ ++ for (i=0; i<iLBCdec_inst->nasub; i++) { ++ for (k=0; k<CB_NSTAGES; k++) { ++ unpack( &pbytes, &lastpart, ++ iLBCdec_inst->ULP_inst->cb_index[i][k][ulp], ++ &pos); ++ packcombine(cb_index+i*CB_NSTAGES+k, lastpart, ++ iLBCdec_inst->ULP_inst->cb_index[i][k][ulp]); ++ } ++ } ++ ++ for (i=0; i<iLBCdec_inst->nasub; i++) { ++ ++ ++ for (k=0; k<CB_NSTAGES; k++) { ++ unpack( &pbytes, &lastpart, ++ ++ iLBCdec_inst->ULP_inst->cb_gain[i][k][ulp], ++ &pos); ++ packcombine(gain_index+i*CB_NSTAGES+k, lastpart, ++ iLBCdec_inst->ULP_inst->cb_gain[i][k][ulp]); ++ } ++ } ++ } ++ /* Extract last bit. If it is 1 this indicates an ++ empty/lost frame */ ++ unpack( &pbytes, &last_bit, 1, &pos); ++ ++ /* Check for bit errors or empty/lost frames */ ++ if (start<1) ++ mode = 0; ++ if (iLBCdec_inst->mode==20 && start>3) ++ mode = 0; ++ if (iLBCdec_inst->mode==30 && start>5) ++ mode = 0; ++ if (last_bit==1) ++ mode = 0; ++ ++ if (mode==1) { /* No bit errors was detected, ++ continue decoding */ ++ ++ /* adjust index */ ++ index_conv_dec(cb_index); ++ ++ /* decode the lsf */ ++ ++ SimplelsfDEQ(lsfdeq, lsf_i, iLBCdec_inst->lpc_n); ++ check=LSF_check(lsfdeq, LPC_FILTERORDER, ++ iLBCdec_inst->lpc_n); ++ DecoderInterpolateLSF(syntdenum, weightdenum, ++ lsfdeq, LPC_FILTERORDER, iLBCdec_inst); ++ ++ Decode(iLBCdec_inst, decresidual, start, idxForMax, ++ idxVec, syntdenum, cb_index, gain_index, ++ extra_cb_index, extra_gain_index, ++ state_first); ++ ++ /* preparing the plc for a future loss! */ ++ ++ doThePLC(PLCresidual, PLClpc, 0, decresidual, ++ syntdenum + ++ (LPC_FILTERORDER + 1)*(iLBCdec_inst->nsub - 1), ++ (*iLBCdec_inst).last_lag, iLBCdec_inst); ++ ++ ++ memcpy(decresidual, PLCresidual, ++ iLBCdec_inst->blockl*sizeof(float)); ++ } ++ ++ ++ ++ } ++ ++ if (mode == 0) { ++ /* the data is bad (either a PLC call ++ * was made or a severe bit error was detected) ++ */ ++ ++ /* packet loss conceal */ ++ ++ memset(zeros, 0, BLOCKL_MAX*sizeof(float)); ++ ++ one[0] = 1; ++ memset(one+1, 0, LPC_FILTERORDER*sizeof(float)); ++ ++ start=0; ++ ++ doThePLC(PLCresidual, PLClpc, 1, zeros, one, ++ (*iLBCdec_inst).last_lag, iLBCdec_inst); ++ memcpy(decresidual, PLCresidual, ++ iLBCdec_inst->blockl*sizeof(float)); ++ ++ order_plus_one = LPC_FILTERORDER + 1; ++ for (i = 0; i < iLBCdec_inst->nsub; i++) { ++ memcpy(syntdenum+(i*order_plus_one), PLClpc, ++ order_plus_one*sizeof(float)); ++ } ++ } ++ ++ if (iLBCdec_inst->use_enhancer == 1) { ++ ++ /* post filtering */ ++ ++ iLBCdec_inst->last_lag = ++ enhancerInterface(data, decresidual, iLBCdec_inst); ++ ++ /* synthesis filtering */ ++ ++ if (iLBCdec_inst->mode==20) { ++ /* Enhancer has 40 samples delay */ ++ i=0; ++ syntFilter(data + i*SUBL, ++ iLBCdec_inst->old_syntdenum + ++ (i+iLBCdec_inst->nsub-1)*(LPC_FILTERORDER+1), ++ SUBL, iLBCdec_inst->syntMem); ++ for (i=1; i < iLBCdec_inst->nsub; i++) { ++ syntFilter(data + i*SUBL, ++ syntdenum + (i-1)*(LPC_FILTERORDER+1), ++ SUBL, iLBCdec_inst->syntMem); ++ } ++ } else if (iLBCdec_inst->mode==30) { ++ /* Enhancer has 80 samples delay */ ++ for (i=0; i < 2; i++) { ++ syntFilter(data + i*SUBL, ++ ++ ++ iLBCdec_inst->old_syntdenum + ++ (i+iLBCdec_inst->nsub-2)*(LPC_FILTERORDER+1), ++ SUBL, iLBCdec_inst->syntMem); ++ } ++ for (i=2; i < iLBCdec_inst->nsub; i++) { ++ syntFilter(data + i*SUBL, ++ syntdenum + (i-2)*(LPC_FILTERORDER+1), SUBL, ++ iLBCdec_inst->syntMem); ++ } ++ } ++ ++ } else { ++ ++ /* Find last lag */ ++ lag = 20; ++ maxcc = xCorrCoef(&decresidual[BLOCKL_MAX-ENH_BLOCKL], ++ &decresidual[BLOCKL_MAX-ENH_BLOCKL-lag], ENH_BLOCKL); ++ ++ for (ilag=21; ilag<120; ilag++) { ++ cc = xCorrCoef(&decresidual[BLOCKL_MAX-ENH_BLOCKL], ++ &decresidual[BLOCKL_MAX-ENH_BLOCKL-ilag], ++ ENH_BLOCKL); ++ ++ if (cc > maxcc) { ++ maxcc = cc; ++ lag = ilag; ++ } ++ } ++ iLBCdec_inst->last_lag = lag; ++ ++ /* copy data and run synthesis filter */ ++ ++ memcpy(data, decresidual, ++ iLBCdec_inst->blockl*sizeof(float)); ++ for (i=0; i < iLBCdec_inst->nsub; i++) { ++ syntFilter(data + i*SUBL, ++ syntdenum + i*(LPC_FILTERORDER+1), SUBL, ++ iLBCdec_inst->syntMem); ++ } ++ } ++ ++ /* high pass filtering on output if desired, otherwise ++ copy to out */ ++ ++ hpOutput(data, iLBCdec_inst->blockl, ++ decblock,iLBCdec_inst->hpomem); ++ ++ /* memcpy(decblock,data,iLBCdec_inst->blockl*sizeof(float));*/ ++ ++ memcpy(iLBCdec_inst->old_syntdenum, syntdenum, ++ ++ iLBCdec_inst->nsub*(LPC_FILTERORDER+1)*sizeof(float)); ++ ++ iLBCdec_inst->prev_enh_pl=0; ++ ++ ++ ++ if (mode==0) { /* PLC was used */ ++ iLBCdec_inst->prev_enh_pl=1; ++ } ++} ++ ++ +diff -druN codecs/ilbc.orig/iLBC_decode.h codecs/ilbc/iLBC_decode.h +--- codecs/ilbc.orig/iLBC_decode.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/iLBC_decode.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,40 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ iLBC_decode.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#ifndef __iLBC_ILBCDECODE_H ++#define __iLBC_ILBCDECODE_H ++ ++#include "iLBC_define.h" ++ ++short initDecode( /* (o) Number of decoded ++ samples */ ++ iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) Decoder instance */ ++ int mode, /* (i) frame size mode */ ++ int use_enhancer /* (i) 1 to use enhancer ++ 0 to run without ++ enhancer */ ++); ++ ++void iLBC_decode( ++ float *decblock, /* (o) decoded signal block */ ++ unsigned char *bytes, /* (i) encoded signal bits */ ++ iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) the decoder state ++ structure */ ++ int mode /* (i) 0: bad packet, PLC, ++ 1: normal */ ++); ++ ++ ++ ++#endif ++ ++ +diff -druN codecs/ilbc.orig/iLBC_define.h codecs/ilbc/iLBC_define.h +--- codecs/ilbc.orig/iLBC_define.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/iLBC_define.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,201 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ iLBC_define.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++#include <string.h> ++ ++#ifndef __iLBC_ILBCDEFINE_H ++#define __iLBC_ILBCDEFINE_H ++ ++/* general codec settings */ ++ ++#define FS (float)8000.0 ++#define BLOCKL_20MS 160 ++#define BLOCKL_30MS 240 ++#define BLOCKL_MAX 240 ++#define NSUB_20MS 4 ++#define NSUB_30MS 6 ++#define NSUB_MAX 6 ++#define NASUB_20MS 2 ++#define NASUB_30MS 4 ++#define NASUB_MAX 4 ++#define SUBL 40 ++#define STATE_LEN 80 ++#define STATE_SHORT_LEN_30MS 58 ++#define STATE_SHORT_LEN_20MS 57 ++ ++/* LPC settings */ ++ ++#define LPC_FILTERORDER 10 ++#define LPC_CHIRP_SYNTDENUM (float)0.9025 ++#define LPC_CHIRP_WEIGHTDENUM (float)0.4222 ++#define LPC_LOOKBACK 60 ++#define LPC_N_20MS 1 ++#define LPC_N_30MS 2 ++#define LPC_N_MAX 2 ++#define LPC_ASYMDIFF 20 ++#define LPC_BW (float)60.0 ++#define LPC_WN (float)1.0001 ++#define LSF_NSPLIT 3 ++ ++#define LSF_NUMBER_OF_STEPS 4 ++#define LPC_HALFORDER (LPC_FILTERORDER/2) ++ ++/* cb settings */ ++ ++#define CB_NSTAGES 3 ++#define CB_EXPAND 2 ++#define CB_MEML 147 ++#define CB_FILTERLEN 2*4 ++#define CB_HALFFILTERLEN 4 ++#define CB_RESRANGE 34 ++#define CB_MAXGAIN (float)1.3 ++ ++/* enhancer */ ++ ++#define ENH_BLOCKL 80 /* block length */ ++#define ENH_BLOCKL_HALF (ENH_BLOCKL/2) ++#define ENH_HL 3 /* 2*ENH_HL+1 is number blocks ++ in said second sequence */ ++#define ENH_SLOP 2 /* max difference estimated and ++ correct pitch period */ ++#define ENH_PLOCSL 20 /* pitch-estimates and pitch- ++ locations buffer length */ ++#define ENH_OVERHANG 2 ++#define ENH_UPS0 4 /* upsampling rate */ ++#define ENH_FL0 3 /* 2*FLO+1 is the length of ++ each filter */ ++#define ENH_VECTL (ENH_BLOCKL+2*ENH_FL0) ++#define ENH_CORRDIM (2*ENH_SLOP+1) ++#define ENH_NBLOCKS (BLOCKL_MAX/ENH_BLOCKL) ++#define ENH_NBLOCKS_EXTRA 5 ++#define ENH_NBLOCKS_TOT 8 /* ENH_NBLOCKS + ++ ENH_NBLOCKS_EXTRA */ ++#define ENH_BUFL (ENH_NBLOCKS_TOT)*ENH_BLOCKL ++#define ENH_ALPHA0 (float)0.05 ++ ++/* Down sampling */ ++ ++#define FILTERORDER_DS 7 ++#define DELAY_DS 3 ++#define FACTOR_DS 2 ++ ++/* bit stream defs */ ++ ++#define NO_OF_BYTES_20MS 38 ++#define NO_OF_BYTES_30MS 50 ++#define NO_OF_WORDS_20MS 19 ++#define NO_OF_WORDS_30MS 25 ++#define STATE_BITS 3 ++#define BYTE_LEN 8 ++#define ULP_CLASSES 3 ++ ++/* help parameters */ ++ ++ ++#define FLOAT_MAX (float)1.0e37 ++#define EPS (float)2.220446049250313e-016 ++#define PI (float)3.14159265358979323846 ++#define MIN_SAMPLE -32768 ++#define MAX_SAMPLE 32767 ++#define TWO_PI (float)6.283185307 ++#define PI2 (float)0.159154943 ++ ++/* type definition encoder instance */ ++typedef struct iLBC_ULP_Inst_t_ { ++ int lsf_bits[6][ULP_CLASSES+2]; ++ int start_bits[ULP_CLASSES+2]; ++ int startfirst_bits[ULP_CLASSES+2]; ++ int scale_bits[ULP_CLASSES+2]; ++ int state_bits[ULP_CLASSES+2]; ++ int extra_cb_index[CB_NSTAGES][ULP_CLASSES+2]; ++ int extra_cb_gain[CB_NSTAGES][ULP_CLASSES+2]; ++ int cb_index[NSUB_MAX][CB_NSTAGES][ULP_CLASSES+2]; ++ int cb_gain[NSUB_MAX][CB_NSTAGES][ULP_CLASSES+2]; ++} iLBC_ULP_Inst_t; ++ ++/* type definition encoder instance */ ++typedef struct iLBC_Enc_Inst_t_ { ++ ++ /* flag for frame size mode */ ++ int mode; ++ ++ /* basic parameters for different frame sizes */ ++ int blockl; ++ int nsub; ++ int nasub; ++ int no_of_bytes, no_of_words; ++ int lpc_n; ++ int state_short_len; ++ const iLBC_ULP_Inst_t *ULP_inst; ++ ++ /* analysis filter state */ ++ float anaMem[LPC_FILTERORDER]; ++ ++ /* old lsf parameters for interpolation */ ++ float lsfold[LPC_FILTERORDER]; ++ float lsfdeqold[LPC_FILTERORDER]; ++ ++ /* signal buffer for LP analysis */ ++ float lpc_buffer[LPC_LOOKBACK + BLOCKL_MAX]; ++ ++ /* state of input HP filter */ ++ float hpimem[4]; ++ ++} iLBC_Enc_Inst_t; ++ ++/* type definition decoder instance */ ++typedef struct iLBC_Dec_Inst_t_ { ++ ++ ++ /* flag for frame size mode */ ++ int mode; ++ ++ /* basic parameters for different frame sizes */ ++ int blockl; ++ int nsub; ++ int nasub; ++ int no_of_bytes, no_of_words; ++ int lpc_n; ++ int state_short_len; ++ const iLBC_ULP_Inst_t *ULP_inst; ++ ++ /* synthesis filter state */ ++ float syntMem[LPC_FILTERORDER]; ++ ++ /* old LSF for interpolation */ ++ float lsfdeqold[LPC_FILTERORDER]; ++ ++ /* pitch lag estimated in enhancer and used in PLC */ ++ int last_lag; ++ ++ /* PLC state information */ ++ int prevLag, consPLICount, prevPLI, prev_enh_pl; ++ float prevLpc[LPC_FILTERORDER+1]; ++ float prevResidual[NSUB_MAX*SUBL]; ++ float per; ++ unsigned long seed; ++ ++ /* previous synthesis filter parameters */ ++ float old_syntdenum[(LPC_FILTERORDER + 1)*NSUB_MAX]; ++ ++ /* state of output HP filter */ ++ float hpomem[4]; ++ ++ /* enhancer state information */ ++ int use_enhancer; ++ float enh_buf[ENH_BUFL]; ++ float enh_period[ENH_NBLOCKS_TOT]; ++ ++} iLBC_Dec_Inst_t; ++ ++#endif ++ ++ +diff -druN codecs/ilbc.orig/iLBC_encode.c codecs/ilbc/iLBC_encode.c +--- codecs/ilbc.orig/iLBC_encode.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/iLBC_encode.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,514 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ iLBC_encode.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#include <math.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#include "iLBC_define.h" ++#include "iLBC_encode.h" ++#include "LPCencode.h" ++#include "FrameClassify.h" ++#include "StateSearchW.h" ++#include "StateConstructW.h" ++#include "helpfun.h" ++#include "constants.h" ++#include "packing.h" ++#include "iCBSearch.h" ++#include "iCBConstruct.h" ++#include "hpInput.h" ++#include "anaFilter.h" ++#include "syntFilter.h" ++ ++/*----------------------------------------------------------------* ++ * Initiation of encoder instance. ++ *---------------------------------------------------------------*/ ++ ++short initEncode( /* (o) Number of bytes ++ encoded */ ++ iLBC_Enc_Inst_t *iLBCenc_inst, /* (i/o) Encoder instance */ ++ int mode /* (i) frame size mode */ ++){ ++ iLBCenc_inst->mode = mode; ++ if (mode==30) { ++ iLBCenc_inst->blockl = BLOCKL_30MS; ++ iLBCenc_inst->nsub = NSUB_30MS; ++ ++ ++ iLBCenc_inst->nasub = NASUB_30MS; ++ iLBCenc_inst->lpc_n = LPC_N_30MS; ++ iLBCenc_inst->no_of_bytes = NO_OF_BYTES_30MS; ++ iLBCenc_inst->no_of_words = NO_OF_WORDS_30MS; ++ iLBCenc_inst->state_short_len=STATE_SHORT_LEN_30MS; ++ /* ULP init */ ++ iLBCenc_inst->ULP_inst=&ULP_30msTbl; ++ } ++ else if (mode==20) { ++ iLBCenc_inst->blockl = BLOCKL_20MS; ++ iLBCenc_inst->nsub = NSUB_20MS; ++ iLBCenc_inst->nasub = NASUB_20MS; ++ iLBCenc_inst->lpc_n = LPC_N_20MS; ++ iLBCenc_inst->no_of_bytes = NO_OF_BYTES_20MS; ++ iLBCenc_inst->no_of_words = NO_OF_WORDS_20MS; ++ iLBCenc_inst->state_short_len=STATE_SHORT_LEN_20MS; ++ /* ULP init */ ++ iLBCenc_inst->ULP_inst=&ULP_20msTbl; ++ } ++ else { ++ exit(2); ++ } ++ ++ memset((*iLBCenc_inst).anaMem, 0, ++ LPC_FILTERORDER*sizeof(float)); ++ memcpy((*iLBCenc_inst).lsfold, lsfmeanTbl, ++ LPC_FILTERORDER*sizeof(float)); ++ memcpy((*iLBCenc_inst).lsfdeqold, lsfmeanTbl, ++ LPC_FILTERORDER*sizeof(float)); ++ memset((*iLBCenc_inst).lpc_buffer, 0, ++ (LPC_LOOKBACK+BLOCKL_MAX)*sizeof(float)); ++ memset((*iLBCenc_inst).hpimem, 0, 4*sizeof(float)); ++ ++ return (iLBCenc_inst->no_of_bytes); ++} ++ ++/*----------------------------------------------------------------* ++ * main encoder function ++ *---------------------------------------------------------------*/ ++ ++void iLBC_encode( ++ unsigned char *bytes, /* (o) encoded data bits iLBC */ ++ float *block, /* (o) speech vector to ++ encode */ ++ iLBC_Enc_Inst_t *iLBCenc_inst /* (i/o) the general encoder ++ state */ ++){ ++ ++ float data[BLOCKL_MAX]; ++ float residual[BLOCKL_MAX], reverseResidual[BLOCKL_MAX]; ++ ++ int start, idxForMax, idxVec[STATE_LEN]; ++ float reverseDecresidual[BLOCKL_MAX], mem[CB_MEML]; ++ int n, k, meml_gotten, Nfor, Nback, i, pos; ++ ++ ++ int gain_index[CB_NSTAGES*NASUB_MAX], ++ extra_gain_index[CB_NSTAGES]; ++ int cb_index[CB_NSTAGES*NASUB_MAX],extra_cb_index[CB_NSTAGES]; ++ int lsf_i[LSF_NSPLIT*LPC_N_MAX]; ++ unsigned char *pbytes; ++ int diff, start_pos, state_first; ++ float en1, en2; ++ int index, ulp, firstpart; ++ int subcount, subframe; ++ float weightState[LPC_FILTERORDER]; ++ float syntdenum[NSUB_MAX*(LPC_FILTERORDER+1)]; ++ float weightdenum[NSUB_MAX*(LPC_FILTERORDER+1)]; ++ float decresidual[BLOCKL_MAX]; ++ ++ /* high pass filtering of input signal if such is not done ++ prior to calling this function */ ++ ++ hpInput(block, iLBCenc_inst->blockl, ++ data, (*iLBCenc_inst).hpimem); ++ ++ /* otherwise simply copy */ ++ ++ /*memcpy(data,block,iLBCenc_inst->blockl*sizeof(float));*/ ++ ++ /* LPC of hp filtered input data */ ++ ++ LPCencode(syntdenum, weightdenum, lsf_i, data, iLBCenc_inst); ++ ++ ++ /* inverse filter to get residual */ ++ ++ for (n=0; n<iLBCenc_inst->nsub; n++) { ++ anaFilter(&data[n*SUBL], &syntdenum[n*(LPC_FILTERORDER+1)], ++ SUBL, &residual[n*SUBL], iLBCenc_inst->anaMem); ++ } ++ ++ /* find state location */ ++ ++ start = FrameClassify(iLBCenc_inst, residual); ++ ++ /* check if state should be in first or last part of the ++ two subframes */ ++ ++ diff = STATE_LEN - iLBCenc_inst->state_short_len; ++ en1 = 0; ++ index = (start-1)*SUBL; ++ for (i = 0; i < iLBCenc_inst->state_short_len; i++) { ++ en1 += residual[index+i]*residual[index+i]; ++ } ++ en2 = 0; ++ index = (start-1)*SUBL+diff; ++ for (i = 0; i < iLBCenc_inst->state_short_len; i++) { ++ en2 += residual[index+i]*residual[index+i]; ++ } ++ ++ ++ ++ ++ if (en1 > en2) { ++ state_first = 1; ++ start_pos = (start-1)*SUBL; ++ } else { ++ state_first = 0; ++ start_pos = (start-1)*SUBL + diff; ++ } ++ ++ /* scalar quantization of state */ ++ ++ StateSearchW(iLBCenc_inst, &residual[start_pos], ++ &syntdenum[(start-1)*(LPC_FILTERORDER+1)], ++ &weightdenum[(start-1)*(LPC_FILTERORDER+1)], &idxForMax, ++ idxVec, iLBCenc_inst->state_short_len, state_first); ++ ++ StateConstructW(idxForMax, idxVec, ++ &syntdenum[(start-1)*(LPC_FILTERORDER+1)], ++ &decresidual[start_pos], iLBCenc_inst->state_short_len); ++ ++ /* predictive quantization in state */ ++ ++ if (state_first) { /* put adaptive part in the end */ ++ ++ /* setup memory */ ++ ++ memset(mem, 0, ++ (CB_MEML-iLBCenc_inst->state_short_len)*sizeof(float)); ++ memcpy(mem+CB_MEML-iLBCenc_inst->state_short_len, ++ decresidual+start_pos, ++ iLBCenc_inst->state_short_len*sizeof(float)); ++ memset(weightState, 0, LPC_FILTERORDER*sizeof(float)); ++ ++ /* encode sub-frames */ ++ ++ iCBSearch(iLBCenc_inst, extra_cb_index, extra_gain_index, ++ &residual[start_pos+iLBCenc_inst->state_short_len], ++ mem+CB_MEML-stMemLTbl, ++ stMemLTbl, diff, CB_NSTAGES, ++ &weightdenum[start*(LPC_FILTERORDER+1)], ++ weightState, 0); ++ ++ /* construct decoded vector */ ++ ++ iCBConstruct( ++ &decresidual[start_pos+iLBCenc_inst->state_short_len], ++ extra_cb_index, extra_gain_index, ++ mem+CB_MEML-stMemLTbl, ++ stMemLTbl, diff, CB_NSTAGES); ++ ++ } ++ else { /* put adaptive part in the beginning */ ++ ++ ++ ++ /* create reversed vectors for prediction */ ++ ++ for (k=0; k<diff; k++) { ++ reverseResidual[k] = residual[(start+1)*SUBL-1 ++ -(k+iLBCenc_inst->state_short_len)]; ++ } ++ ++ /* setup memory */ ++ ++ meml_gotten = iLBCenc_inst->state_short_len; ++ for (k=0; k<meml_gotten; k++) { ++ mem[CB_MEML-1-k] = decresidual[start_pos + k]; ++ } ++ memset(mem, 0, (CB_MEML-k)*sizeof(float)); ++ memset(weightState, 0, LPC_FILTERORDER*sizeof(float)); ++ ++ /* encode sub-frames */ ++ ++ iCBSearch(iLBCenc_inst, extra_cb_index, extra_gain_index, ++ reverseResidual, mem+CB_MEML-stMemLTbl, stMemLTbl, ++ diff, CB_NSTAGES, ++ &weightdenum[(start-1)*(LPC_FILTERORDER+1)], ++ weightState, 0); ++ ++ /* construct decoded vector */ ++ ++ iCBConstruct(reverseDecresidual, extra_cb_index, ++ extra_gain_index, mem+CB_MEML-stMemLTbl, stMemLTbl, ++ diff, CB_NSTAGES); ++ ++ /* get decoded residual from reversed vector */ ++ ++ for (k=0; k<diff; k++) { ++ decresidual[start_pos-1-k] = reverseDecresidual[k]; ++ } ++ } ++ ++ /* counter for predicted sub-frames */ ++ ++ subcount=0; ++ ++ /* forward prediction of sub-frames */ ++ ++ Nfor = iLBCenc_inst->nsub-start-1; ++ ++ ++ if ( Nfor > 0 ) { ++ ++ /* setup memory */ ++ ++ memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float)); ++ memcpy(mem+CB_MEML-STATE_LEN, decresidual+(start-1)*SUBL, ++ STATE_LEN*sizeof(float)); ++ memset(weightState, 0, LPC_FILTERORDER*sizeof(float)); ++ ++ ++ ++ /* loop over sub-frames to encode */ ++ ++ for (subframe=0; subframe<Nfor; subframe++) { ++ ++ /* encode sub-frame */ ++ ++ iCBSearch(iLBCenc_inst, cb_index+subcount*CB_NSTAGES, ++ gain_index+subcount*CB_NSTAGES, ++ &residual[(start+1+subframe)*SUBL], ++ mem+CB_MEML-memLfTbl[subcount], ++ memLfTbl[subcount], SUBL, CB_NSTAGES, ++ &weightdenum[(start+1+subframe)* ++ (LPC_FILTERORDER+1)], ++ weightState, subcount+1); ++ ++ /* construct decoded vector */ ++ ++ iCBConstruct(&decresidual[(start+1+subframe)*SUBL], ++ cb_index+subcount*CB_NSTAGES, ++ gain_index+subcount*CB_NSTAGES, ++ mem+CB_MEML-memLfTbl[subcount], ++ memLfTbl[subcount], SUBL, CB_NSTAGES); ++ ++ /* update memory */ ++ ++ memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float)); ++ memcpy(mem+CB_MEML-SUBL, ++ &decresidual[(start+1+subframe)*SUBL], ++ SUBL*sizeof(float)); ++ memset(weightState, 0, LPC_FILTERORDER*sizeof(float)); ++ ++ subcount++; ++ } ++ } ++ ++ ++ /* backward prediction of sub-frames */ ++ ++ Nback = start-1; ++ ++ ++ if ( Nback > 0 ) { ++ ++ /* create reverse order vectors */ ++ ++ for (n=0; n<Nback; n++) { ++ for (k=0; k<SUBL; k++) { ++ reverseResidual[n*SUBL+k] = ++ residual[(start-1)*SUBL-1-n*SUBL-k]; ++ reverseDecresidual[n*SUBL+k] = ++ decresidual[(start-1)*SUBL-1-n*SUBL-k]; ++ } ++ } ++ ++ ++ ++ /* setup memory */ ++ ++ meml_gotten = SUBL*(iLBCenc_inst->nsub+1-start); ++ ++ ++ if ( meml_gotten > CB_MEML ) { ++ meml_gotten=CB_MEML; ++ } ++ for (k=0; k<meml_gotten; k++) { ++ mem[CB_MEML-1-k] = decresidual[(start-1)*SUBL + k]; ++ } ++ memset(mem, 0, (CB_MEML-k)*sizeof(float)); ++ memset(weightState, 0, LPC_FILTERORDER*sizeof(float)); ++ ++ /* loop over sub-frames to encode */ ++ ++ for (subframe=0; subframe<Nback; subframe++) { ++ ++ /* encode sub-frame */ ++ ++ iCBSearch(iLBCenc_inst, cb_index+subcount*CB_NSTAGES, ++ gain_index+subcount*CB_NSTAGES, ++ &reverseResidual[subframe*SUBL], ++ mem+CB_MEML-memLfTbl[subcount], ++ memLfTbl[subcount], SUBL, CB_NSTAGES, ++ &weightdenum[(start-2-subframe)* ++ (LPC_FILTERORDER+1)], ++ weightState, subcount+1); ++ ++ /* construct decoded vector */ ++ ++ iCBConstruct(&reverseDecresidual[subframe*SUBL], ++ cb_index+subcount*CB_NSTAGES, ++ gain_index+subcount*CB_NSTAGES, ++ mem+CB_MEML-memLfTbl[subcount], ++ memLfTbl[subcount], SUBL, CB_NSTAGES); ++ ++ /* update memory */ ++ ++ memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float)); ++ memcpy(mem+CB_MEML-SUBL, ++ &reverseDecresidual[subframe*SUBL], ++ SUBL*sizeof(float)); ++ memset(weightState, 0, LPC_FILTERORDER*sizeof(float)); ++ ++ subcount++; ++ ++ } ++ ++ /* get decoded residual from reversed vector */ ++ ++ for (i=0; i<SUBL*Nback; i++) { ++ decresidual[SUBL*Nback - i - 1] = ++ ++ ++ reverseDecresidual[i]; ++ } ++ } ++ /* end encoding part */ ++ ++ /* adjust index */ ++ index_conv_enc(cb_index); ++ ++ /* pack bytes */ ++ ++ pbytes=bytes; ++ pos=0; ++ ++ /* loop over the 3 ULP classes */ ++ ++ for (ulp=0; ulp<3; ulp++) { ++ ++ /* LSF */ ++ for (k=0; k<LSF_NSPLIT*iLBCenc_inst->lpc_n; k++) { ++ packsplit(&lsf_i[k], &firstpart, &lsf_i[k], ++ iLBCenc_inst->ULP_inst->lsf_bits[k][ulp], ++ iLBCenc_inst->ULP_inst->lsf_bits[k][ulp]+ ++ iLBCenc_inst->ULP_inst->lsf_bits[k][ulp+1]+ ++ iLBCenc_inst->ULP_inst->lsf_bits[k][ulp+2]); ++ dopack( &pbytes, firstpart, ++ iLBCenc_inst->ULP_inst->lsf_bits[k][ulp], &pos); ++ } ++ ++ /* Start block info */ ++ ++ packsplit(&start, &firstpart, &start, ++ iLBCenc_inst->ULP_inst->start_bits[ulp], ++ iLBCenc_inst->ULP_inst->start_bits[ulp]+ ++ iLBCenc_inst->ULP_inst->start_bits[ulp+1]+ ++ iLBCenc_inst->ULP_inst->start_bits[ulp+2]); ++ dopack( &pbytes, firstpart, ++ iLBCenc_inst->ULP_inst->start_bits[ulp], &pos); ++ ++ packsplit(&state_first, &firstpart, &state_first, ++ iLBCenc_inst->ULP_inst->startfirst_bits[ulp], ++ iLBCenc_inst->ULP_inst->startfirst_bits[ulp]+ ++ iLBCenc_inst->ULP_inst->startfirst_bits[ulp+1]+ ++ iLBCenc_inst->ULP_inst->startfirst_bits[ulp+2]); ++ dopack( &pbytes, firstpart, ++ iLBCenc_inst->ULP_inst->startfirst_bits[ulp], &pos); ++ ++ packsplit(&idxForMax, &firstpart, &idxForMax, ++ iLBCenc_inst->ULP_inst->scale_bits[ulp], ++ iLBCenc_inst->ULP_inst->scale_bits[ulp]+ ++ iLBCenc_inst->ULP_inst->scale_bits[ulp+1]+ ++ iLBCenc_inst->ULP_inst->scale_bits[ulp+2]); ++ dopack( &pbytes, firstpart, ++ iLBCenc_inst->ULP_inst->scale_bits[ulp], &pos); ++ ++ ++ ++ for (k=0; k<iLBCenc_inst->state_short_len; k++) { ++ packsplit(idxVec+k, &firstpart, idxVec+k, ++ iLBCenc_inst->ULP_inst->state_bits[ulp], ++ iLBCenc_inst->ULP_inst->state_bits[ulp]+ ++ iLBCenc_inst->ULP_inst->state_bits[ulp+1]+ ++ iLBCenc_inst->ULP_inst->state_bits[ulp+2]); ++ dopack( &pbytes, firstpart, ++ iLBCenc_inst->ULP_inst->state_bits[ulp], &pos); ++ } ++ ++ /* 23/22 (20ms/30ms) sample block */ ++ ++ for (k=0;k<CB_NSTAGES;k++) { ++ packsplit(extra_cb_index+k, &firstpart, ++ extra_cb_index+k, ++ iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp], ++ iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp]+ ++ iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp+1]+ ++ iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp+2]); ++ dopack( &pbytes, firstpart, ++ iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp], ++ &pos); ++ } ++ ++ for (k=0;k<CB_NSTAGES;k++) { ++ packsplit(extra_gain_index+k, &firstpart, ++ extra_gain_index+k, ++ iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp], ++ iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp]+ ++ iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp+1]+ ++ iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp+2]); ++ dopack( &pbytes, firstpart, ++ iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp], ++ &pos); ++ } ++ ++ /* The two/four (20ms/30ms) 40 sample sub-blocks */ ++ ++ for (i=0; i<iLBCenc_inst->nasub; i++) { ++ for (k=0; k<CB_NSTAGES; k++) { ++ packsplit(cb_index+i*CB_NSTAGES+k, &firstpart, ++ cb_index+i*CB_NSTAGES+k, ++ iLBCenc_inst->ULP_inst->cb_index[i][k][ulp], ++ iLBCenc_inst->ULP_inst->cb_index[i][k][ulp]+ ++ iLBCenc_inst->ULP_inst->cb_index[i][k][ulp+1]+ ++ iLBCenc_inst->ULP_inst->cb_index[i][k][ulp+2]); ++ dopack( &pbytes, firstpart, ++ iLBCenc_inst->ULP_inst->cb_index[i][k][ulp], ++ &pos); ++ } ++ } ++ ++ for (i=0; i<iLBCenc_inst->nasub; i++) { ++ for (k=0; k<CB_NSTAGES; k++) { ++ ++ ++ packsplit(gain_index+i*CB_NSTAGES+k, &firstpart, ++ gain_index+i*CB_NSTAGES+k, ++ iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp], ++ iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp]+ ++ iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp+1]+ ++ iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp+2]); ++ dopack( &pbytes, firstpart, ++ iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp], ++ &pos); ++ } ++ } ++ } ++ ++ /* set the last bit to zero (otherwise the decoder ++ will treat it as a lost frame) */ ++ dopack( &pbytes, 0, 1, &pos); ++} ++ ++ ++ +diff -druN codecs/ilbc.orig/iLBC_encode.h codecs/ilbc/iLBC_encode.h +--- codecs/ilbc.orig/iLBC_encode.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/iLBC_encode.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,37 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ iLBC_encode.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#ifndef __iLBC_ILBCENCODE_H ++#define __iLBC_ILBCENCODE_H ++ ++#include "iLBC_define.h" ++ ++short initEncode( /* (o) Number of bytes ++ encoded */ ++ iLBC_Enc_Inst_t *iLBCenc_inst, /* (i/o) Encoder instance */ ++ int mode /* (i) frame size mode */ ++); ++ ++void iLBC_encode( ++ ++ ++ unsigned char *bytes, /* (o) encoded data bits iLBC */ ++ float *block, /* (o) speech vector to ++ encode */ ++ iLBC_Enc_Inst_t *iLBCenc_inst /* (i/o) the general encoder ++ state */ ++); ++ ++#endif ++ ++ ++ +Files codecs/ilbc.orig/libilbc.a and codecs/ilbc/libilbc.a differ +diff -druN codecs/ilbc.orig/libilbc.vcproj codecs/ilbc/libilbc.vcproj +--- codecs/ilbc.orig/libilbc.vcproj 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/libilbc.vcproj 2006-03-20 13:25:50.000000000 -0800 +@@ -0,0 +1,353 @@ ++<?xml version="1.0" encoding="Windows-1252"?> ++<VisualStudioProject ++ ProjectType="Visual C++" ++ Version="8.00" ++ Name="libilbc" ++ ProjectGUID="{989BB874-7AF1-44CB-8E5C-CC8113D267E8}" ++ RootNamespace="libilbc" ++ Keyword="Win32Proj" ++ > ++ <Platforms> ++ <Platform ++ Name="Win32" ++ /> ++ </Platforms> ++ <ToolFiles> ++ </ToolFiles> ++ <Configurations> ++ <Configuration ++ Name="Debug|Win32" ++ OutputDirectory="$(SolutionDir)$(ConfigurationName)" ++ IntermediateDirectory="$(ConfigurationName)" ++ ConfigurationType="4" ++ CharacterSet="1" ++ > ++ <Tool ++ Name="VCPreBuildEventTool" ++ /> ++ <Tool ++ Name="VCCustomBuildTool" ++ /> ++ <Tool ++ Name="VCXMLDataGeneratorTool" ++ /> ++ <Tool ++ Name="VCWebServiceProxyGeneratorTool" ++ /> ++ <Tool ++ Name="VCMIDLTool" ++ /> ++ <Tool ++ Name="VCCLCompilerTool" ++ Optimization="0" ++ PreprocessorDefinitions="WIN32;_DEBUG;_LIB" ++ MinimalRebuild="true" ++ BasicRuntimeChecks="3" ++ RuntimeLibrary="3" ++ UsePrecompiledHeader="0" ++ WarningLevel="3" ++ Detect64BitPortabilityProblems="true" ++ DebugInformationFormat="4" ++ /> ++ <Tool ++ Name="VCManagedResourceCompilerTool" ++ /> ++ <Tool ++ Name="VCResourceCompilerTool" ++ /> ++ <Tool ++ Name="VCPreLinkEventTool" ++ /> ++ <Tool ++ Name="VCLibrarianTool" ++ /> ++ <Tool ++ Name="VCALinkTool" ++ /> ++ <Tool ++ Name="VCXDCMakeTool" ++ /> ++ <Tool ++ Name="VCBscMakeTool" ++ /> ++ <Tool ++ Name="VCFxCopTool" ++ /> ++ <Tool ++ Name="VCPostBuildEventTool" ++ /> ++ </Configuration> ++ <Configuration ++ Name="Release|Win32" ++ OutputDirectory="$(SolutionDir)$(ConfigurationName)" ++ IntermediateDirectory="$(ConfigurationName)" ++ ConfigurationType="4" ++ CharacterSet="1" ++ WholeProgramOptimization="1" ++ > ++ <Tool ++ Name="VCPreBuildEventTool" ++ /> ++ <Tool ++ Name="VCCustomBuildTool" ++ /> ++ <Tool ++ Name="VCXMLDataGeneratorTool" ++ /> ++ <Tool ++ Name="VCWebServiceProxyGeneratorTool" ++ /> ++ <Tool ++ Name="VCMIDLTool" ++ /> ++ <Tool ++ Name="VCCLCompilerTool" ++ PreprocessorDefinitions="WIN32;NDEBUG;_LIB" ++ RuntimeLibrary="2" ++ UsePrecompiledHeader="0" ++ WarningLevel="3" ++ Detect64BitPortabilityProblems="true" ++ DebugInformationFormat="3" ++ /> ++ <Tool ++ Name="VCManagedResourceCompilerTool" ++ /> ++ <Tool ++ Name="VCResourceCompilerTool" ++ /> ++ <Tool ++ Name="VCPreLinkEventTool" ++ /> ++ <Tool ++ Name="VCLibrarianTool" ++ /> ++ <Tool ++ Name="VCALinkTool" ++ /> ++ <Tool ++ Name="VCXDCMakeTool" ++ /> ++ <Tool ++ Name="VCBscMakeTool" ++ /> ++ <Tool ++ Name="VCFxCopTool" ++ /> ++ <Tool ++ Name="VCPostBuildEventTool" ++ /> ++ </Configuration> ++ </Configurations> ++ <References> ++ </References> ++ <Files> ++ <Filter ++ Name="Source Files" ++ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" ++ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" ++ > ++ <File ++ RelativePath=".\anaFilter.c" ++ > ++ </File> ++ <File ++ RelativePath=".\constants.c" ++ > ++ </File> ++ <File ++ RelativePath=".\createCB.c" ++ > ++ </File> ++ <File ++ RelativePath=".\doCPLC.c" ++ > ++ </File> ++ <File ++ RelativePath=".\enhancer.c" ++ > ++ </File> ++ <File ++ RelativePath=".\filter.c" ++ > ++ </File> ++ <File ++ RelativePath=".\FrameClassify.c" ++ > ++ </File> ++ <File ++ RelativePath=".\gainquant.c" ++ > ++ </File> ++ <File ++ RelativePath=".\getCBvec.c" ++ > ++ </File> ++ <File ++ RelativePath=".\helpfun.c" ++ > ++ </File> ++ <File ++ RelativePath=".\hpInput.c" ++ > ++ </File> ++ <File ++ RelativePath=".\hpOutput.c" ++ > ++ </File> ++ <File ++ RelativePath=".\iCBConstruct.c" ++ > ++ </File> ++ <File ++ RelativePath=".\iCBSearch.c" ++ > ++ </File> ++ <File ++ RelativePath=".\iLBC_decode.c" ++ > ++ </File> ++ <File ++ RelativePath=".\iLBC_encode.c" ++ > ++ </File> ++ <File ++ RelativePath=".\LPCdecode.c" ++ > ++ </File> ++ <File ++ RelativePath=".\LPCencode.c" ++ > ++ </File> ++ <File ++ RelativePath=".\lsf.c" ++ > ++ </File> ++ <File ++ RelativePath=".\packing.c" ++ > ++ </File> ++ <File ++ RelativePath=".\StateConstructW.c" ++ > ++ </File> ++ <File ++ RelativePath=".\StateSearchW.c" ++ > ++ </File> ++ <File ++ RelativePath=".\syntFilter.c" ++ > ++ </File> ++ </Filter> ++ <Filter ++ Name="Header Files" ++ Filter="h;hpp;hxx;hm;inl;inc;xsd" ++ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" ++ > ++ <File ++ RelativePath=".\anaFilter.h" ++ > ++ </File> ++ <File ++ RelativePath=".\constants.h" ++ > ++ </File> ++ <File ++ RelativePath=".\createCB.h" ++ > ++ </File> ++ <File ++ RelativePath=".\doCPLC.h" ++ > ++ </File> ++ <File ++ RelativePath=".\enhancer.h" ++ > ++ </File> ++ <File ++ RelativePath=".\filter.h" ++ > ++ </File> ++ <File ++ RelativePath=".\FrameClassify.h" ++ > ++ </File> ++ <File ++ RelativePath=".\gainquant.h" ++ > ++ </File> ++ <File ++ RelativePath=".\getCBvec.h" ++ > ++ </File> ++ <File ++ RelativePath=".\helpfun.h" ++ > ++ </File> ++ <File ++ RelativePath=".\hpInput.h" ++ > ++ </File> ++ <File ++ RelativePath=".\hpOutput.h" ++ > ++ </File> ++ <File ++ RelativePath=".\iCBConstruct.h" ++ > ++ </File> ++ <File ++ RelativePath=".\iCBSearch.h" ++ > ++ </File> ++ <File ++ RelativePath=".\iLBC_decode.h" ++ > ++ </File> ++ <File ++ RelativePath=".\iLBC_define.h" ++ > ++ </File> ++ <File ++ RelativePath=".\iLBC_encode.h" ++ > ++ </File> ++ <File ++ RelativePath=".\LPCdecode.h" ++ > ++ </File> ++ <File ++ RelativePath=".\LPCencode.h" ++ > ++ </File> ++ <File ++ RelativePath=".\lsf.h" ++ > ++ </File> ++ <File ++ RelativePath=".\packing.h" ++ > ++ </File> ++ <File ++ RelativePath=".\StateConstructW.h" ++ > ++ </File> ++ <File ++ RelativePath=".\StateSearchW.h" ++ > ++ </File> ++ <File ++ RelativePath=".\syntFilter.h" ++ > ++ </File> ++ </Filter> ++ <Filter ++ Name="Resource Files" ++ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" ++ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" ++ > ++ </Filter> ++ </Files> ++ <Globals> ++ </Globals> ++</VisualStudioProject> +diff -druN codecs/ilbc.orig/lsf.c codecs/ilbc/lsf.c +--- codecs/ilbc.orig/lsf.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/lsf.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,264 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ lsf.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#include <string.h> ++#include <math.h> ++ ++#include "iLBC_define.h" ++#include "lsf.h" ++ ++/*----------------------------------------------------------------* ++ * conversion from lpc coefficients to lsf coefficients ++ *---------------------------------------------------------------*/ ++ ++void a2lsf( ++ float *freq,/* (o) lsf coefficients */ ++ float *a /* (i) lpc coefficients */ ++){ ++ float steps[LSF_NUMBER_OF_STEPS] = ++ {(float)0.00635, (float)0.003175, (float)0.0015875, ++ (float)0.00079375}; ++ float step; ++ int step_idx; ++ int lsp_index; ++ float p[LPC_HALFORDER]; ++ float q[LPC_HALFORDER]; ++ float p_pre[LPC_HALFORDER]; ++ ++ ++ float q_pre[LPC_HALFORDER]; ++ float old_p, old_q, *old; ++ float *pq_coef; ++ float omega, old_omega; ++ int i; ++ float hlp, hlp1, hlp2, hlp3, hlp4, hlp5; ++ ++ for (i=0; i<LPC_HALFORDER; i++) { ++ p[i] = (float)-1.0 * (a[i + 1] + a[LPC_FILTERORDER - i]); ++ q[i] = a[LPC_FILTERORDER - i] - a[i + 1]; ++ } ++ ++ p_pre[0] = (float)-1.0 - p[0]; ++ p_pre[1] = - p_pre[0] - p[1]; ++ p_pre[2] = - p_pre[1] - p[2]; ++ p_pre[3] = - p_pre[2] - p[3]; ++ p_pre[4] = - p_pre[3] - p[4]; ++ p_pre[4] = p_pre[4] / 2; ++ ++ q_pre[0] = (float)1.0 - q[0]; ++ q_pre[1] = q_pre[0] - q[1]; ++ q_pre[2] = q_pre[1] - q[2]; ++ q_pre[3] = q_pre[2] - q[3]; ++ q_pre[4] = q_pre[3] - q[4]; ++ q_pre[4] = q_pre[4] / 2; ++ ++ omega = 0.0; ++ old_omega = 0.0; ++ ++ old_p = FLOAT_MAX; ++ old_q = FLOAT_MAX; ++ ++ /* Here we loop through lsp_index to find all the ++ LPC_FILTERORDER roots for omega. */ ++ ++ for (lsp_index = 0; lsp_index<LPC_FILTERORDER; lsp_index++) { ++ ++ /* Depending on lsp_index being even or odd, we ++ alternatively solve the roots for the two LSP equations. */ ++ ++ ++ if ((lsp_index & 0x1) == 0) { ++ pq_coef = p_pre; ++ old = &old_p; ++ } else { ++ pq_coef = q_pre; ++ old = &old_q; ++ } ++ ++ /* Start with low resolution grid */ ++ ++ for (step_idx = 0, step = steps[step_idx]; ++ step_idx < LSF_NUMBER_OF_STEPS;){ ++ ++ ++ ++ /* cos(10piw) + pq(0)cos(8piw) + pq(1)cos(6piw) + ++ pq(2)cos(4piw) + pq(3)cod(2piw) + pq(4) */ ++ ++ hlp = (float)cos(omega * TWO_PI); ++ hlp1 = (float)2.0 * hlp + pq_coef[0]; ++ hlp2 = (float)2.0 * hlp * hlp1 - (float)1.0 + ++ pq_coef[1]; ++ hlp3 = (float)2.0 * hlp * hlp2 - hlp1 + pq_coef[2]; ++ hlp4 = (float)2.0 * hlp * hlp3 - hlp2 + pq_coef[3]; ++ hlp5 = hlp * hlp4 - hlp3 + pq_coef[4]; ++ ++ ++ if (((hlp5 * (*old)) <= 0.0) || (omega >= 0.5)){ ++ ++ if (step_idx == (LSF_NUMBER_OF_STEPS - 1)){ ++ ++ if (fabs(hlp5) >= fabs(*old)) { ++ freq[lsp_index] = omega - step; ++ } else { ++ freq[lsp_index] = omega; ++ } ++ ++ ++ if ((*old) >= 0.0){ ++ *old = (float)-1.0 * FLOAT_MAX; ++ } else { ++ *old = FLOAT_MAX; ++ } ++ ++ omega = old_omega; ++ step_idx = 0; ++ ++ step_idx = LSF_NUMBER_OF_STEPS; ++ } else { ++ ++ if (step_idx == 0) { ++ old_omega = omega; ++ } ++ ++ step_idx++; ++ omega -= steps[step_idx]; ++ ++ /* Go back one grid step */ ++ ++ step = steps[step_idx]; ++ } ++ } else { ++ ++ /* increment omega until they are of different sign, ++ and we know there is at least one root between omega ++ and old_omega */ ++ *old = hlp5; ++ omega += step; ++ } ++ ++ ++ } ++ } ++ ++ for (i = 0; i<LPC_FILTERORDER; i++) { ++ freq[i] = freq[i] * TWO_PI; ++ } ++} ++ ++/*----------------------------------------------------------------* ++ * conversion from lsf coefficients to lpc coefficients ++ *---------------------------------------------------------------*/ ++ ++void lsf2a( ++ float *a_coef, /* (o) lpc coefficients */ ++ float *freq /* (i) lsf coefficients */ ++){ ++ int i, j; ++ float hlp; ++ float p[LPC_HALFORDER], q[LPC_HALFORDER]; ++ float a[LPC_HALFORDER + 1], a1[LPC_HALFORDER], ++ a2[LPC_HALFORDER]; ++ float b[LPC_HALFORDER + 1], b1[LPC_HALFORDER], ++ b2[LPC_HALFORDER]; ++ ++ for (i=0; i<LPC_FILTERORDER; i++) { ++ freq[i] = freq[i] * PI2; ++ } ++ ++ /* Check input for ill-conditioned cases. This part is not ++ found in the TIA standard. It involves the following 2 IF ++ blocks. If "freq" is judged ill-conditioned, then we first ++ modify freq[0] and freq[LPC_HALFORDER-1] (normally ++ LPC_HALFORDER = 10 for LPC applications), then we adjust ++ the other "freq" values slightly */ ++ ++ ++ if ((freq[0] <= 0.0) || (freq[LPC_FILTERORDER - 1] >= 0.5)){ ++ ++ ++ if (freq[0] <= 0.0) { ++ freq[0] = (float)0.022; ++ } ++ ++ ++ if (freq[LPC_FILTERORDER - 1] >= 0.5) { ++ freq[LPC_FILTERORDER - 1] = (float)0.499; ++ } ++ ++ hlp = (freq[LPC_FILTERORDER - 1] - freq[0]) / ++ (float) (LPC_FILTERORDER - 1); ++ ++ for (i=1; i<LPC_FILTERORDER; i++) { ++ freq[i] = freq[i - 1] + hlp; ++ } ++ ++ ++ } ++ ++ memset(a1, 0, LPC_HALFORDER*sizeof(float)); ++ memset(a2, 0, LPC_HALFORDER*sizeof(float)); ++ memset(b1, 0, LPC_HALFORDER*sizeof(float)); ++ memset(b2, 0, LPC_HALFORDER*sizeof(float)); ++ memset(a, 0, (LPC_HALFORDER+1)*sizeof(float)); ++ memset(b, 0, (LPC_HALFORDER+1)*sizeof(float)); ++ ++ /* p[i] and q[i] compute cos(2*pi*omega_{2j}) and ++ cos(2*pi*omega_{2j-1} in eqs. 4.2.2.2-1 and 4.2.2.2-2. ++ Note that for this code p[i] specifies the coefficients ++ used in .Q_A(z) while q[i] specifies the coefficients used ++ in .P_A(z) */ ++ ++ for (i=0; i<LPC_HALFORDER; i++) { ++ p[i] = (float)cos(TWO_PI * freq[2 * i]); ++ q[i] = (float)cos(TWO_PI * freq[2 * i + 1]); ++ } ++ ++ a[0] = 0.25; ++ b[0] = 0.25; ++ ++ for (i= 0; i<LPC_HALFORDER; i++) { ++ a[i + 1] = a[i] - 2 * p[i] * a1[i] + a2[i]; ++ b[i + 1] = b[i] - 2 * q[i] * b1[i] + b2[i]; ++ a2[i] = a1[i]; ++ a1[i] = a[i]; ++ b2[i] = b1[i]; ++ b1[i] = b[i]; ++ } ++ ++ for (j=0; j<LPC_FILTERORDER; j++) { ++ ++ if (j == 0) { ++ a[0] = 0.25; ++ b[0] = -0.25; ++ } else { ++ a[0] = b[0] = 0.0; ++ } ++ ++ for (i=0; i<LPC_HALFORDER; i++) { ++ a[i + 1] = a[i] - 2 * p[i] * a1[i] + a2[i]; ++ b[i + 1] = b[i] - 2 * q[i] * b1[i] + b2[i]; ++ a2[i] = a1[i]; ++ a1[i] = a[i]; ++ b2[i] = b1[i]; ++ b1[i] = b[i]; ++ } ++ ++ a_coef[j + 1] = 2 * (a[LPC_HALFORDER] + b[LPC_HALFORDER]); ++ } ++ ++ a_coef[0] = 1.0; ++ ++ ++} ++ ++ +diff -druN codecs/ilbc.orig/lsf.h codecs/ilbc/lsf.h +--- codecs/ilbc.orig/lsf.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/lsf.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,30 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ lsf.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++ ++ ++******************************************************************/ ++ ++#ifndef __iLBC_LSF_H ++#define __iLBC_LSF_H ++ ++void a2lsf( ++ float *freq,/* (o) lsf coefficients */ ++ float *a /* (i) lpc coefficients */ ++); ++ ++void lsf2a( ++ float *a_coef, /* (o) lpc coefficients */ ++ float *freq /* (i) lsf coefficients */ ++); ++ ++#endif ++ ++ +diff -druN codecs/ilbc.orig/packing.c codecs/ilbc/packing.c +--- codecs/ilbc.orig/packing.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/packing.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,175 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ packing.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#include <math.h> ++#include <stdlib.h> ++ ++#include "iLBC_define.h" ++#include "constants.h" ++#include "helpfun.h" ++#include "packing.h" ++#include "string.h" ++ ++/*----------------------------------------------------------------* ++ * splitting an integer into first most significant bits and ++ * remaining least significant bits ++ *---------------------------------------------------------------*/ ++ ++void packsplit( ++ int *index, /* (i) the value to split */ ++ int *firstpart, /* (o) the value specified by most ++ significant bits */ ++ int *rest, /* (o) the value specified by least ++ significant bits */ ++ int bitno_firstpart, /* (i) number of bits in most ++ significant part */ ++ int bitno_total /* (i) number of bits in full range ++ of value */ ++){ ++ int bitno_rest = bitno_total-bitno_firstpart; ++ ++ ++ ++ *firstpart = *index>>(bitno_rest); ++ *rest = *index-(*firstpart<<(bitno_rest)); ++} ++ ++/*----------------------------------------------------------------* ++ * combining a value corresponding to msb's with a value ++ * corresponding to lsb's ++ *---------------------------------------------------------------*/ ++ ++void packcombine( ++ int *index, /* (i/o) the msb value in the ++ combined value out */ ++ int rest, /* (i) the lsb value */ ++ int bitno_rest /* (i) the number of bits in the ++ lsb part */ ++){ ++ *index = *index<<bitno_rest; ++ *index += rest; ++} ++ ++/*----------------------------------------------------------------* ++ * packing of bits into bitstream, i.e., vector of bytes ++ *---------------------------------------------------------------*/ ++ ++void dopack( ++ unsigned char **bitstream, /* (i/o) on entrance pointer to ++ place in bitstream to pack ++ new data, on exit pointer ++ to place in bitstream to ++ pack future data */ ++ int index, /* (i) the value to pack */ ++ int bitno, /* (i) the number of bits that the ++ value will fit within */ ++ int *pos /* (i/o) write position in the ++ current byte */ ++){ ++ int posLeft; ++ ++ /* Clear the bits before starting in a new byte */ ++ ++ if ((*pos)==0) { ++ **bitstream=0; ++ } ++ ++ while (bitno>0) { ++ ++ /* Jump to the next byte if end of this byte is reached*/ ++ ++ if (*pos==8) { ++ *pos=0; ++ (*bitstream)++; ++ **bitstream=0; ++ } ++ ++ ++ ++ posLeft=8-(*pos); ++ ++ /* Insert index into the bitstream */ ++ ++ if (bitno <= posLeft) { ++ **bitstream |= (unsigned char)(index<<(posLeft-bitno)); ++ *pos+=bitno; ++ bitno=0; ++ } else { ++ **bitstream |= (unsigned char)(index>>(bitno-posLeft)); ++ ++ *pos=8; ++ index-=((index>>(bitno-posLeft))<<(bitno-posLeft)); ++ ++ bitno-=posLeft; ++ } ++ } ++} ++ ++/*----------------------------------------------------------------* ++ * unpacking of bits from bitstream, i.e., vector of bytes ++ *---------------------------------------------------------------*/ ++ ++void unpack( ++ unsigned char **bitstream, /* (i/o) on entrance pointer to ++ place in bitstream to ++ unpack new data from, on ++ exit pointer to place in ++ bitstream to unpack future ++ data from */ ++ int *index, /* (o) resulting value */ ++ int bitno, /* (i) number of bits used to ++ represent the value */ ++ int *pos /* (i/o) read position in the ++ current byte */ ++){ ++ int BitsLeft; ++ ++ *index=0; ++ ++ while (bitno>0) { ++ ++ /* move forward in bitstream when the end of the ++ byte is reached */ ++ ++ if (*pos==8) { ++ *pos=0; ++ (*bitstream)++; ++ } ++ ++ BitsLeft=8-(*pos); ++ ++ /* Extract bits to index */ ++ ++ ++ ++ if (BitsLeft>=bitno) { ++ *index+=((((**bitstream)<<(*pos)) & 0xFF)>>(8-bitno)); ++ ++ *pos+=bitno; ++ bitno=0; ++ } else { ++ ++ if ((8-bitno)>0) { ++ *index+=((((**bitstream)<<(*pos)) & 0xFF)>> ++ (8-bitno)); ++ *pos=8; ++ } else { ++ *index+=(((int)(((**bitstream)<<(*pos)) & 0xFF))<< ++ (bitno-8)); ++ *pos=8; ++ } ++ bitno-=BitsLeft; ++ } ++ } ++} ++ ++ +diff -druN codecs/ilbc.orig/packing.h codecs/ilbc/packing.h +--- codecs/ilbc.orig/packing.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/packing.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,67 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ packing.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#ifndef __PACKING_H ++#define __PACKING_H ++ ++void packsplit( ++ int *index, /* (i) the value to split */ ++ int *firstpart, /* (o) the value specified by most ++ significant bits */ ++ int *rest, /* (o) the value specified by least ++ significant bits */ ++ int bitno_firstpart, /* (i) number of bits in most ++ significant part */ ++ int bitno_total /* (i) number of bits in full range ++ of value */ ++); ++ ++void packcombine( ++ int *index, /* (i/o) the msb value in the ++ combined value out */ ++ int rest, /* (i) the lsb value */ ++ int bitno_rest /* (i) the number of bits in the ++ lsb part */ ++); ++ ++void dopack( ++ unsigned char **bitstream, /* (i/o) on entrance pointer to ++ place in bitstream to pack ++ new data, on exit pointer ++ to place in bitstream to ++ pack future data */ ++ int index, /* (i) the value to pack */ ++ int bitno, /* (i) the number of bits that the ++ value will fit within */ ++ int *pos /* (i/o) write position in the ++ current byte */ ++); ++ ++void unpack( ++ unsigned char **bitstream, /* (i/o) on entrance pointer to ++ ++ ++ place in bitstream to ++ unpack new data from, on ++ exit pointer to place in ++ bitstream to unpack future ++ data from */ ++ int *index, /* (o) resulting value */ ++ int bitno, /* (i) number of bits used to ++ represent the value */ ++ int *pos /* (i/o) read position in the ++ current byte */ ++); ++ ++#endif ++ ++ +diff -druN codecs/ilbc.orig/syntFilter.c codecs/ilbc/syntFilter.c +--- codecs/ilbc.orig/syntFilter.c 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/syntFilter.c 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,108 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ syntFilter.c ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#include "iLBC_define.h" ++#include "syntFilter.h" ++ ++/*----------------------------------------------------------------* ++ * LP synthesis filter. ++ *---------------------------------------------------------------*/ ++ ++void syntFilter( ++ float *Out, /* (i/o) Signal to be filtered */ ++ float *a, /* (i) LP parameters */ ++ int len, /* (i) Length of signal */ ++ float *mem /* (i/o) Filter state */ ++){ ++ int i, j; ++ float *po, *pi, *pa, *pm; ++ ++ po=Out; ++ ++ /* Filter first part using memory from past */ ++ ++ for (i=0; i<LPC_FILTERORDER; i++) { ++ pi=&Out[i-1]; ++ pa=&a[1]; ++ pm=&mem[LPC_FILTERORDER-1]; ++ for (j=1; j<=i; j++) { ++ *po-=(*pa++)*(*pi--); ++ } ++ for (j=i+1; j<LPC_FILTERORDER+1; j++) { ++ *po-=(*pa++)*(*pm--); ++ } ++ po++; ++ } ++ ++ /* Filter last part where the state is entierly in ++ the output vector */ ++ ++ for (i=LPC_FILTERORDER; i<len; i++) { ++ ++ ++ pi=&Out[i-1]; ++ pa=&a[1]; ++ for (j=1; j<LPC_FILTERORDER+1; j++) { ++ *po-=(*pa++)*(*pi--); ++ } ++ po++; ++ } ++ ++ /* Update state vector */ ++ ++ memcpy(mem, &Out[len-LPC_FILTERORDER], ++ LPC_FILTERORDER*sizeof(float)); ++} ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff -druN codecs/ilbc.orig/syntFilter.h codecs/ilbc/syntFilter.h +--- codecs/ilbc.orig/syntFilter.h 1969-12-31 16:00:00.000000000 -0800 ++++ codecs/ilbc/syntFilter.h 2006-02-14 11:14:15.000000000 -0800 +@@ -0,0 +1,27 @@ ++ ++/****************************************************************** ++ ++ iLBC Speech Coder ANSI-C Source Code ++ ++ syntFilter.h ++ ++ Copyright (C) The Internet Society (2004). ++ All Rights Reserved. ++ ++******************************************************************/ ++ ++#ifndef __iLBC_SYNTFILTER_H ++#define __iLBC_SYNTFILTER_H ++ ++void syntFilter( ++ float *Out, /* (i/o) Signal to be filtered */ ++ float *a, /* (i) LP parameters */ ++ int len, /* (i) Length of signal */ ++ float *mem /* (i/o) Filter state */ ++ ++ ++); ++ ++#endif ++ ++ +--- codecs/.moduleinfo 2008/08/20 23:00:58 1.1 ++++ codecs/.moduleinfo 2008/08/20 23:01:12 +@@ -11,7 +11,6 @@ + <depend>gsm</depend> + </member> + <member name="codec_ilbc" displayname="iLBC Coder/Decoder" remove_on_change="codecs/codec_ilbc.o codecs/codec_ilbc.so"> +- <defaultenabled>no</defaultenabled> + </member> + <member name="codec_lpc10" displayname="LPC10 2.4kbps Coder/Decoder" remove_on_change="codecs/codec_lpc10.o codecs/codec_lpc10.so"> + </member> diff --git a/net/asterisk-bristuff/files/nocodecnego-patch-Makefile b/net/asterisk-bristuff/files/nocodecnego-patch-Makefile new file mode 100644 index 000000000000..b0dd3acd4b9a --- /dev/null +++ b/net/asterisk-bristuff/files/nocodecnego-patch-Makefile @@ -0,0 +1,219 @@ +--- Makefile.orig 2008-11-29 08:58:29.000000000 -0800 ++++ Makefile 2009-02-05 17:05:39.000000000 -0800 +@@ -95,7 +95,7 @@ + OVERWRITE=y + + # Include debug and macro symbols in the executables (-g) and profiling info (-pg) +-DEBUG=-g3 ++#DEBUG=-g3 + + # Staging directory + # Files are copied here temporarily during the install process +@@ -129,7 +129,7 @@ + ASTMANDIR=$(mandir) + ifneq ($(findstring BSD,$(OSARCH)),) + ASTVARLIBDIR=$(prefix)/share/asterisk +- ASTVARRUNDIR=$(localstatedir)/run/asterisk ++ ASTVARRUNDIR=$(localstatedir)/run + else + ASTVARLIBDIR=$(localstatedir)/lib/asterisk + endif +@@ -219,9 +219,11 @@ + ASTLDFLAGS+=-L/usr/local/lib + endif + ++ifneq ($(OSARCH),FreeBSD) + ifneq ($(PROC),ultrasparc) + ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) + endif ++endif + + ifeq ($(PROC),ppc) + ASTCFLAGS+=-fsigned-char +@@ -229,7 +231,7 @@ + + ifeq ($(OSARCH),FreeBSD) + # -V is understood by BSD Make, not by GNU make. +- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) ++ BSDVERSION=$(OSVERSION) + ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) + AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) + endif +@@ -408,15 +410,15 @@ + # Should static HTTP be installed during make samples or even with its own target ala + # webvoicemail? There are portions here that *could* be customized but might also be + # improved a lot. I'll put it here for now. +- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http ++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http + for x in static-http/*; do \ +- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ + done +- mkdir -p $(DESTDIR)$(ASTDATADIR)/images ++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/images + for x in images/*.jpg; do \ +- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/images ; \ + done +- mkdir -p $(DESTDIR)$(AGI_DIR) ++ $(MKDIR) $(DESTDIR)$(AGI_DIR) + $(MAKE) -C sounds install + + update: +@@ -437,47 +439,47 @@ + OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) + + installdirs: +- mkdir -p $(DESTDIR)$(MODULES_DIR) +- mkdir -p $(DESTDIR)$(ASTSBINDIR) +- mkdir -p $(DESTDIR)$(ASTETCDIR) +- mkdir -p $(DESTDIR)$(ASTBINDIR) +- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor ++ $(MKDIR) $(DESTDIR)$(MODULES_DIR) ++ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) ++ $(MKDIR) $(DESTDIR)$(ASTETCDIR) ++ $(MKDIR) $(DESTDIR)$(ASTBINDIR) ++ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor + + bininstall: _all installdirs $(SUBDIRS_INSTALL) +- $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/ ++ $(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/ + $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk +- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ +- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ ++ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ ++ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ + if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ +- cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ +- chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ ++ cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe_asterisk.out;\ ++ ${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ + fi +- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) +- $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir) +- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) ++ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR) ++ $(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir) ++ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) + if [ -n "$(OLDHEADERS)" ]; then \ + rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\ + fi +- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv +- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom +- mkdir -p $(DESTDIR)$(ASTDATADIR)/keys +- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware +- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax +- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8 +- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys +- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys +- $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 +- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 +- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 +- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 ++ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv ++ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom ++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys ++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware ++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax ++ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8 ++ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys ++ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys ++ $(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 ++ $(BSD_INSTALL_MAN) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 ++ $(BSD_INSTALL_MAN) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 ++ $(BSD_INSTALL_MAN) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 + if [ -f contrib/firmware/iax/iaxy.bin ] ; then \ +- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ ++ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ + fi + + $(SUBDIRS_INSTALL): +@@ -513,7 +515,7 @@ + @exit 1 + endif + +-install: badshell datafiles bininstall ++install: badshell datafiles bininstall samples + @if [ -x /usr/sbin/asterisk-post-install ]; then \ + /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ + fi +@@ -551,31 +553,23 @@ + upgrade: bininstall + + adsi: +- mkdir -p $(DESTDIR)$(ASTETCDIR) ++ $(MKDIR) $(DESTDIR)$(ASTETCDIR) + for x in configs/*.adsi; do \ + if [ ! -f $(DESTDIR)$(ASTETCDIR)/$$x ]; then \ +- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ + fi ; \ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \ + done + + samples: adsi +- mkdir -p $(DESTDIR)$(ASTETCDIR) ++ $(MKDIR) $(DESTDIR)$(ASTETCDIR) + for x in configs/*.sample; do \ +- if [ -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ +- if [ "$(OVERWRITE)" = "y" ]; then \ +- if cmp -s $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $$x ; then \ +- echo "Config file $$x is unchanged"; \ +- continue; \ +- fi ; \ +- mv -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.old ; \ +- else \ +- echo "Skipping config file $$x"; \ +- continue; \ +- fi ;\ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ;\ ++ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`;\ + fi ; \ +- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ;\ + done +- if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ ++ if true; then \ + ( \ + echo "[directories]" ; \ + echo "astetcdir => $(ASTETCDIR)" ; \ +@@ -621,20 +615,23 @@ + echo ";astctlowner = root" ; \ + echo ";astctlgroup = apache" ; \ + echo ";astctl = asterisk.ctl" ; \ +- ) > $(DESTDIR)$(ASTCONFPATH) ; \ ++ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \ ++ if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ ++ cp $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \ ++ fi; \ + else \ + echo "Skipping asterisk.conf creation"; \ + fi +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX + build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR) + + webvmail: + @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 ) + @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 ) + $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi +- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk ++ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk + for x in images/*.gif; do \ +- $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ + done + @echo " +--------- Asterisk Web Voicemail ----------+" + @echo " + +" diff --git a/net/asterisk-bristuff/files/patch-Makefile b/net/asterisk-bristuff/files/patch-Makefile deleted file mode 100644 index e0e5710b2de3..000000000000 --- a/net/asterisk-bristuff/files/patch-Makefile +++ /dev/null @@ -1,493 +0,0 @@ ---- Makefile.orig Tue Jul 3 23:08:38 2007 -+++ Makefile Tue Jul 3 23:32:03 2007 -@@ -19,8 +19,8 @@ - # CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be- - # CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/ - # CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target --CC=$(CROSS_COMPILE)gcc --HOST_CC=gcc -+CC?=$(CROSS_COMPILE)gcc -+HOST_CC=${CC} - # CROSS_ARCH=Linux - # CROSS_PROC=arm - # SUB_PROC=xscale # or maverick -@@ -47,14 +47,14 @@ - #K6OPT = -DK6OPT - - #Tell gcc to optimize the code --OPTIMIZE+=-O6 -+#OPTIMIZE+=-O6 - endif - - #Overwite config files on "make samples" --OVERWRITE=y -+OVERWRITE=n - - #Include debug and macro symbols in the executables (-g) and profiling info (-pg) --DEBUG=-g3 #-pg -+#DEBUG=-g3 #-pg - - #Set NOCRYPTO to yes if you do not want to have crypto support or - #dependencies -@@ -88,7 +88,7 @@ - - # Where to install asterisk after compiling - # Default -> leave empty --INSTALL_PREFIX?= -+INSTALL_PREFIX=$(PREFIX) - - # Staging directory - # Files are copied here temporarily during the install process -@@ -111,17 +111,17 @@ - BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE - - ifneq ($(OSARCH),SunOS) -- ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk -- ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk -+ ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk -+ ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk - ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk -- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk -- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk -- ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk -+ ASTSPOOLDIR=/var/spool/asterisk -+ ASTLOGDIR=/var/log/asterisk -+ ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk - ASTCONFPATH=$(ASTETCDIR)/asterisk.conf -- ASTBINDIR=$(INSTALL_PREFIX)/usr/bin -- ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin -- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run -- ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man -+ ASTBINDIR=$(INSTALL_PREFIX)/bin -+ ASTSBINDIR=$(INSTALL_PREFIX)/sbin -+ ASTVARRUNDIR=/var/run -+ ASTMANDIR=$(INSTALL_PREFIX)/man - MODULES_DIR=$(ASTLIBDIR)/modules - AGI_DIR=$(ASTVARLIBDIR)/agi-bin - else -@@ -226,25 +226,25 @@ - endif - - INCLUDE+=-Iinclude -I../include --ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY --ASTCFLAGS+=$(OPTIMIZE) -+ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE -DMAKE_VALGRIND_HAPPY -+#ASTCFLAGS+=$(OPTIMIZE) - ASTOBJ=-o asterisk - - ifeq ($(findstring BSD,$(OSARCH)),BSD) - PROC=$(shell uname -m) -- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - ifneq ($(PROC),ultrasparc) -- ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) -+# ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) - endif - - ifeq ($(PROC),ppc) - ASTCFLAGS+=-fsigned-char - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h),) -- ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/local/include/osp -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp/osp.h),) -+ ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp - else - ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) - ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp -@@ -253,27 +253,24 @@ - - ifeq ($(OSARCH),FreeBSD) - BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk) -- ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) -- LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) -- ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),) -- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp -+ ASTCFLAGS+=$(PTHREAD_CFLAGS) -+ LIBS+=$(PTHREAD_LIBS) -+ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp),) -+ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp - endif - MPG123TARG=freebsd - -- # XXX FreeBSD paths -- PREFIX?=/usr/local -- ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk -- ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk -- ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk -- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk -- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk -- ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk -+ ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk -+ ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk -+ ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk -+ ASTSPOOLDIR=/var/spool/asterisk -+ ASTLOGDIR=/var/log/asterisk -+ ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk - ASTCONFPATH=$(ASTETCDIR)/asterisk.conf -- ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin -- ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin -- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run -- ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man -- # XXX end FreeBSD paths -+ ASTBINDIR=$(INSTALL_PREFIX)/bin -+ ASTSBINDIR=$(INSTALL_PREFIX)/sbin -+ ASTVARRUNDIR=/var/run -+ ASTMANDIR=$(INSTALL_PREFIX)/man - - endif # FreeBSD - -@@ -307,8 +304,8 @@ - - ifndef WITHOUT_ZAPTEL - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) -- ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) -+ ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel - endif - - endif # WITHOUT_ZAPTEL -@@ -414,7 +411,7 @@ - endif - - # This is used when generating the doxygen documentation --ifneq ($(wildcard /usr/local/bin/dot)$(wildcard /usr/bin/dot),) -+ifneq ($(wildcard $(LOCALBASE)/bin/dot)$(wildcard /usr/bin/dot),) - HAVEDOT=yes - else - HAVEDOT=no -@@ -431,7 +428,7 @@ - @echo " + $(MAKE) install +" - @echo " +-------------------------------------------+" - --all: cleantest depend asterisk subdirs -+all: cleantest depend asterisk subdirs manpage - - #ifneq ($(wildcard tags),) - ctags: tags -@@ -450,13 +447,13 @@ - cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure - $(MAKE) -C editline libedit.a - --db1-ast/libdb1.a: FORCE -- @if [ -d db1-ast ]; then \ -- $(MAKE) -C db1-ast libdb1.a ; \ -- else \ -- echo "You need to do a cvs update -d not just cvs update"; \ -- exit 1; \ -- fi -+#db1-ast/libdb1.a: FORCE -+# @if [ -d db1-ast ]; then \ -+# $(MAKE) -C db1-ast libdb1.a ; \ -+# else \ -+# echo "You need to do a cvs update -d not just cvs update"; \ -+# exit 1; \ -+# fi - - ifneq ($(wildcard .depend),) - include .depend -@@ -480,10 +477,10 @@ - - manpage: asterisk.8 - --asterisk.8: asterisk.sgml -- rm -f asterisk.8 -- docbook2man asterisk.sgml -- mv ./*.8 asterisk.8 -+#asterisk.8: asterisk.sgml -+# rm -f asterisk.8 -+# docbook2man asterisk.sgml -+# mv ./*.8 asterisk.8 - - asterisk.pdf: asterisk.sgml - docbook2pdf asterisk.sgml -@@ -523,14 +520,14 @@ - cygwin_a: - $(MAKE) -C cygwin all - --asterisk: $(CYGLOADER) editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS) -+asterisk: $(CYGLOADER) editline/libedit.a stdtime/libtime.a $(OBJS) - build_tools/make_build_h > include/asterisk/build.h.tmp - if cmp -s include/asterisk/build.h.tmp include/asterisk/build.h ; then echo ; else \ - mv include/asterisk/build.h.tmp include/asterisk/build.h ; \ - fi - rm -f include/asterisk/build.h.tmp - $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c -- $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS) -+ $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) stdtime/libtime.a $(LIBS) - - muted: muted.o - $(CC) $(AUDIO_LIBS) -o muted muted.o -@@ -552,38 +549,38 @@ - - datafiles: all - if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros - for x in sounds/digits/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate - for x in sounds/dictate/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters - for x in sounds/letters/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic - for x in sounds/phonetic/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ -@@ -591,18 +588,18 @@ - done - for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-* sounds/hours* sounds/minute* sounds/second* ; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/images - for x in images/*.jpg; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \ - done -- mkdir -p $(DESTDIR)$(AGI_DIR) -+ $(MKDIR) $(DESTDIR)$(AGI_DIR) - - update: - @if [ -d .svn ]; then \ -@@ -631,47 +628,45 @@ - OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) - - bininstall: all -- mkdir -p $(DESTDIR)$(MODULES_DIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- mkdir -p $(DESTDIR)$(ASTBINDIR) -- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor -- if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi -- if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi -- if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi -+ $(MKDIR) $(DESTDIR)$(MODULES_DIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor -+ if [ -f asterisk ]; then $(BSD_INSTALL_PROGRAM) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi - $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk -- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ - if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ - cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ - chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ - fi -- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) -- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) -+ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR) -+ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) - if [ -n "$(OLDHEADERS)" ]; then \ - rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\ - fi -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax -- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -- $(INSTALL) -m 644 asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax -+ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -+ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -+ $(BSD_INSTALL_DATA) asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 - if [ -d contrib/firmware/iax ]; then \ -- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \ -+ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \ - else \ - echo "You need to do cvs update -d not just cvs update" ; \ - fi -@@ -701,46 +696,28 @@ - echo " WARNING WARNING WARNING" ;\ - fi - --install: all datafiles bininstall install-subdirs -+install: all datafiles bininstall install-subdirs samples - @if [ -x /usr/sbin/asterisk-post-install ]; then \ - /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ - fi -- @echo " +---- Asterisk Installation Complete -------+" -- @echo " + +" -- @echo " + YOU MUST READ THE SECURITY DOCUMENT +" -- @echo " + +" -- @echo " + Asterisk has successfully been installed. +" -- @echo " + If you would like to install the sample +" -- @echo " + configuration files (overwriting any +" -- @echo " + existing config files), run: +" -- @echo " + +" -- @echo " + $(MAKE) samples +" -- @echo " + +" -- @echo " +----------------- or ---------------------+" -- @echo " + +" -- @echo " + You can go ahead and install the asterisk +" -- @echo " + program documentation now or later run: +" -- @echo " + +" -- @echo " + $(MAKE) progdocs +" -- @echo " + +" -- @echo " + **Note** This requires that you have +" -- @echo " + doxygen installed on your local system +" -- @echo " +-------------------------------------------+" - @$(MAKE) -s oldmodcheck - - upgrade: all bininstall - - adsi: -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.adsi; do \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x`-dist; \ - if [ ! -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \ - fi ; \ - done - - samples: adsi -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ echo ADSI INSTALL $(BSD_INSTALL_DATA) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.sample; do \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`-dist;\ - if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ - if [ "$(OVERWRITE)" = "y" ]; then \ - if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \ -@@ -753,7 +730,7 @@ - continue; \ - fi ;\ - fi ; \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ - done - if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ - ( \ -@@ -775,25 +752,25 @@ - echo "[options]" ; \ - echo "uniquename = `hostname`" ;\ - echo "silence_suppression = yes" ;\ -- ) > $(DESTDIR)$(ASTCONFPATH) ; \ -+ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \ - else \ - echo "Skipping asterisk.conf creation"; \ - fi -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ - for x in sounds/demo-*; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ - for x in sounds/*.mp3; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ - done - rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3 -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX - :> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm - for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \ - cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \ -@@ -807,9 +784,9 @@ - @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 ) - @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 ) - $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi -- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk -+ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk - for x in images/*.gif; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ - done - @echo " +--------- Asterisk Web Voicemail ----------+" - @echo " + +" -@@ -836,10 +813,10 @@ - - __rpm: include/asterisk/version.h spec - rm -rf /tmp/asterisk ; \ -- mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \ -+ $(MKDIR) /tmp/asterisk/redhat/RPMS/i386 ; \ - $(MAKE) DESTDIR=/tmp/asterisk install ; \ - $(MAKE) DESTDIR=/tmp/asterisk samples ; \ -- mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \ -+ $(MKDIR) /tmp/asterisk/etc/rc.d/init.d ; \ - cp -f contrib/init.d/rc.redhat.asterisk /tmp/asterisk/etc/rc.d/init.d/asterisk ; \ - rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec - diff --git a/net/asterisk-bristuff/files/patch-Makefile.rules b/net/asterisk-bristuff/files/patch-Makefile.rules new file mode 100644 index 000000000000..4eea03fa0c34 --- /dev/null +++ b/net/asterisk-bristuff/files/patch-Makefile.rules @@ -0,0 +1,21 @@ + +$FreeBSD: /tmp/pcvs/ports/net/asterisk-bristuff/files/Attic/patch-Makefile.rules,v 1.1 2009-09-16 19:33:37 fjoe Exp $ + +--- Makefile.rules ++++ Makefile.rules +@@ -27,6 +27,7 @@ + CMD_PREFIX= + endif + ++ifneq ($(OSARCH),FreeBSD) + ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),) + # More GSM codec optimization + # Uncomment to enable MMXTM optimizations for x86 architecture CPU's +@@ -37,6 +38,7 @@ + OPTIMIZE?=-O6 + ASTCFLAGS+=$(OPTIMIZE) + endif ++endif + + %.o: %.c + $(ECHO_PREFIX) echo " [CC] $< -> $@" diff --git a/net/asterisk-bristuff/files/patch-agi::Makefile b/net/asterisk-bristuff/files/patch-agi::Makefile index 42c46039db32..8fd449f57003 100644 --- a/net/asterisk-bristuff/files/patch-agi::Makefile +++ b/net/asterisk-bristuff/files/patch-agi::Makefile @@ -1,18 +1,18 @@ ---- agi/Makefile.orig Sat Jun 3 21:39:30 2006 -+++ agi/Makefile Sat Jun 3 21:41:37 2006 -@@ -11,7 +11,9 @@ - # the GNU General Public License - # +--- agi/Makefile.orig Sat Dec 16 23:14:34 2006 ++++ agi/Makefile Wed Mar 28 11:13:21 2007 +@@ -13,7 +13,9 @@ --AGIS=agi-test.agi eagi-test eagi-sphinx-test xagi-test + .PHONY: clean all uninstall + +-AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi xagi-test +AGIS_BIN=eagi-test eagi-sphinx-test xagi-test -+AGIS_SCR=agi-test.agi ++AGIS_SCR=agi-test.agi jukebox.agi +AGIS=$(AGIS_SCR) $(AGIS_BIN) - CFLAGS+=-DNO_AST_MM - -@@ -27,8 +29,9 @@ - all: depend $(AGIS) + ifeq ($(OSARCH),SunOS) + LIBS+=-lsocket -lnsl +@@ -31,8 +33,9 @@ eagi-test: eagi-test.o strcompat.o + eagi-sphinx-test: eagi-sphinx-test.o install: all - mkdir -p $(DESTDIR)$(AGI_DIR) @@ -21,5 +21,5 @@ + for x in $(AGIS_BIN); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(AGI_DIR) ; done + for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done - eagi-test: eagi-test.o - $(CC) $(CFLAGS) -o eagi-test eagi-test.o $(LIBS) + uninstall: + for x in $(AGIS); do rm -f $(DESTDIR)$(AGI_DIR)/$$x ; done diff --git a/net/asterisk-bristuff/files/patch-apps::Makefile b/net/asterisk-bristuff/files/patch-apps::Makefile deleted file mode 100644 index 5e5bcba8a28b..000000000000 --- a/net/asterisk-bristuff/files/patch-apps::Makefile +++ /dev/null @@ -1,70 +0,0 @@ ---- apps/Makefile.orig Wed Jul 4 00:07:15 2007 -+++ apps/Makefile Wed Jul 4 00:18:41 2007 -@@ -52,25 +52,28 @@ - #APPS+=app_rpt.so - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel/zaptel.h),) - APPS+=app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so app_page.so -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel - endif - endif # WITHOUT_ZAPTEL - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) -+ifdef WITH_FAX -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp.h),) -+APPS+=app_rxfax.so app_txfax.so -+endif -+endif -+ -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) - APPS+=app_osplookup.so - endif - - ifeq ($(findstring BSD,${OSARCH}),BSD) --CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - --CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs) --ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),) -- ifneq (${CURLLIBS},) -- APPS+=app_curl.so -- endif --endif -+CURLLIBS=$(shell $(CROSS_COMPILE_BIN)$(LOCALBASE)/bin/curl-config --libs) -+APPS+=app_curl.so - - ifeq (${OSARCH},CYGWIN) - CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols -@@ -102,18 +105,26 @@ - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -ltonezone - - install: all -- for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(APPS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so - rm -f $(DESTDIR)$(MODULES_DIR)/app_qcall.so - - app_curl.so: app_curl.o - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CURLLIBS) - -+ifdef WITH_FAX -+app_rxfax.so : app_rxfax.o -+ $(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lspandsp -ltiff -+ -+app_txfax.so : app_txfax.o -+ $(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lspandsp -ltiff -+endif -+ - app_sql_postgres.o: app_sql_postgres.c -- $(CC) -pipe -I$(CROSS_COMPILE_TARGET)/usr/local/pgsql/include -I$(CROSS_COMPILE_TARGET)/usr/include/postgresql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c -+ $(CC) -I$(LOCALBASE)/include/pgsql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c - - app_sql_postgres.so: app_sql_postgres.o -- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L/usr/local/pgsql/lib -lpq -+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L$(LOCALBASE)/lib -lpq - - app_sql_odbc.so: app_sql_odbc.o - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc diff --git a/net/asterisk-bristuff/files/patch-apps::app_rxfax.c b/net/asterisk-bristuff/files/patch-apps::app_rxfax.c deleted file mode 100644 index cabfb1a98604..000000000000 --- a/net/asterisk-bristuff/files/patch-apps::app_rxfax.c +++ /dev/null @@ -1,399 +0,0 @@ - -$FreeBSD$ - ---- apps/app_rxfax.c.orig -+++ apps/app_rxfax.c -@@ -0,0 +1,393 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Trivial application to receive a TIFF FAX file -+ * -+ * Copyright (C) 2003, Steve Underwood -+ * -+ * Steve Underwood <steveu@coppice.org> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <string.h> -+#include <stdlib.h> -+#include <stdio.h> -+#if !defined(__FreeBSD__) || __FreeBSD_version < 500028 -+#include <inttypes.h> -+#else -+#include <stdint.h> -+#endif -+#include <pthread.h> -+#include <errno.h> -+#if !defined(__FreeBSD__) || __FreeBSD_version >= 503000 -+#include <tgmath.h> -+#endif -+#include <tiffio.h> -+ -+#include <spandsp.h> -+ -+#include "asterisk.h" -+ -+ASTERISK_FILE_VERSION(__FILE__, "$Revision:$") -+ -+#include "asterisk/lock.h" -+#include "asterisk/file.h" -+#include "asterisk/logger.h" -+#include "asterisk/channel.h" -+#include "asterisk/pbx.h" -+#include "asterisk/module.h" -+#include "asterisk/translate.h" -+#include "asterisk/dsp.h" -+#include "asterisk/manager.h" -+ -+static char *tdesc = "Trivial FAX Receive Application"; -+ -+static char *app = "RxFAX"; -+ -+static char *synopsis = "Receive a FAX to a file"; -+ -+static char *descrip = -+" RxFAX(filename[|caller][|debug]): Receives a FAX from the channel into the\n" -+"given filename. If the file exists it will be overwritten. The file\n" -+"should be in TIFF/F format.\n" -+"The \"caller\" option makes the application behave as a calling machine,\n" -+"rather than the answering machine. The default behaviour is to behave as\n" -+"an answering machine.\n" -+"Uses LOCALSTATIONID to identify itself to the remote end.\n" -+" LOCALHEADERINFO to generate a header line on each page.\n" -+"Sets REMOTESTATIONID to the sender CSID.\n" -+" FAXPAGES to the number of pages received.\n" -+" FAXBITRATE to the transmition rate.\n" -+" FAXRESOLUTION to the resolution.\n" -+"Returns -1 when the user hangs up.\n" -+"Returns 0 otherwise.\n"; -+ -+STANDARD_LOCAL_USER; -+ -+LOCAL_USER_DECL; -+ -+#define MAX_BLOCK_SIZE 240 -+ -+static void span_message(int level, const char *msg) -+{ -+ int ast_level; -+ -+ if (level == SPAN_LOG_WARNING) -+ ast_level = __LOG_WARNING; -+ else if (level == SPAN_LOG_WARNING) -+ ast_level = __LOG_WARNING; -+ else -+ ast_level = __LOG_DEBUG; -+ ast_log(ast_level, __FILE__, __LINE__, __PRETTY_FUNCTION__, msg); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void t30_flush(t30_state_t *s, int which) -+{ -+ //TODO: -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void phase_e_handler(t30_state_t *s, void *user_data, int result) -+{ -+ struct ast_channel *chan; -+ t30_stats_t t; -+ char local_ident[21]; -+ char far_ident[21]; -+ char buf[11]; -+ -+ chan = (struct ast_channel *) user_data; -+ if (result == T30_ERR_OK) -+ { -+ t30_get_transfer_statistics(s, &t); -+ t30_get_far_ident(s, far_ident); -+ t30_get_local_ident(s, local_ident); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Fax successfully received.\n"); -+ ast_log(LOG_DEBUG, "Remote station id: %s\n", far_ident); -+ ast_log(LOG_DEBUG, "Local station id: %s\n", local_ident); -+ ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); -+ ast_log(LOG_DEBUG, "Image resolution: %i x %i\n", t.column_resolution, t.row_resolution); -+ ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ manager_event(EVENT_FLAG_CALL, -+ "FaxReceived", "Channel: %s\nExten: %s\nCallerID: %s\nRemoteStationID: %s\nLocalStationID: %s\nPagesTransferred: %i\nResolution: %i\nTransferRate: %i\nFileName: %s\n", -+ chan->name, -+ chan->exten, -+ (chan->cid.cid_num) ? chan->cid.cid_num : "", -+ far_ident, -+ local_ident, -+ t.pages_transferred, -+ t.row_resolution, -+ t.bit_rate, -+ s->rx_file); -+ pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident); -+ snprintf(buf, sizeof(buf), "%i", t.pages_transferred); -+ pbx_builtin_setvar_helper(chan, "FAXPAGES", buf); -+ snprintf(buf, sizeof(buf), "%i", t.row_resolution); -+ pbx_builtin_setvar_helper(chan, "FAXRESOLUTION", buf); -+ snprintf(buf, sizeof(buf), "%i", t.bit_rate); -+ pbx_builtin_setvar_helper(chan, "FAXBITRATE", buf); -+ } -+ else -+ { -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Fax receive not successful - result (%d) %s.\n", result, t30_completion_code_to_str(result)); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ } -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void phase_d_handler(t30_state_t *s, void *user_data, int result) -+{ -+ struct ast_channel *chan; -+ t30_stats_t t; -+ -+ chan = (struct ast_channel *) user_data; -+ if (result) -+ { -+ t30_get_transfer_statistics(s, &t); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); -+ ast_log(LOG_DEBUG, "Image size: %i x %i\n", t.columns, t.rows); -+ ast_log(LOG_DEBUG, "Image resolution %i x %i\n", t.column_resolution, t.row_resolution); -+ ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); -+ ast_log(LOG_DEBUG, "Bad rows %i\n", t.bad_rows); -+ ast_log(LOG_DEBUG, "Longest bad row run %i\n", t.longest_bad_row_run); -+ ast_log(LOG_DEBUG, "Compression type %i\n", t.encoding); -+ ast_log(LOG_DEBUG, "Image size (bytes) %i\n", t.image_size); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ } -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static int rxfax_exec(struct ast_channel *chan, void *data) -+{ -+ int res = 0; -+ char template_file[256]; -+ char target_file[256]; -+ char *s; -+ char *t; -+ char *v; -+ char *x; -+ int option; -+ int len; -+ int i; -+ t30_state_t fax; -+ int calling_party; -+ int verbose; -+ int samples; -+ -+ struct localuser *u; -+ struct ast_frame *inf = NULL; -+ struct ast_frame outf; -+ -+ int original_read_fmt; -+ int original_write_fmt; -+ -+ uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET]; -+ uint8_t *buf = __buf + AST_FRIENDLY_OFFSET; -+ -+ if (chan == NULL) -+ { -+ ast_log(LOG_WARNING, "Fax receive channel is NULL. Giving up.\n"); -+ return -1; -+ } -+ -+ span_set_message_handler(span_message); -+ -+ /* The next few lines of code parse out the filename and header from the input string */ -+ if (data == NULL) -+ { -+ /* No data implies no filename or anything is present */ -+ ast_log(LOG_WARNING, "Rxfax requires an argument (filename)\n"); -+ return -1; -+ } -+ -+ calling_party = FALSE; -+ verbose = FALSE; -+ target_file[0] = '\0'; -+ -+ for (option = 0, v = s = data; v; option++, s++) -+ { -+ t = s; -+ v = strchr(s, '|'); -+ s = (v) ? v : s + strlen(s); -+ strncpy((char *) buf, t, s - t); -+ buf[s - t] = '\0'; -+ if (option == 0) -+ { -+ /* The first option is always the file name */ -+ len = s - t; -+ if (len > 255) -+ len = 255; -+ strncpy(target_file, t, len); -+ target_file[len] = '\0'; -+ /* Allow the use of %d in the file name for a wild card of sorts, to -+ create a new file with the specified name scheme */ -+ if ((x = strchr(target_file, '%')) && x[1] == 'd') -+ { -+ strcpy(template_file, target_file); -+ i = 0; -+ do -+ { -+ snprintf(target_file, 256, template_file, 1); -+ i++; -+ } -+ while (ast_fileexists(target_file, "", chan->language) != -1); -+ } -+ } -+ else if (strncmp("caller", t, s - t) == 0) -+ { -+ calling_party = TRUE; -+ } -+ else if (strncmp("debug", t, s - t) == 0) -+ { -+ verbose = TRUE; -+ } -+ } -+ -+ /* Done parsing */ -+ -+ LOCAL_USER_ADD(u); -+ -+ if (chan->_state != AST_STATE_UP) -+ { -+ /* Shouldn't need this, but checking to see if channel is already answered -+ * Theoretically asterisk should already have answered before running the app */ -+ res = ast_answer(chan); -+ } -+ -+ if (!res) -+ { -+ original_read_fmt = chan->readformat; -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n"); -+ return -1; -+ } -+ } -+ original_write_fmt = chan->writeformat; -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n"); -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ return -1; -+ } -+ } -+ fax_init(&fax, calling_party, NULL); -+ if (verbose) -+ fax.logging.level = SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW; -+ x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"); -+ if (x && x[0]) -+ t30_set_local_ident(&fax, x); -+ x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO"); -+ if (x && x[0]) -+ t30_set_header_info(&fax, x); -+ t30_set_rx_file(&fax, target_file, -1); -+ //t30_set_phase_b_handler(&fax, phase_b_handler, chan); -+ t30_set_phase_d_handler(&fax, phase_d_handler, chan); -+ t30_set_phase_e_handler(&fax, phase_e_handler, chan); -+ while (ast_waitfor(chan, -1) > -1) -+ { -+ inf = ast_read(chan); -+ if (inf == NULL) -+ { -+ res = -1; -+ break; -+ } -+ if (inf->frametype == AST_FRAME_VOICE) -+ { -+ if (fax_rx(&fax, inf->data, inf->samples)) -+ break; -+ samples = (inf->samples <= MAX_BLOCK_SIZE) ? inf->samples : MAX_BLOCK_SIZE; -+ len = fax_tx(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples); -+ if (len) -+ { -+ memset(&outf, 0, sizeof(outf)); -+ outf.frametype = AST_FRAME_VOICE; -+ outf.subclass = AST_FORMAT_SLINEAR; -+ outf.datalen = len*sizeof(int16_t); -+ outf.samples = len; -+ outf.data = &buf[AST_FRIENDLY_OFFSET]; -+ outf.offset = AST_FRIENDLY_OFFSET; -+ outf.src = "RxFAX"; -+ if (ast_write(chan, &outf) < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno)); -+ break; -+ } -+ } -+ } -+ ast_frfree(inf); -+ } -+ if (inf == NULL) -+ { -+ ast_log(LOG_DEBUG, "Got hangup\n"); -+ res = -1; -+ } -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ } -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, original_write_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name); -+ } -+ fax_release(&fax); -+ } -+ else -+ { -+ ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name); -+ } -+ LOCAL_USER_REMOVE(u); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int unload_module(void) -+{ -+ STANDARD_HANGUP_LOCALUSERS; -+ return ast_unregister_application(app); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int load_module(void) -+{ -+ return ast_register_application(app, rxfax_exec, synopsis, descrip); -+} -+ -+char *description(void) -+{ -+ return tdesc; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int usecount(void) -+{ -+ int res; -+ STANDARD_USECOUNT(res); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+char *key(void) -+{ -+ return ASTERISK_GPL_KEY; -+} -+/*- End of function --------------------------------------------------------*/ -+/*- End of file ------------------------------------------------------------*/ diff --git a/net/asterisk-bristuff/files/patch-apps::app_txfax.c b/net/asterisk-bristuff/files/patch-apps::app_txfax.c deleted file mode 100644 index 8d81a55ae13c..000000000000 --- a/net/asterisk-bristuff/files/patch-apps::app_txfax.c +++ /dev/null @@ -1,326 +0,0 @@ - -$FreeBSD$ - ---- apps/app_txfax.c.orig -+++ apps/app_txfax.c -@@ -0,0 +1,320 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Trivial application to send a TIFF file as a FAX -+ * -+ * Copyright (C) 2003, Steve Underwood -+ * -+ * Steve Underwood <steveu@coppice.org> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <string.h> -+#include <stdlib.h> -+#include <stdio.h> -+#if !defined(__FreeBSD__) || __FreeBSD_version < 500028 -+#include <inttypes.h> -+#else -+#include <stdint.h> -+#endif -+#include <pthread.h> -+#include <errno.h> -+#if !defined(__FreeBSD__) || __FreeBSD_version >= 503000 -+#include <tgmath.h> -+#endif -+#include <tiffio.h> -+ -+#include <spandsp.h> -+ -+#include "asterisk.h" -+ -+ASTERISK_FILE_VERSION(__FILE__, "$Revision:$") -+ -+#include "asterisk/lock.h" -+#include "asterisk/file.h" -+#include "asterisk/logger.h" -+#include "asterisk/channel.h" -+#include "asterisk/pbx.h" -+#include "asterisk/module.h" -+#include "asterisk/translate.h" -+ -+static char *tdesc = "Trivial FAX Transmit Application"; -+ -+static char *app = "TxFAX"; -+ -+static char *synopsis = "Send a FAX file"; -+ -+static char *descrip = -+" TxFAX(filename[|caller][|debug]): Send a given TIFF file to the channel as a FAX.\n" -+"The \"caller\" option makes the application behave as a calling machine,\n" -+"rather than the answering machine. The default behaviour is to behave as\n" -+"an answering machine.\n" -+"Uses LOCALSTATIONID to identify itself to the remote end.\n" -+" LOCALHEADERINFO to generate a header line on each page.\n" -+"Sets REMOTESTATIONID to the receiver CSID.\n" -+"Returns -1 when the user hangs up, or if the file does not exist.\n" -+"Returns 0 otherwise.\n"; -+ -+STANDARD_LOCAL_USER; -+ -+LOCAL_USER_DECL; -+ -+#define MAX_BLOCK_SIZE 240 -+ -+static void span_message(int level, const char *msg) -+{ -+ int ast_level; -+ -+ if (level == SPAN_LOG_WARNING) -+ ast_level = __LOG_WARNING; -+ else if (level == SPAN_LOG_WARNING) -+ ast_level = __LOG_WARNING; -+ else -+ ast_level = __LOG_DEBUG; -+ ast_log(ast_level, __FILE__, __LINE__, __PRETTY_FUNCTION__, msg); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void t30_flush(t30_state_t *s, int which) -+{ -+ //TODO: -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void phase_e_handler(t30_state_t *s, void *user_data, int result) -+{ -+ struct ast_channel *chan; -+ char far_ident[21]; -+ -+ chan = (struct ast_channel *) user_data; -+ if (result == T30_ERR_OK) -+ { -+ t30_get_far_ident(s, far_ident); -+ pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident); -+ } -+ else -+ { -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Fax send not successful - result (%d) %s.\n", result, t30_completion_code_to_str(result)); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ } -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static int txfax_exec(struct ast_channel *chan, void *data) -+{ -+ int res = 0; -+ char source_file[256]; -+ char *x; -+ char *s; -+ char *t; -+ char *v; -+ int option; -+ int len; -+ t30_state_t fax; -+ int calling_party; -+ int verbose; -+ int samples; -+ -+ struct localuser *u; -+ struct ast_frame *inf = NULL; -+ struct ast_frame outf; -+ -+ int original_read_fmt; -+ int original_write_fmt; -+ -+ uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET]; -+ uint8_t *buf = __buf + AST_FRIENDLY_OFFSET; -+ -+ if (chan == NULL) -+ { -+ ast_log(LOG_WARNING, "Fax transmit channel is NULL. Giving up.\n"); -+ return -1; -+ } -+ -+ span_set_message_handler(span_message); -+ -+ /* The next few lines of code parse out the filename and header from the input string */ -+ if (data == NULL) -+ { -+ /* No data implies no filename or anything is present */ -+ ast_log(LOG_WARNING, "Txfax requires an argument (filename)\n"); -+ return -1; -+ } -+ -+ calling_party = FALSE; -+ verbose = FALSE; -+ source_file[0] = '\0'; -+ -+ for (option = 0, v = s = data; v; option++, s++) -+ { -+ t = s; -+ v = strchr(s, '|'); -+ s = (v) ? v : s + strlen(s); -+ strncpy((char *) buf, t, s - t); -+ buf[s - t] = '\0'; -+ if (option == 0) -+ { -+ /* The first option is always the file name */ -+ len = s - t; -+ if (len > 255) -+ len = 255; -+ strncpy(source_file, t, len); -+ source_file[len] = '\0'; -+ } -+ else if (strncmp("caller", t, s - t) == 0) -+ { -+ calling_party = TRUE; -+ } -+ else if (strncmp("debug", t, s - t) == 0) -+ { -+ verbose = TRUE; -+ } -+ } -+ -+ /* Done parsing */ -+ -+ LOCAL_USER_ADD(u); -+ -+ if (chan->_state != AST_STATE_UP) -+ { -+ /* Shouldn't need this, but checking to see if channel is already answered -+ * Theoretically asterisk should already have answered before running the app */ -+ res = ast_answer(chan); -+ } -+ -+ if (!res) -+ { -+ original_read_fmt = chan->readformat; -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n"); -+ return -1; -+ } -+ } -+ original_write_fmt = chan->writeformat; -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n"); -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ return -1; -+ } -+ } -+ fax_init(&fax, calling_party, NULL); -+ if (verbose) -+ fax.logging.level = SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW; -+ -+ x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"); -+ if (x && x[0]) -+ t30_set_local_ident(&fax, x); -+ x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO"); -+ if (x && x[0]) -+ t30_set_header_info(&fax, x); -+ t30_set_tx_file(&fax, source_file, -1, -1); -+ //t30_set_phase_b_handler(&fax, phase_b_handler, chan); -+ //t30_set_phase_d_handler(&fax, phase_d_handler, chan); -+ t30_set_phase_e_handler(&fax, phase_e_handler, chan); -+ while (ast_waitfor(chan, -1) > -1) -+ { -+ inf = ast_read(chan); -+ if (inf == NULL) -+ { -+ res = -1; -+ break; -+ } -+ if (inf->frametype == AST_FRAME_VOICE) -+ { -+ if (fax_rx(&fax, inf->data, inf->samples)) -+ break; -+ samples = (inf->samples <= MAX_BLOCK_SIZE) ? inf->samples : MAX_BLOCK_SIZE; -+ len = fax_tx(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples); -+ if (len) -+ { -+ memset(&outf, 0, sizeof(outf)); -+ outf.frametype = AST_FRAME_VOICE; -+ outf.subclass = AST_FORMAT_SLINEAR; -+ outf.datalen = len*sizeof(int16_t); -+ outf.samples = len; -+ outf.data = &buf[AST_FRIENDLY_OFFSET]; -+ outf.offset = AST_FRIENDLY_OFFSET; -+ if (ast_write(chan, &outf) < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno)); -+ break; -+ } -+ } -+ } -+ ast_frfree(inf); -+ } -+ if (inf == NULL) -+ { -+ ast_log(LOG_DEBUG, "Got hangup\n"); -+ res = -1; -+ } -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ } -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, original_write_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name); -+ } -+ fax_release(&fax); -+ } -+ else -+ { -+ ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name); -+ } -+ LOCAL_USER_REMOVE(u); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int unload_module(void) -+{ -+ STANDARD_HANGUP_LOCALUSERS; -+ return ast_unregister_application(app); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int load_module(void) -+{ -+ return ast_register_application(app, txfax_exec, synopsis, descrip); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+char *description(void) -+{ -+ return tdesc; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int usecount(void) -+{ -+ int res; -+ -+ STANDARD_USECOUNT(res); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+char *key(void) -+{ -+ return ASTERISK_GPL_KEY; -+} -+/*- End of function --------------------------------------------------------*/ -+/*- End of file ------------------------------------------------------------*/ diff --git a/net/asterisk-bristuff/files/patch-cdr::Makefile b/net/asterisk-bristuff/files/patch-cdr::Makefile deleted file mode 100644 index ff9bae81cfd4..000000000000 --- a/net/asterisk-bristuff/files/patch-cdr::Makefile +++ /dev/null @@ -1,71 +0,0 @@ ---- cdr/Makefile.orig Thu Sep 21 17:18:19 2006 -+++ cdr/Makefile Thu Oct 19 10:52:51 2006 -@@ -21,8 +21,8 @@ - endif - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -+ SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. -@@ -38,21 +38,21 @@ - # - # unixODBC stuff... - # --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/odbcinst.h),) - MODS+=cdr_odbc.so - endif - - # - # FreeTDS stuff... - # --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),) -- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.64),1) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),) -+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.64),1) - CFLAGS += -DFREETDS_0_64 - else -- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1) -+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1) - CFLAGS += -DFREETDS_0_63 - else -- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.62),1) -+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.62),1) - CFLAGS += -DFREETDS_0_62 - else - CFLAGS += -DFREETDS_PRE_0_62 -@@ -65,7 +65,7 @@ - # - # PGSQL stuff... Autoconf anyone?? - # --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) - MODS+=cdr_pgsql.so - endif - -@@ -86,9 +86,9 @@ - MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib/pgsql - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql),) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/pgsql -- MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib/pgsql -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql),) -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql -+ MLFLAGS+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/pgsql - endif - - ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include),) -@@ -114,7 +114,7 @@ - all: depend $(MODS) - - install: all -- for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - clean: - rm -f *.so *.o .depend diff --git a/net/asterisk-bristuff/files/patch-channels-chan_skinny.c b/net/asterisk-bristuff/files/patch-channels-chan_skinny.c deleted file mode 100644 index 043067a1ce6e..000000000000 --- a/net/asterisk-bristuff/files/patch-channels-chan_skinny.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD: /tmp/pcvs/ports/net/asterisk-bristuff/files/Attic/patch-channels-chan_skinny.c,v 1.1 2006-07-24 16:25:46 fjoe Exp $ - ---- channels/chan_skinny.c.orig -+++ channels/chan_skinny.c -@@ -99,7 +99,7 @@ - #define htolel(x) (x) - #define htoles(x) (x) - #else --#if defined(SOLARIS) || defined(__Darwin__) || defined(__NetBSD__) -+#if defined(SOLARIS) || defined(__Darwin__) || defined(__NetBSD__) || defined(__FreeBSD__) - #define __bswap_16(x) \ - ((((x) & 0xff00) >> 8) | \ - (((x) & 0x00ff) << 8)) diff --git a/net/asterisk-bristuff/files/patch-channels::Makefile b/net/asterisk-bristuff/files/patch-channels::Makefile index baed903e8574..fa5a90a988fa 100644 --- a/net/asterisk-bristuff/files/patch-channels::Makefile +++ b/net/asterisk-bristuff/files/patch-channels::Makefile @@ -1,84 +1,51 @@ ---- channels/Makefile.orig Tue Jul 3 23:40:42 2007 -+++ channels/Makefile Tue Jul 3 23:45:45 2007 -@@ -48,8 +48,8 @@ + +$FreeBSD$ + +--- channels/Makefile.orig ++++ channels/Makefile +@@ -32,9 +32,10 @@ endif - ifeq (${OSARCH},FreeBSD) + ifeq ($(OSARCH),FreeBSD) - PTLIB=-lpt_FreeBSD_x86_r - H323LIB=-lh323_FreeBSD_x86_r + PTLIB=-lpt_r + H323LIB=-lh323_r CHANH323LIB=-pthread - endif - -@@ -73,11 +73,11 @@ - SOLINK+=-lrt - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/ixjuser.h),) - CHANNEL_LIBS+=chan_phone.so - endif - --ifneq ($(wildcard h323/libchanh323.a),) -+ifdef WITH_H323 - CHANNEL_LIBS+=chan_h323.so - endif - -@@ -92,12 +92,12 @@ - CHANNEL_LIBS+=chan_alsa.so - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri-bristuff.so.1)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/libpri-bristuff.so.1),) - CFLAGS+=-DZAPATA_PRI -- ZAPPRI=-lpri -+ ZAPPRI=-lpri-bristuff - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/libmfcr2.so.1),) - CFLAGS+=-DZAPATA_R2 - ZAPR2=-lmfcr2 - endif -@@ -115,14 +115,14 @@ - endif - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) - ifeq (${OSARCH},NetBSD) - SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib - endif - ifeq (${OSARCH},FreeBSD) -- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif -- CFLAGS+=-DIAX_TRUNKING -+ CFLAGS+=-DIAX_TRUNKING -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel - CHANNEL_LIBS+=chan_zap.so - endif - endif # WITHOUT_ZAPTEL -@@ -267,8 +267,10 @@ - chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast - $(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) -lstdc++ ++ H323LDLIBS=$(PTLIB) $(H323LIB) $(CHANH323LIB) + endif + + ifeq ($(OSARCH),NetBSD) +@@ -78,12 +79,13 @@ + h323/libchanh323.a h323/Makefile.ast: + $(CMD_PREFIX) $(MAKE) -C h323 + $(CMD_PREFIX) rm -f ../main/asterisk +- $(CMD_PREFIX) echo "***************************************************************" +- $(CMD_PREFIX) echo +- $(CMD_PREFIX) echo "********** Re-run 'make' to pick up H.323 parameters **********" +- $(CMD_PREFIX) echo +- $(CMD_PREFIX) echo "***************************************************************" +- $(CMD_PREFIX) exit 1 ++ $(CMD_PREFIX) $(MAKE) -C . chan_h323.so ++# $(CMD_PREFIX) echo "***************************************************************" ++# $(CMD_PREFIX) echo ++# $(CMD_PREFIX) echo "********** Re-run 'make' to pick up H.323 parameters **********" ++# $(CMD_PREFIX) echo ++# $(CMD_PREFIX) echo "***************************************************************" ++# $(CMD_PREFIX) exit 1 + endif + + dist-clean:: +@@ -113,8 +115,12 @@ else --chan_h323.so: chan_h323.o h323/libchanh323.a -- $(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat -+chan_h323.so: chan_h323.o h323/ast_h323.o -+ $(CXX) $(SOLINK) -o $@ $< h323/ast_h323.o $(CHANH323LIB) -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L/usr/lib -lcrypto -lssl -lexpat -L$(LOCALBASE)/lib -llber -lldap -lldap_r -+h323/ast_h323.o: -+ $(MAKE) -C h323 ast_h323.o + chan_h323.so: chan_h323.o h323/libchanh323.a + $(ECHO_PREFIX) echo " [LD] $^ -> $@" ++ifeq ($(OSARCH),FreeBSD) ++ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB) ++else + $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat endif ++endif - misdn/chan_misdn_lib.a: -@@ -287,8 +289,7 @@ - # $(CC) -rdynamic -shared -Xlinker -x -o $@ $< - - install: all -- for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -- if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi -+ for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend + chan_misdn.o: ASTCFLAGS+=-Imisdn diff --git a/net/asterisk-bristuff/files/patch-channels::chan_h323.c b/net/asterisk-bristuff/files/patch-channels::chan_h323.c deleted file mode 100644 index 4ca048812ecd..000000000000 --- a/net/asterisk-bristuff/files/patch-channels::chan_h323.c +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_h323.c.orig -+++ channels/chan_h323.c -@@ -31,6 +31,7 @@ - * \ingroup channel_drivers - */ - -+#include <sys/types.h> - #include <sys/socket.h> - #include <sys/signal.h> - #include <sys/param.h> diff --git a/net/asterisk-bristuff/files/patch-channels::chan_sip.c b/net/asterisk-bristuff/files/patch-channels::chan_sip.c index d1f186aba8d7..9bb8267ffcc5 100644 --- a/net/asterisk-bristuff/files/patch-channels::chan_sip.c +++ b/net/asterisk-bristuff/files/patch-channels::chan_sip.c @@ -1,127 +1,11 @@ ---- channels/chan_sip.c.orig Sat Jun 3 21:41:59 2006 -+++ channels/chan_sip.c Sat Jun 3 21:43:40 2006 -@@ -337,7 +337,7 @@ - - static char default_language[MAX_LANGUAGE] = ""; - --#define DEFAULT_CALLERID "asterisk" -+#define DEFAULT_CALLERID "Unknown" - static char default_callerid[AST_MAX_EXTENSION] = DEFAULT_CALLERID; - - static char default_fromdomain[AST_MAX_EXTENSION] = ""; -@@ -475,6 +475,7 @@ - - struct sip_route { - struct sip_route *next; -+ int lr; - char hop[0]; - }; - -@@ -6048,6 +6049,7 @@ - /* Make a struct route */ - thishop = malloc(sizeof(*thishop) + len); - if (thishop) { -+ thishop->lr = (strnstr(rr, ";lr", len) != NULL ? 1 : 0); - ast_copy_string(thishop->hop, rr, len); - ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop); - /* Link in */ -@@ -6073,31 +6075,41 @@ - - /* Only append the contact if we are dealing with a strict router */ - if (!head || (!ast_strlen_zero(head->hop) && strstr(head->hop,";lr") == NULL) ) { -- /* 2nd append the Contact: if there is one */ -- /* Can be multiple Contact headers, comma separated values - we just take the first */ -- contact = get_header(req, "Contact"); -- if (!ast_strlen_zero(contact)) { -- ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact); -- /* Look for <: delimited address */ -- c = strchr(contact, '<'); -- if (c) { -- /* Take to > */ -- ++c; -- len = strcspn(c, ">") + 1; -- } else { -- /* No <> - just take the lot */ -- c = contact; -- len = strlen(contact) + 1; -- } -- thishop = malloc(sizeof(*thishop) + len); -+ /* Duplicate first route from the list */ -+ if (head && head->lr) { -+ thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+strlen(head->hop)+1); - if (thishop) { -- ast_copy_string(thishop->hop, c, len); -- thishop->next = NULL; -- /* Goes at the end */ -- if (tail) -- tail->next = thishop; -- else -- head = thishop; -+ memcpy(thishop, head, sizeof(struct sip_route)+strlen(head->hop)+1); -+ thishop->next = head; -+ head = thishop; -+ } -+ } else { -+ /* Append the Contact: if there is one and first route is w/o `lr' param */ -+ /* Can be multiple Contact headers, comma separated values - we just take the first */ -+ contact = get_header(req, "Contact"); -+ if (!ast_strlen_zero(contact)) { -+ ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact); -+ /* Look for <: delimited address */ -+ c = strchr(contact, '<'); -+ if (c) { -+ /* Take to > */ -+ ++c; -+ len = strcspn(c, ">") + 1; -+ } else { -+ /* No <> - just take the lot */ -+ c = contact; -+ len = strlen(contact) + 1; -+ } -+ thishop = malloc(sizeof(*thishop) + len); -+ if (thishop) { -+ ast_copy_string(thishop->hop, c, len); -+ thishop->next = NULL; -+ /* Goes at the end */ -+ if (tail) -+ tail->next = thishop; -+ else -+ head = thishop; -+ } - } - } - } -@@ -10440,7 +10452,11 @@ - gotdest = get_destination(p, NULL); - - get_rdnis(p, NULL); -- extract_uri(p, req); -+ build_route(p, req, 0); -+ if (!p->route->lr) -+ strncpy(p->uri, p->route->hop, sizeof(p->uri) - 1); -+ else -+ extract_uri(p, req); - build_contact(p); - - if (gotdest) { -@@ -10468,7 +10484,6 @@ - c = sip_new(p, AST_STATE_DOWN, ast_strlen_zero(p->username) ? NULL : p->username ); - *recount = 1; - /* Save Record-Route for any later requests we make on this dialogue */ -- build_route(p, req, 0); - if (c) { - /* Pre-lock the call */ - ast_mutex_lock(&c->lock); -@@ -10554,6 +10569,12 @@ - transmit_response(p, "180 Ringing", req); - break; - case AST_STATE_UP: -+ /* Assuming this to be reinvite, process new SDP portion */ -+ if (!ast_strlen_zero(get_header(req, "Content-Type"))) { -+ process_sdp(p, req); -+ } else { -+ ast_log(LOG_DEBUG, "Hm.... No sdp for the moment\n"); -+ } - transmit_response_with_sdp(p, "200 OK", req, 1); - break; - default: +--- channels/chan_sip.c.orig 2008-06-10 00:46:46.000000000 -0700 ++++ channels/chan_sip.c 2008-06-10 00:46:46.000000000 -0700 +@@ -496,7 +496,7 @@ + #define DEFAULT_MOHINTERPRET "default" + #define DEFAULT_MOHSUGGEST "" + #define DEFAULT_VMEXTEN "asterisk" +-#define DEFAULT_CALLERID "asterisk" ++#define DEFAULT_CALLERID "Unknown" + #define DEFAULT_NOTIFYMIME "application/simple-message-summary" + #define DEFAULT_MWITIME 10 + #define DEFAULT_ALLOWGUEST TRUE diff --git a/net/asterisk-bristuff/files/patch-channels::chan_zap.c b/net/asterisk-bristuff/files/patch-channels::chan_zap.c deleted file mode 100644 index ab02c02af962..000000000000 --- a/net/asterisk-bristuff/files/patch-channels::chan_zap.c +++ /dev/null @@ -1,80 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_zap.c.orig Tue Nov 29 20:24:39 2005 -+++ channels/chan_zap.c Fri Jan 13 13:28:33 2006 -@@ -638,6 +638,7 @@ static struct zt_pvt { - int cidlen; - int ringt; - int ringt_base; -+ int waitnorings; - int stripmsd; - int callwaitcas; - int callwaitrings; -@@ -2308,6 +2309,19 @@ static int zt_hangup(struct ast_channel - } - - ast_mutex_lock(&p->lock); -+ switch (p->sig) { -+ case SIG_FXSGS: -+ case SIG_FXSKS: -+ case SIG_FXSLS: -+ if((ast->_state == AST_STATE_RING) && (p->ringt > 1)) -+ { -+ p->waitnorings = 1; -+ } -+ break; -+ default: -+ break; -+ }; -+ - - index = zt_get_index(ast, p, 1); - -@@ -6129,7 +6143,37 @@ static void *ss_thread(void *data) - ast_setstate(chan, AST_STATE_RING); - chan->rings = 1; - p->ringt = p->ringt_base; -+ p->waitnorings = 0; - res = ast_pbx_run(chan); -+ -+ if(p->waitnorings) -+ { -+ p->ringt = p->ringt_base; -+ for(;;) -+ { -+ int i,j=0; -+ i = ZT_IOMUX_SIGEVENT | ZT_IOMUX_NOWAIT; -+ if (ioctl(p->subs[index].zfd, ZT_IOMUX, &i) == -1) -+ break; -+ -+ if (ioctl(p->subs[index].zfd, ZT_GETEVENT, &j) == -1) -+ break; -+ -+ if(j == ZT_EVENT_RINGOFFHOOK) -+ p->ringt = p->ringt_base; -+ -+ usleep(20000); -+ -+ if (p->ringt <= 0) -+ break; -+ -+ else if (p->ringt > 0) -+ p->ringt--; -+ } -+ p->ringt = 0; -+ p->waitnorings = 0; -+ } -+ - if (res) { - ast_hangup(chan); - ast_log(LOG_WARNING, "PBX exited non-zero\n"); -@@ -6431,7 +6475,7 @@ static void *do_monitor(void *data) - i = iflist; - while(i) { - if ((i->subs[SUB_REAL].zfd > -1) && i->sig && (!i->radio)) { -- if (!i->owner && !i->subs[SUB_REAL].owner) { -+ if (!i->owner && !i->subs[SUB_REAL].owner && !i->waitnorings) { - /* This needs to be watched, as it lacks an owner */ - pfds[count].fd = i->subs[SUB_REAL].zfd; - pfds[count].events = POLLPRI; diff --git a/net/asterisk-bristuff/files/patch-channels_h323_Makefile.in b/net/asterisk-bristuff/files/patch-channels_h323_Makefile.in new file mode 100644 index 000000000000..70b05b3e0d98 --- /dev/null +++ b/net/asterisk-bristuff/files/patch-channels_h323_Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD: /tmp/pcvs/ports/net/asterisk-bristuff/files/Attic/patch-channels_h323_Makefile.in,v 1.1 2009-09-16 19:33:37 fjoe Exp $ + +--- channels/h323/Makefile.in ++++ channels/h323/Makefile.in +@@ -13,7 +13,7 @@ + STDCCFLAGS += -I../../include -include ../../include/asterisk/autoconfig.h + STDCCFLAGS += -fPIC + #OPTCCFLAGS += +-CFLAGS = -pipe ++CFLAGS = -pipe @CXXFLAGS@ + TARGET = libchanh323.a + TARGET += Makefile.ast + SOURCES = ast_h323.cxx compat_h323.cxx cisco-h225.cxx caps_h323.cxx diff --git a/net/asterisk-bristuff/files/patch-codecs::Makefile b/net/asterisk-bristuff/files/patch-codecs::Makefile deleted file mode 100644 index ab5cbc4aef2c..000000000000 --- a/net/asterisk-bristuff/files/patch-codecs::Makefile +++ /dev/null @@ -1,53 +0,0 @@ - -$FreeBSD$ - ---- codecs/Makefile.orig Tue Nov 29 20:24:39 2005 -+++ codecs/Makefile Fri Jan 13 10:33:21 2006 -@@ -30,8 +30,8 @@ - - UI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex.h) - UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h) --ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex.h) --ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex/speex.h) -+ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex.h) -+ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex/speex.h) - ifneq (${UI_SPEEX},) - MODSPEEX=codec_speex.so - LIBSPEEX+=-lspeex -lm -@@ -43,14 +43,14 @@ - endif - ifneq (${ULI_SPEEX},) - MODSPEEX=codec_speex.so -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -- LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -+ LIBSPEEX=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - LIBSPEEX+=-lspeex -lm - endif - ifneq (${ULIS_SPEEX},) - MODSPEEX=codec_speex.so -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/speex -- LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex -+ LIBSPEEX=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - LIBSPEEX+=-lspeex -lm - endif - -@@ -65,7 +65,7 @@ - LIBLPC10=lpc10/liblpc10.a - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \ -@@ -126,7 +126,7 @@ - endif - - install: all -- for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(CODECS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk-bristuff/files/patch-codecs::gsm::Makefile b/net/asterisk-bristuff/files/patch-codecs::gsm::Makefile deleted file mode 100644 index 756d43ca6fcd..000000000000 --- a/net/asterisk-bristuff/files/patch-codecs::gsm::Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- codecs/gsm/Makefile.orig Tue May 30 22:18:30 2006 -+++ codecs/gsm/Makefile Wed Jun 14 14:07:42 2006 -@@ -51,7 +51,7 @@ - ifneq (${PROC},ppc) - ifneq (${PROC},ppc64) - ifneq (${PROC},s390) --OPTIMIZE+=-march=$(PROC) -+#OPTIMIZE+=-march=$(PROC) - endif - endif - endif diff --git a/net/asterisk-bristuff/files/patch-codecs::ilbc::Makefile b/net/asterisk-bristuff/files/patch-codecs::ilbc::Makefile deleted file mode 100644 index 26a2f20e5529..000000000000 --- a/net/asterisk-bristuff/files/patch-codecs::ilbc::Makefile +++ /dev/null @@ -1,12 +0,0 @@ - -$FreeBSD$ - ---- codecs/ilbc/Makefile.orig Fri Jan 13 11:01:07 2006 -+++ codecs/ilbc/Makefile Fri Jan 13 11:01:51 2006 -@@ -1,5 +1,5 @@ - ARCH=$(PROC) --CFLAGS+=-Wall -O3 -funroll-loops -+CFLAGS+=-Wall -funroll-loops - ifneq (${OSARCH},CYGWIN) - CFLAGS += -fPIC - endif diff --git a/net/asterisk-bristuff/files/patch-configs::musiconhold.conf.sample b/net/asterisk-bristuff/files/patch-configs::musiconhold.conf.sample deleted file mode 100644 index ff63cc9ff08b..000000000000 --- a/net/asterisk-bristuff/files/patch-configs::musiconhold.conf.sample +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- configs/musiconhold.conf.sample.orig Tue Nov 29 20:24:39 2005 -+++ configs/musiconhold.conf.sample Fri Jan 13 11:38:39 2006 -@@ -4,7 +4,7 @@ - - [default] - mode=quietmp3 --directory=/var/lib/asterisk/mohmp3 -+directory=/usr/local/share/asterisk/mohmp3 - - ; valid mode options: - ; quietmp3 -- default diff --git a/net/asterisk-bristuff/files/patch-configure b/net/asterisk-bristuff/files/patch-configure new file mode 100644 index 000000000000..0782453c279b --- /dev/null +++ b/net/asterisk-bristuff/files/patch-configure @@ -0,0 +1,36 @@ +--- configure.orig 2009-04-27 22:29:46.000000000 +0300 ++++ configure 2009-05-26 12:59:22.000000000 +0300 +@@ -4064,8 +4064,6 @@ + case "${host_os}" in + freebsd*) + ac_default_prefix=/usr/local +- CPPFLAGS=-I/usr/local/include +- LDFLAGS=-L/usr/local/lib + ;; + darwin*) + +@@ -27145,7 +27143,7 @@ + + fi + +- PLATFORM_OPENH323="h323_${PWLIB_PLATFORM}_${OPENH323_SUFFIX}" ++ PLATFORM_OPENH323="h323_${OPENH323_SUFFIX}" + + if test "${HAS_OPENH323:-unset}" != "unset"; then + { $as_echo "$as_me:$LINENO: checking OpenH323 installation validity" >&5 +@@ -31624,6 +31622,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++#include <ptlib.h> + #include <h323.h> + _ACEOF + rm -f conftest.$ac_objext +@@ -31665,6 +31664,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#include <ptlib.h> + #include <h323.h> + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" diff --git a/net/asterisk-bristuff/files/patch-formats::Makefile b/net/asterisk-bristuff/files/patch-formats::Makefile deleted file mode 100644 index b2b1db5a37bd..000000000000 --- a/net/asterisk-bristuff/files/patch-formats::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- formats/Makefile.orig Fri Jan 13 11:16:07 2006 -+++ formats/Makefile Fri Jan 13 11:47:25 2006 -@@ -20,7 +20,7 @@ - # - # G723 simple frame is deprecated - # --FORMAT_LIBS+=format_g723.so -+FORMAT_LIBS+=format_g723_1.so - - # - # OGG/Vorbis format -@@ -60,7 +60,7 @@ - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm - - install: all -- for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(FORMAT_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk-bristuff/files/patch-formats::format_g723_1.c b/net/asterisk-bristuff/files/patch-formats::format_g723_1.c deleted file mode 100644 index ae814f197a1e..000000000000 --- a/net/asterisk-bristuff/files/patch-formats::format_g723_1.c +++ /dev/null @@ -1,354 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Fri Jan 13 12:18:51 2006 -+++ formats/format_g723_1.c Fri Jan 13 12:18:41 2006 -@@ -0,0 +1,348 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Save and read raw, headerless G723.1 Annex A data. -+ * -+ * Copyright (C) 1999, Mark Spencer <markster@linux-support.net> -+ * Copyright (C) 2003, Maxim Sobolev <sobomax@FreeBSD.org> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <stdio.h> -+#include <asterisk/lock.h> -+#include <asterisk/channel.h> -+#include <asterisk/file.h> -+#include <asterisk/logger.h> -+#include <asterisk/sched.h> -+#include <asterisk/module.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> -+#include <stdlib.h> -+#include <sys/time.h> -+#include <unistd.h> -+#include <errno.h> -+#include <string.h> -+#include <pthread.h> -+#ifdef __linux__ -+#include <endian.h> -+#else -+#include <machine/endian.h> -+#endif -+ -+/* Based on format_g729.c */ -+ -+#define TYPE_HIGH 0x0 -+#define TYPE_LOW 0x1 -+#define TYPE_SILENCE 0x2 -+#define TYPE_DONTSEND 0x3 -+#define TYPE_MASK 0x3 -+ -+struct ast_filestream { -+ void *reserved[AST_RESERVED_POINTERS]; -+ /* This is what a filestream means to us */ -+ FILE *f; /* Descriptor */ -+ struct ast_frame fr; /* Frame information */ -+ char waste[AST_FRIENDLY_OFFSET]; /* Buffer for sending frames, etc */ -+ char empty; /* Empty character */ -+ unsigned char g723[24]; /* One Real G723.1 Frame */ -+}; -+ -+static long g723_tell(struct ast_filestream *); -+ -+AST_MUTEX_DEFINE_STATIC(g723_lock); -+static int glistcnt = 0; -+ -+static char *name = "g723"; -+static char *desc = "Raw G723.1 Annex A data"; -+static char *exts = "g723"; -+ -+static int g723_len(unsigned char buf) -+{ -+ switch(buf & TYPE_MASK) { -+ case TYPE_DONTSEND: -+ return 2; -+ break; -+ case TYPE_SILENCE: -+ return 4; -+ break; -+ case TYPE_HIGH: -+ return 24; -+ break; -+ case TYPE_LOW: -+ return 20; -+ break; -+ default: -+ ast_log(LOG_WARNING, "Badly encoded G723.1 frame (%d)\n", buf & TYPE_MASK); -+ } -+ return -1; -+} -+ -+static struct ast_filestream *g723_open(FILE *f) -+{ -+ /* We don't have any header to read or anything really, but -+ if we did, it would go here. We also might want to check -+ and be sure it's a valid file. */ -+ struct ast_filestream *tmp; -+ if ((tmp = malloc(sizeof(struct ast_filestream)))) { -+ memset(tmp, 0, sizeof(struct ast_filestream)); -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ free(tmp); -+ return NULL; -+ } -+ tmp->f = f; -+ tmp->fr.data = tmp->g723; -+ tmp->fr.frametype = AST_FRAME_VOICE; -+ tmp->fr.subclass = AST_FORMAT_G723_1; -+ /* datalen will vary for each frame */ -+ tmp->fr.src = name; -+ tmp->fr.mallocd = 0; -+ glistcnt++; -+ ast_mutex_unlock(&g723_lock); -+ ast_update_use_count(); -+ } -+ return tmp; -+} -+ -+static struct ast_filestream *g723_rewrite(FILE *f, const char *comment) -+{ -+ /* We don't have any header to read or anything really, but -+ if we did, it would go here. We also might want to check -+ and be sure it's a valid file. */ -+ struct ast_filestream *tmp; -+ if ((tmp = malloc(sizeof(struct ast_filestream)))) { -+ memset(tmp, 0, sizeof(struct ast_filestream)); -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ free(tmp); -+ return NULL; -+ } -+ tmp->f = f; -+ glistcnt++; -+ ast_mutex_unlock(&g723_lock); -+ ast_update_use_count(); -+ } else -+ ast_log(LOG_WARNING, "Out of memory\n"); -+ return tmp; -+} -+ -+static void g723_close(struct ast_filestream *s) -+{ -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ return; -+ } -+ glistcnt--; -+ ast_mutex_unlock(&g723_lock); -+ ast_update_use_count(); -+ fclose(s->f); -+ free(s); -+ s = NULL; -+} -+ -+static struct ast_frame *g723_read(struct ast_filestream *s, int *whennext) -+{ -+ int res; -+ /* Send a frame from the file to the appropriate channel */ -+ s->fr.frametype = AST_FRAME_VOICE; -+ s->fr.subclass = AST_FORMAT_G723_1; -+ s->fr.offset = AST_FRIENDLY_OFFSET; -+ s->fr.samples = 240; -+ s->fr.mallocd = 0; -+ s->fr.data = s->g723; -+ if ((res = fread(s->g723, 1, 1, s->f)) != 1) { -+ if (res) -+ ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); -+ return NULL; -+ } -+ s->fr.datalen = g723_len(s->g723[0]); -+ if (s->fr.datalen < 0) { -+ ast_log(LOG_WARNING, "Invalid G723.1 frame!\n"); -+ return NULL; -+ } -+ if (s->fr.datalen > 1 && (res = fread(s->g723 + 1, 1, s->fr.datalen - 1, s->f)) != s->fr.datalen - 1) { -+ if (res) -+ ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); -+ return NULL; -+ } -+ *whennext = s->fr.samples; -+ return &s->fr; -+} -+ -+static int g723_write(struct ast_filestream *fs, struct ast_frame *f) -+{ -+ int res; -+ unsigned char *cp; -+ if (f->frametype != AST_FRAME_VOICE) { -+ ast_log(LOG_WARNING, "Asked to write non-voice frame!\n"); -+ return -1; -+ } -+ if (f->subclass != AST_FORMAT_G723_1) { -+ ast_log(LOG_WARNING, "Asked to write non-G723.1 frame (%d)!\n", f->subclass); -+ return -1; -+ } -+ for (cp = f->data; cp < (unsigned char *)f->data + f->datalen; cp += res) { -+ res = g723_len(cp[0]); -+ if (res < 0) { -+ ast_log(LOG_WARNING, "Asked to write invalid G723.1 frame!\n"); -+ return -1; -+ } -+ } -+ if (cp != (unsigned char *)f->data + f->datalen) { -+ ast_log(LOG_WARNING, "Invalid G723.1 data length, %d\n", f->datalen); -+ return -1; -+ } -+ if ((res = fwrite(f->data, 1, f->datalen, fs->f)) != f->datalen) { -+ ast_log(LOG_WARNING, "Bad write %d: %s\n", res, strerror(errno)); -+ return -1; -+ } -+ return 0; -+} -+ -+static char *g723_getcomment(struct ast_filestream *s) -+{ -+ return NULL; -+} -+ -+static int g723_seek(struct ast_filestream *fs, long sample_offset, int whence) -+{ -+ long cur, offset, max; -+ off_t coffset, moffset, soffset; -+ int res; -+ unsigned char c; -+ -+ offset = 0; /* Shut up gcc warning */ -+ if (whence == SEEK_SET) { -+ offset = sample_offset; -+ } else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) { -+ if ((cur = g723_tell(fs)) == -1) { -+ ast_log(LOG_WARNING, "Can't get current position!\n"); -+ return -1; -+ } -+ offset = cur + sample_offset; -+ } -+ if (fseeko(fs->f, 0, SEEK_END) == -1) { -+ ast_log(LOG_WARNING, "Can't seek stream to an end!\n"); -+ return -1; -+ } -+ else { -+ moffset = ftello(fs->f); -+ } -+ if (whence == SEEK_END) { -+ if ((max = g723_tell(fs)) == -1) { -+ ast_log(LOG_WARNING, "Can't get maximum position!\n"); -+ return -1; -+ } -+ offset = max - sample_offset; -+ } -+ if (offset < 0) -+ offset = 0; -+ soffset = -1; -+ for (coffset = 0; coffset < moffset && offset > 0; coffset += res) { -+ if (fseeko(fs->f, coffset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", coffset); -+ return -1; -+ } -+ if (fread(&c, 1, 1, fs->f) != 1) { -+ ast_log(LOG_WARNING, "Can't read from offset %lli!\n", coffset); -+ return -1; -+ } -+ soffset = coffset; -+ if ((res = g723_len(c)) < 0) { -+ ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %lli!\n", coffset); -+ return -1; -+ } -+ if (res > 1) -+ offset -= 240; -+ } -+ if (soffset != -1 && fseeko(fs->f, soffset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", soffset); -+ return -1; -+ } -+ -+ return 0; -+} -+ -+static int g723_trunc(struct ast_filestream *fs) -+{ -+ /* Truncate file to current length */ -+ if (ftruncate(fileno(fs->f), ftello(fs->f)) < 0) -+ return -1; -+ return 0; -+} -+ -+static long g723_tell(struct ast_filestream *fs) -+{ -+ off_t offset, coffset; -+ int res; -+ long rval; -+ unsigned char c; -+ -+ offset = ftello(fs->f); -+ rval = 0; -+ for (coffset = 0; coffset < offset; coffset += res) { -+ if (fseeko(fs->f, coffset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", coffset); -+ return -1; -+ } -+ if (fread(&c, 1, 1, fs->f) != 1) { -+ ast_log(LOG_WARNING, "Can't read from offset %llu!\n", coffset); -+ return -1; -+ } -+ if ((res = g723_len(c)) < 0) { -+ ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %llu!\n", coffset); -+ return -1; -+ } -+ if (res > 1) -+ rval += 240; -+ } -+ if (fseeko(fs->f, offset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", offset); -+ return -1; -+ } -+ return rval; -+} -+ -+int load_module() -+{ -+ return ast_format_register(name, exts, AST_FORMAT_G723_1, -+ g723_open, -+ g723_rewrite, -+ g723_write, -+ g723_seek, -+ g723_trunc, -+ g723_tell, -+ g723_read, -+ g723_close, -+ g723_getcomment); -+} -+ -+int unload_module() -+{ -+ return ast_format_unregister(name); -+} -+ -+int usecount() -+{ -+ int res; -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ return -1; -+ } -+ res = glistcnt; -+ ast_mutex_unlock(&g723_lock); -+ return res; -+} -+ -+char *description() -+{ -+ return desc; -+} -+ -+ -+char *key() -+{ -+ return ASTERISK_GPL_KEY; -+} diff --git a/net/asterisk-bristuff/files/patch-formats::format_g729.c b/net/asterisk-bristuff/files/patch-formats::format_g729.c deleted file mode 100644 index 11be5281608f..000000000000 --- a/net/asterisk-bristuff/files/patch-formats::format_g729.c +++ /dev/null @@ -1,47 +0,0 @@ - -$FreeBSD$ - ---- formats/format_g729.c.orig Fri Jan 13 12:20:53 2006 -+++ formats/format_g729.c Fri Jan 13 12:23:33 2006 -@@ -60,7 +60,7 @@ struct ast_filestream { - struct ast_frame fr; /* Frame information */ - char waste[AST_FRIENDLY_OFFSET]; /* Buffer for sending frames, etc */ - char empty; /* Empty character */ -- unsigned char g729[20]; /* Two Real G729 Frames */ -+ unsigned char g729[10]; /* One Real G729 Frame */ - }; - - -@@ -141,11 +141,11 @@ static struct ast_frame *g729_read(struc - s->fr.frametype = AST_FRAME_VOICE; - s->fr.subclass = AST_FORMAT_G729A; - s->fr.offset = AST_FRIENDLY_OFFSET; -- s->fr.samples = 160; -- s->fr.datalen = 20; -+ s->fr.samples = 80; -+ s->fr.datalen = 10; - s->fr.mallocd = 0; - s->fr.data = s->g729; -- if ((res = fread(s->g729, 1, 20, s->f)) != 20) { -+ if ((res = fread(s->g729, 1, 10, s->f)) != 10) { - if (res && (res != 10)) - ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); - return NULL; -@@ -190,7 +190,7 @@ static int g729_seek(struct ast_filestre - fseek(fs->f, 0, SEEK_END); - max = ftell(fs->f); - -- bytes = 20 * (sample_offset / 160); -+ bytes = 10 * (sample_offset / 80); - if (whence == SEEK_SET) - offset = bytes; - else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) -@@ -219,7 +219,7 @@ static long g729_tell(struct ast_filestr - { - off_t offset; - offset = ftell(fs->f); -- return (offset/20)*160; -+ return (offset/10)*80; - } - - int load_module() diff --git a/net/asterisk-bristuff/files/patch-frame.c b/net/asterisk-bristuff/files/patch-frame.c deleted file mode 100644 index 753253c7af0d..000000000000 --- a/net/asterisk-bristuff/files/patch-frame.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- frame.c.orig Wed Jan 25 13:22:43 2006 -+++ frame.c Wed Jan 25 13:21:25 2006 -@@ -1170,7 +1170,7 @@ static int g723_len(unsigned char buf) - { - switch(buf & TYPE_MASK) { - case TYPE_DONTSEND: -- return 0; -+ return 2; - break; - case TYPE_SILENCE: - return 4; diff --git a/net/asterisk-bristuff/files/patch-funcs::Makefile b/net/asterisk-bristuff/files/patch-funcs::Makefile deleted file mode 100644 index a14daeed285c..000000000000 --- a/net/asterisk-bristuff/files/patch-funcs::Makefile +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- funcs/Makefile.orig Tue Nov 29 20:24:39 2005 -+++ funcs/Makefile Fri Jan 13 12:36:57 2006 -@@ -67,7 +67,7 @@ - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} - - install: all -- for x in $(FUNCS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(FUNCS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - ifneq ($(wildcard .depend),) - include .depend diff --git a/net/asterisk-bristuff/files/patch-main::Makefile b/net/asterisk-bristuff/files/patch-main::Makefile new file mode 100644 index 000000000000..418714ab7f21 --- /dev/null +++ b/net/asterisk-bristuff/files/patch-main::Makefile @@ -0,0 +1,36 @@ +--- main/Makefile.orig 2009-04-09 07:31:38.000000000 +0300 ++++ main/Makefile 2009-05-26 13:07:50.000000000 +0300 +@@ -92,8 +92,8 @@ + cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(ASTCFLAGS:-Werror=))" LDFLAGS="$(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR) + $(MAKE) -C editline libedit.a + +-db1-ast/libdb1.a: +- CFLAGS="$(subst $(ASTTOPDIR),../../,$(ASTCFLAGS))" LDFLAGS="$(ASTLDFLAGS)" $(MAKE) -C db1-ast libdb1.a ++#db1-ast/libdb1.a: ++# CFLAGS="$(subst $(ASTTOPDIR),../../,$(ASTCFLAGS))" LDFLAGS="$(ASTLDFLAGS)" $(MAKE) -C db1-ast libdb1.a + + ast_expr2.c ast_expr2.h: + bison -o $@ -d --name-prefix=ast_yy ast_expr2.y +@@ -127,18 +127,18 @@ + H323LDLIBS= + endif + +-asterisk: $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) asterisk.exports ++asterisk: $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) asterisk.exports + @$(ASTTOPDIR)/build_tools/make_build_h > $(ASTTOPDIR)/include/asterisk/build.h.tmp + @if cmp -s $(ASTTOPDIR)/include/asterisk/build.h.tmp $(ASTTOPDIR)/include/asterisk/build.h ; then echo ; else \ + mv $(ASTTOPDIR)/include/asterisk/build.h.tmp $(ASTTOPDIR)/include/asterisk/build.h ; \ + fi + @rm -f $(ASTTOPDIR)/include/asterisk/build.h.tmp + @$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c +- $(ECHO_PREFIX) echo " [LD] $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -> $@" ++ $(ECHO_PREFIX) echo " [LD] $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) -> $@" + ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) +- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) ++ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) + else +- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) ++ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) + endif + + clean:: diff --git a/net/asterisk-bristuff/files/patch-db.c b/net/asterisk-bristuff/files/patch-main::db.c index ba7f3f206b78..653f7f534309 100644 --- a/net/asterisk-bristuff/files/patch-db.c +++ b/net/asterisk-bristuff/files/patch-main::db.c @@ -1,8 +1,8 @@ -$FreeBSD$ +$FreeBSD: /tmp/pcvs/ports/net/asterisk-bristuff/files/Attic/patch-main::db.c,v 1.1 2009-09-16 19:33:37 fjoe Exp $ ---- db.c.orig Fri Jan 13 11:05:32 2006 -+++ db.c Fri Jan 13 11:06:55 2006 +--- main/db.c.orig Fri Jan 13 11:05:32 2006 ++++ main/db.c Fri Jan 13 11:06:55 2006 @@ -35,6 +35,7 @@ #include <errno.h> #include <unistd.h> diff --git a/net/asterisk-bristuff/files/patch-main::frame.c b/net/asterisk-bristuff/files/patch-main::frame.c new file mode 100644 index 000000000000..93d1baa6a3f3 --- /dev/null +++ b/net/asterisk-bristuff/files/patch-main::frame.c @@ -0,0 +1,14 @@ + +$FreeBSD: /tmp/pcvs/ports/net/asterisk-bristuff/files/Attic/patch-main::frame.c,v 1.1 2009-09-16 19:33:37 fjoe Exp $ + +--- main/frame.c.orig Wed Jan 25 13:22:43 2006 ++++ main/frame.c Wed Jan 25 13:21:25 2006 +@@ -1170,7 +1170,7 @@ static int g723_len(unsigned char buf) + { + switch(buf & TYPE_MASK) { + case TYPE_DONTSEND: +- return 0; ++ return 2; + break; + case TYPE_SILENCE: + return 4; diff --git a/net/asterisk-bristuff/files/patch-main::utils.c b/net/asterisk-bristuff/files/patch-main::utils.c new file mode 100644 index 000000000000..e2c43ab89109 --- /dev/null +++ b/net/asterisk-bristuff/files/patch-main::utils.c @@ -0,0 +1,16 @@ + +$FreeBSD: /tmp/pcvs/ports/net/asterisk-bristuff/files/Attic/patch-main::utils.c,v 1.1 2009-09-16 19:33:37 fjoe Exp $ + +--- main/utils.c.orig ++++ main/utils.c +@@ -914,8 +914,8 @@ + pthread_attr_init(attr); + } + +-#ifdef __linux__ +- /* On Linux, pthread_attr_init() defaults to PTHREAD_EXPLICIT_SCHED, ++#if defined(__linux__) || defined(__FreeBSD__) ++ /* On Linux and FreeBSD, pthread_attr_init() defaults to PTHREAD_EXPLICIT_SCHED, + which is kind of useless. Change this here to + PTHREAD_INHERIT_SCHED; that way the -p option to set realtime + priority will propagate down to new threads by default. diff --git a/net/asterisk-bristuff/files/patch-pbx::Makefile b/net/asterisk-bristuff/files/patch-pbx::Makefile deleted file mode 100644 index 97d03e10f871..000000000000 --- a/net/asterisk-bristuff/files/patch-pbx::Makefile +++ /dev/null @@ -1,25 +0,0 @@ - -$FreeBSD$ - ---- pbx/Makefile.orig -+++ pbx/Makefile -@@ -23,8 +23,8 @@ - # Add KDE Console if appropriate - #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so") - --GTK_FLAGS=`${CROSS_COMPILE_BIN}gtk-config --cflags gthread` --GTK_LIBS=`${CROSS_COMPILE_BIN}gtk-config --libs gthread` -+#GTK_FLAGS=`${CROSS_COMPILE_BIN}gtk-config --cflags gthread` -+#GTK_LIBS=`${CROSS_COMPILE_BIN}gtk-config --libs gthread` - MOC=$(QTDIR)/bin/moc - KDE_FLAGS=-I$(KDEDIR)/include -I$(KDEDIR)/include/kde -I$(QTDIR)/include - KDE_LIBS=-L$(KDEDIR)/lib -L$(QTDIR)/lib -lqt -lkdecore -lkdeui -@@ -72,7 +72,7 @@ - endif - - install: all -- for x in $(PBX_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(PBX_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk-bristuff/files/patch-res-res_watchdog.c b/net/asterisk-bristuff/files/patch-res-res_watchdog.c deleted file mode 100644 index 8372764ed3e4..000000000000 --- a/net/asterisk-bristuff/files/patch-res-res_watchdog.c +++ /dev/null @@ -1,13 +0,0 @@ ---- res/res_watchdog.c.orig Mon Jan 23 23:55:25 2006 -+++ res/res_watchdog.c Mon Jan 23 23:55:10 2006 -@@ -37,6 +37,10 @@ - #include <asterisk/utils.h> - #include <asterisk/adsi.h> - -+#if defined(__FreeBSD__) && !defined(O_SYNC) -+#define O_SYNC O_FSYNC -+#endif -+ - static struct watchdog_pvt *watchdogs = NULL; - - STANDARD_LOCAL_USER; diff --git a/net/asterisk-bristuff/files/patch-res::Makefile b/net/asterisk-bristuff/files/patch-res::Makefile deleted file mode 100644 index ee1cb1f96fc1..000000000000 --- a/net/asterisk-bristuff/files/patch-res::Makefile +++ /dev/null @@ -1,33 +0,0 @@ ---- res/Makefile.orig Tue Jul 3 23:32:47 2007 -+++ res/Makefile Tue Jul 3 23:39:56 2007 -@@ -37,8 +37,8 @@ - endif - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -+ SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - ifeq (${OSARCH},CYGWIN) -@@ -55,9 +55,7 @@ - CFLAGS+= - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),) -- CFLAGS+=-DZAPATA_MOH --endif -+ CFLAGS+=-DZAPATA_MOH -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel - endif # WITHOUT_ZAPTEL - - # -@@ -75,7 +73,7 @@ - rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h - rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so - rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so -- for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - @if [ x`which mpg123 2>/dev/null | grep -v '^no'` != x ] ; then \ - if mpg123 --longhelp 2>&1 | grep -q .59r 2>&1 >/dev/null ; then echo ; else \ - echo "*************************************************************";\ diff --git a/net/asterisk-bristuff/files/patch-rtp.c b/net/asterisk-bristuff/files/patch-rtp.c deleted file mode 100644 index bbc2649929f9..000000000000 --- a/net/asterisk-bristuff/files/patch-rtp.c +++ /dev/null @@ -1,17 +0,0 @@ - -$FreeBSD$ - ---- rtp.c.orig Fri Jan 13 13:38:01 2006 -+++ rtp.c Fri Jan 13 13:40:50 2006 -@@ -950,8 +950,10 @@ struct ast_rtp *ast_rtp_new_with_bindadd - rtp->us.sin_port = htons(x); - rtp->us.sin_addr = addr; - /* If there's rtcp, initialize it as well. */ -- if (rtp->rtcp) -+ if (rtp->rtcp) { - rtp->rtcp->us.sin_port = htons(x + 1); -+ rtp->rtcp->us.sin_addr = addr; -+ } - /* Try to bind it/them. */ - if (!(first = bind(rtp->s, (struct sockaddr *)&rtp->us, sizeof(rtp->us))) && - (!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr *)&rtp->rtcp->us, sizeof(rtp->rtcp->us)))) diff --git a/net/asterisk-bristuff/files/patch-rtp_timeout b/net/asterisk-bristuff/files/patch-rtp_timeout new file mode 100644 index 000000000000..6f60c74cff41 --- /dev/null +++ b/net/asterisk-bristuff/files/patch-rtp_timeout @@ -0,0 +1,25 @@ +--- channels/chan_sip.c.orig 2009-04-14 08:58:13.000000000 +0100 ++++ channels/chan_sip.c 2009-04-14 09:00:58.000000000 +0100 +@@ -16287,7 +16287,6 @@ + restartsearch: + /* Check for interfaces needing to be killed */ + ast_mutex_lock(&iflock); +- t = time(NULL); + /* don't scan the interface list if it hasn't been a reasonable period + of time since the last time we did it (when MWI is being sent, we can + get back to this point every millisecond or less) +@@ -16306,12 +16305,14 @@ + (sip->owner->_state == AST_STATE_UP) && + !sip->redirip.sin_addr.s_addr && + sip->t38.state != T38_ENABLED) { ++ t = time(NULL); + if (sip->lastrtptx && + ast_rtp_get_rtpkeepalive(sip->rtp) && + (t > sip->lastrtptx + ast_rtp_get_rtpkeepalive(sip->rtp))) { + /* Need to send an empty RTP packet */ + sip->lastrtptx = time(NULL); + ast_rtp_sendcng(sip->rtp, 0); ++ t = time(NULL); + } + if (sip->lastrtprx && + (ast_rtp_get_rtptimeout(sip->rtp) || ast_rtp_get_rtpholdtimeout(sip->rtp)) && diff --git a/net/asterisk-bristuff/files/patch-utils.c b/net/asterisk-bristuff/files/patch-utils.c deleted file mode 100644 index 651e7b43d2b6..000000000000 --- a/net/asterisk-bristuff/files/patch-utils.c +++ /dev/null @@ -1,15 +0,0 @@ ---- utils.c.orig Fri Feb 23 07:31:48 2007 -+++ utils.c Fri Feb 23 07:34:20 2007 -@@ -58,7 +58,11 @@ - static char base64[64]; - static char b2a[256]; - --#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__CYGWIN__) -+#if defined(__FreeBSD__) -+#include <osreldate.h> -+#endif -+ -+#if (defined(__FreeBSD__) && __FreeBSD_version < 601103) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__CYGWIN__) - - /* duh? ERANGE value copied from web... */ - #define ERANGE 34 diff --git a/net/asterisk-bristuff/files/patch-utils::Makefile b/net/asterisk-bristuff/files/patch-utils::Makefile deleted file mode 100644 index f3164c0f478a..000000000000 --- a/net/asterisk-bristuff/files/patch-utils::Makefile +++ /dev/null @@ -1,34 +0,0 @@ - -$FreeBSD$ - ---- utils/Makefile -+++ utils/Makefile -@@ -17,16 +17,16 @@ - CFLAGS+=-DNO_AST_MM - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - TARGET=stereorize streamplayer - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/popt.h),) - TARGET+=smsq - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/newt.h),) - TARGET+=astman - endif - -@@ -40,7 +40,7 @@ - install: - for x in $(TARGET); do \ - if [ "$$x" != "none" ]; then \ -- $(INSTALL) -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/$$x; \ -+ $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(ASTSBINDIR)/$$x; \ - fi; \ - done - diff --git a/net/asterisk-bristuff/files/rtp_force_dtmf-codecnego.diff b/net/asterisk-bristuff/files/rtp_force_dtmf-codecnego.diff new file mode 100644 index 000000000000..723bd8703c06 --- /dev/null +++ b/net/asterisk-bristuff/files/rtp_force_dtmf-codecnego.diff @@ -0,0 +1,86 @@ +--- channels/chan_sip.c.orig 2008-03-12 17:37:00.000000000 +0200 ++++ channels/chan_sip.c 2008-03-12 18:17:33.000000000 +0200 +@@ -554,6 +554,9 @@ + static unsigned int global_tos_sip; /*!< IP type of service for SIP packets */ + static unsigned int global_tos_audio; /*!< IP type of service for audio RTP packets */ + static unsigned int global_tos_video; /*!< IP type of service for video RTP packets */ ++static int global_force_dtmf_relay = 0; ++static int global_force_dtmf_relay_pt = 101; ++ + static int compactheaders; /*!< send compact sip headers */ + static int recordhistory; /*!< Record SIP history. Off by default */ + static int dumphistory; /*!< Dump history to verbose before destroying SIP dialog */ +@@ -4983,6 +4986,8 @@ + int codec_index = 0; + int codec_pt_order[256]; + ++ int dtmf_present = 0; ++ + if (!p->rtp) { + ast_log(LOG_ERROR, "Got SDP but have no RTP session allocated.\n"); + return -1; +@@ -5408,12 +5413,20 @@ + for (x = 0; x < codec_index; ++x) { + struct rtpPayloadType pt; + pt = ast_rtp_lookup_pt(p->rtp, codec_pt_order[x]); ++ if (pt.code == AST_RTP_DTMF) ++ dtmf_present = 1; + if (!pt.isAstFormat && !pt.code && p->vrtp) + pt = ast_rtp_lookup_pt(p->vrtp, codec_pt_order[x]); + if (pt.isAstFormat) + ast_codec_pref_append(&p->formats, pt.code); + } + ast_codec_pref_remove2(&p->formats, ~p->usercapability); ++ if (!dtmf_present && global_force_dtmf_relay) { ++ newnoncodeccapability |= AST_RTP_DTMF; ++ ast_rtp_set_m_type(newaudiortp, global_force_dtmf_relay_pt); ++ codec_pt_order[codec_index++] = global_force_dtmf_relay_pt; ++ ast_rtp_set_rtpmap_type(newaudiortp, global_force_dtmf_relay_pt, "audio", "telephone-event", 0); ++ } + + /* Now gather all of the codecs that we are asked for: */ + ast_rtp_get_current_formats(newaudiortp, &peercapability, &peernoncodeccapability); +@@ -16845,6 +16858,9 @@ + + global_matchexterniplocally = FALSE; + ++ global_force_dtmf_relay = 0; ++ global_force_dtmf_relay_pt = 101; ++ + /* Copy the default jb config over global_jbconf */ + memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf)); + +@@ -16901,6 +16917,18 @@ + } + } else if (!strcasecmp(v->name, "vmexten")) { + ast_copy_string(default_vmexten, v->value, sizeof(default_vmexten)); ++ } else if (!strcasecmp(v->name, "rtp_force_dtmf_relay")) { ++ if ((global_force_dtmf_relay = ast_true(v->value))) ++ ast_verbose("RTP DTMF relaying will be enforced\n"); ++ else ++ ast_verbose("RTP DTMF relaying will not be enforced\n"); ++ } else if (!strcasecmp(v->name, "rtp_force_dtmf_relay_pt")) { ++ sscanf(v->value, "%d", &global_force_dtmf_relay_pt); ++ if (global_force_dtmf_relay_pt < 96 || global_force_dtmf_relay_pt > 255) { ++ ast_verbose("RTP forced DTMF relay payload type is not valid: %d. Using default (101)\n", global_force_dtmf_relay_pt); ++ global_force_dtmf_relay_pt = 101; ++ } else ++ ast_log(LOG_WARNING, "RTP forced DTMF relay payload type is %d\n", global_force_dtmf_relay_pt); + } else if (!strcasecmp(v->name, "rtptimeout")) { + if ((sscanf(v->value, "%d", &global_rtptimeout) != 1) || (global_rtptimeout < 0)) { + ast_log(LOG_WARNING, "'%s' is not a valid RTP hold time at line %d. Using default.\n", v->value, v->lineno); +--- configs/sip.conf.sample.orig 2008-04-25 08:53:52.000000000 -0700 ++++ configs/sip.conf.sample 2008-06-10 00:45:37.000000000 -0700 +@@ -53,6 +53,12 @@ + ; and multiline formatted headers for strict + ; SIP compatibility (defaults to "no") + ++;rtp_force_dtmf_relay=no ; Enable RFC2833 DTMFs to be sent even if peer ++ ; hasn't announced support for it. Default: no ++ ++;rtp_force_dtmf_relay_pt=101 ; RTP payload type value for enforced RFC2833 ++ ; DTMFs. Default: 101 ++ + ; See doc/ip-tos.txt for a description of these parameters. + ;tos_sip=cs3 ; Sets TOS for SIP packets. + ;tos_audio=ef ; Sets TOS for RTP audio packets. diff --git a/net/asterisk-bristuff/files/rtp_force_dtmf-nocodecnego.diff b/net/asterisk-bristuff/files/rtp_force_dtmf-nocodecnego.diff new file mode 100644 index 000000000000..9b1d521fa0e3 --- /dev/null +++ b/net/asterisk-bristuff/files/rtp_force_dtmf-nocodecnego.diff @@ -0,0 +1,70 @@ +--- channels/chan_sip.c.orig 2008-09-09 00:10:10.000000000 +0300 ++++ channels/chan_sip.c 2008-12-12 17:02:05.000000000 +0200 +@@ -557,6 +557,9 @@ + static unsigned int global_tos_sip; /*!< IP type of service for SIP packets */ + static unsigned int global_tos_audio; /*!< IP type of service for audio RTP packets */ + static unsigned int global_tos_video; /*!< IP type of service for video RTP packets */ ++static int global_force_dtmf_relay = 0; ++static int global_force_dtmf_relay_pt = 101; ++ + static int compactheaders; /*!< send compact sip headers */ + static int recordhistory; /*!< Record SIP history. Off by default */ + static int dumphistory; /*!< Dump history to verbose before destroying SIP dialog */ +@@ -5504,6 +5507,13 @@ + + /* Now gather all of the codecs that we are asked for: */ + ast_rtp_get_current_formats(newaudiortp, &peercapability, &peernoncodeccapability); ++ /* Add telephone-event */ ++ if (global_force_dtmf_relay && !(peernoncodeccapability & AST_RTP_DTMF)) { ++ ast_rtp_set_m_type(newaudiortp, global_force_dtmf_relay_pt); ++ found_rtpmap_codecs[last_rtpmap_codec++] = global_force_dtmf_relay_pt; ++ ast_rtp_set_rtpmap_type(newaudiortp, global_force_dtmf_relay_pt, "audio", "telephone-event", 0); ++ peernoncodeccapability |= AST_RTP_DTMF; ++ } + ast_rtp_get_current_formats(newvideortp, &vpeercapability, &vpeernoncodeccapability); + + newjointcapability = p->capability & (peercapability | vpeercapability); +@@ -17440,6 +17450,9 @@ + + global_matchexterniplocally = FALSE; + ++ global_force_dtmf_relay = 0; ++ global_force_dtmf_relay_pt = 101; ++ + /* Copy the default jb config over global_jbconf */ + memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf)); + +@@ -17496,6 +17509,18 @@ + } + } else if (!strcasecmp(v->name, "vmexten")) { + ast_copy_string(default_vmexten, v->value, sizeof(default_vmexten)); ++ } else if (!strcasecmp(v->name, "rtp_force_dtmf_relay")) { ++ if ((global_force_dtmf_relay = ast_true(v->value))) ++ ast_verbose("RTP DTMF relaying will be enforced\n"); ++ else ++ ast_verbose("RTP DTMF relaying will not be enforced\n"); ++ } else if (!strcasecmp(v->name, "rtp_force_dtmf_relay_pt")) { ++ sscanf(v->value, "%d", &global_force_dtmf_relay_pt); ++ if (global_force_dtmf_relay_pt < 96 || global_force_dtmf_relay_pt > 255) { ++ ast_verbose("RTP forced DTMF relay payload type is not valid: %d. Using default (101)\n", global_force_dtmf_relay_pt); ++ global_force_dtmf_relay_pt = 101; ++ } else ++ ast_log(LOG_WARNING, "RTP forced DTMF relay payload type is %d\n", global_force_dtmf_relay_pt); + } else if (!strcasecmp(v->name, "rtptimeout")) { + if ((sscanf(v->value, "%d", &global_rtptimeout) != 1) || (global_rtptimeout < 0)) { + ast_log(LOG_WARNING, "'%s' is not a valid RTP hold time at line %d. Using default.\n", v->value, v->lineno); +--- configs/sip.conf.sample.orig 2008-08-16 01:33:42.000000000 +0300 ++++ configs/sip.conf.sample 2008-12-12 17:03:11.000000000 +0200 +@@ -49,6 +49,12 @@ + ; and multiline formatted headers for strict + ; SIP compatibility (defaults to "no") + ++;rtp_force_dtmf_relay=no ; Enable RFC2833 DTMFs to be sent even if peer ++ ; hasn't announced support for it. Default: no ++ ++;rtp_force_dtmf_relay_pt=101 ; RTP payload type value for enforced RFC2833 ++ ; DTMFs. Default: 101 ++ + ; See doc/ip-tos.txt for a description of these parameters. + ;tos_sip=cs3 ; Sets TOS for SIP packets. + ;tos_audio=ef ; Sets TOS for RTP audio packets. diff --git a/net/asterisk-bristuff/files/sip_force_callid.diff b/net/asterisk-bristuff/files/sip_force_callid.diff new file mode 100644 index 000000000000..09cf274581d1 --- /dev/null +++ b/net/asterisk-bristuff/files/sip_force_callid.diff @@ -0,0 +1,11 @@ +--- channels/chan_sip.c.orig 2009-05-12 21:18:44.000000000 +0300 ++++ channels/chan_sip.c 2009-05-26 12:58:10.000000000 +0300 +@@ -3061,6 +3061,8 @@ + } else if (!strcasecmp(ast_var_name(current), "SIPTRANSFER_REPLACES")) { + /* We're replacing a call. */ + p->options->replaces = ast_var_value(current); ++ } else if (!strcasecmp(ast_var_name(current), "SIP_FORCE_CALLID")) { ++ ast_string_field_set(p, callid, ast_var_value(current)); + } + } + diff --git a/net/asterisk-bristuff/files/sip_set_auth.diff b/net/asterisk-bristuff/files/sip_set_auth.diff new file mode 100644 index 000000000000..5c05c287e5a9 --- /dev/null +++ b/net/asterisk-bristuff/files/sip_set_auth.diff @@ -0,0 +1,45 @@ +--- channels/chan_sip.c.orig 2008-04-29 08:21:05.000000000 -0400 ++++ channels/chan_sip.c 2008-05-28 18:41:48.000000000 -0400 +@@ -15962,6 +15978,9 @@ + char *number = NULL; + int strip = 0; + int ton = 0; /* 0 local, 1 national, 2 international */ ++ char *secret = NULL; ++ char *md5secret = NULL; ++ char *authname = NULL; + + if (!(p = sip_alloc(NULL, NULL, 0, SIP_INVITE))) { + ast_log(LOG_ERROR, "Unable to build sip pvt data for '%s' (Out of memory or socket error)\n", (char *)data); +@@ -15983,6 +16002,17 @@ + if (host) { + *host++ = '\0'; + ext = tmp; ++ secret = strchr(ext, ':'); ++ if (secret) { ++ *secret++ = '\0'; ++ md5secret = strchr(secret, ':'); ++ if (md5secret) { ++ *md5secret++ = '\0'; ++ authname = strchr(md5secret, ':'); ++ if (authname) ++ *authname++ = '\0'; ++ } ++ } + } else { + ext = strchr(tmp, '/'); + if (ext) +@@ -16015,6 +16045,14 @@ + ast_string_field_set(p, username, ext); + ast_string_field_free(p, fullcontact); + } ++ if (secret && !ast_strlen_zero(secret)) ++ ast_string_field_set(p, peersecret, secret); ++ ++ if (md5secret && !ast_strlen_zero(md5secret)) ++ ast_string_field_set(p, peermd5secret, md5secret); ++ ++ if (authname && !ast_strlen_zero(authname)) ++ ast_string_field_set(p, authname, authname); + #if 0 + printf("Setting up to call extension '%s' at '%s'\n", ext ? ext : "<none>", host); + #endif diff --git a/net/asterisk-bristuff/pkg-plist b/net/asterisk-bristuff/pkg-plist index 4744c2acfff2..491d88e11a8e 100644 --- a/net/asterisk-bristuff/pkg-plist +++ b/net/asterisk-bristuff/pkg-plist @@ -1,155 +1,200 @@ @unexec if cmp -s %D/etc/asterisk/adsi.conf %D/etc/asterisk/adsi.conf-dist; then rm -f %D/etc/asterisk/adsi.conf; fi etc/asterisk/adsi.conf-dist -@exec [ -f %B/adsi.conf ] || cp %B/%f %B/adsi.conf @unexec if cmp -s %D/etc/asterisk/adtranvofr.conf %D/etc/asterisk/adtranvofr.conf-dist; then rm -f %D/etc/asterisk/adtranvofr.conf; fi etc/asterisk/adtranvofr.conf-dist -@exec [ -f %B/adtranvofr.conf ] || cp %B/%f %B/adtranvofr.conf @unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi etc/asterisk/agents.conf-dist -@exec [ -f %B/agents.conf ] || cp %B/%f %B/agents.conf @unexec if cmp -s %D/etc/asterisk/alarmreceiver.conf %D/etc/asterisk/alarmreceiver.conf-dist; then rm -f %D/etc/asterisk/alarmreceiver.conf; fi etc/asterisk/alarmreceiver.conf-dist -@exec [ -f %B/alarmreceiver.conf ] || cp %B/%f %B/alarmreceiver.conf @unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi etc/asterisk/alsa.conf-dist -@exec [ -f %B/alsa.conf ] || cp %B/%f %B/alsa.conf @unexec if cmp -s %D/etc/asterisk/asterisk.adsi %D/etc/asterisk/asterisk.adsi-dist; then rm -f %D/etc/asterisk/asterisk.adsi; fi etc/asterisk/asterisk.adsi-dist -@exec [ -f %B/asterisk.adsi ] || cp %B/%f %B/asterisk.adsi @unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi etc/asterisk/asterisk.conf-dist -@exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf -@unexec if cmp -s %D/etc/asterisk/capi.conf %D/etc/asterisk/capi.conf-dist; then rm -f %D/etc/asterisk/capi.conf; fi -etc/asterisk/capi.conf-dist -@exec [ -f %B/capi.conf ] || cp %B/%f %B/capi.conf @unexec if cmp -s %D/etc/asterisk/cdr.conf %D/etc/asterisk/cdr.conf-dist; then rm -f %D/etc/asterisk/cdr.conf; fi etc/asterisk/cdr.conf-dist -@exec [ -f %B/cdr.conf ] || cp %B/%f %B/cdr.conf @unexec if cmp -s %D/etc/asterisk/cdr_custom.conf %D/etc/asterisk/cdr_custom.conf-dist; then rm -f %D/etc/asterisk/cdr_custom.conf; fi etc/asterisk/cdr_custom.conf-dist -@exec [ -f %B/cdr_custom.conf ] || cp %B/%f %B/cdr_custom.conf @unexec if cmp -s %D/etc/asterisk/cdr_manager.conf %D/etc/asterisk/cdr_manager.conf-dist; then rm -f %D/etc/asterisk/cdr_manager.conf; fi etc/asterisk/cdr_manager.conf-dist -@exec [ -f %B/cdr_manager.conf ] || cp %B/%f %B/cdr_manager.conf @unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi etc/asterisk/cdr_odbc.conf-dist -@exec [ -f %B/cdr_odbc.conf ] || cp %B/%f %B/cdr_odbc.conf @unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi etc/asterisk/cdr_pgsql.conf-dist -@exec [ -f %B/cdr_pgsql.conf ] || cp %B/%f %B/cdr_pgsql.conf @unexec if cmp -s %D/etc/asterisk/cdr_tds.conf %D/etc/asterisk/cdr_tds.conf-dist; then rm -f %D/etc/asterisk/cdr_tds.conf; fi etc/asterisk/cdr_tds.conf-dist -@exec [ -f %B/cdr_tds.conf ] || cp %B/%f %B/cdr_tds.conf @unexec if cmp -s %D/etc/asterisk/codecs.conf %D/etc/asterisk/codecs.conf-dist; then rm -f %D/etc/asterisk/codecs.conf; fi etc/asterisk/codecs.conf-dist -@exec [ -f %B/codecs.conf ] || cp %B/%f %B/codecs.conf @unexec if cmp -s %D/etc/asterisk/dnsmgr.conf %D/etc/asterisk/dnsmgr.conf-dist; then rm -f %D/etc/asterisk/dnsmgr.conf; fi etc/asterisk/dnsmgr.conf-dist -@exec [ -f %B/dnsmgr.conf ] || cp %B/%f %B/dmsmgr.conf @unexec if cmp -s %D/etc/asterisk/dundi.conf %D/etc/asterisk/dundi.conf-dist; then rm -f %D/etc/asterisk/dundi.conf; fi etc/asterisk/dundi.conf-dist -@exec [ -f %B/dundi.conf ] || cp %B/%f %B/dundi.conf @unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi etc/asterisk/enum.conf-dist -@exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf @unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi etc/asterisk/extconfig.conf-dist -@exec [ -f %B/extconfig.conf ] || cp %B/%f %B/extconfig.conf @unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi etc/asterisk/extensions.ael-dist -@exec [ -f %B/extensions.ael ] || cp %B/%f %B/extensions.ael @unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi etc/asterisk/extensions.conf-dist -@exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf @unexec if cmp -s %D/etc/asterisk/features.conf %D/etc/asterisk/features.conf-dist; then rm -f %D/etc/asterisk/features.conf; fi etc/asterisk/features.conf-dist -@exec [ -f %B/features.conf ] || cp %B/%f %B/features.conf @unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi etc/asterisk/festival.conf-dist -@exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf @unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi etc/asterisk/iax.conf-dist -@exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf @unexec if cmp -s %D/etc/asterisk/iaxprov.conf %D/etc/asterisk/iaxprov.conf-dist; then rm -f %D/etc/asterisk/iaxprov.conf; fi etc/asterisk/iaxprov.conf-dist -@exec [ -f %B/iaxprov.conf ] || cp %B/%f %B/iaxprov.conf @unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi etc/asterisk/indications.conf-dist -@exec [ -f %B/indications.conf ] || cp %B/%f %B/indications.conf @unexec if cmp -s %D/etc/asterisk/logger.conf %D/etc/asterisk/logger.conf-dist; then rm -f %D/etc/asterisk/logger.conf; fi etc/asterisk/logger.conf-dist -@exec [ -f %B/logger.conf ] || cp %B/%f %B/logger.conf @unexec if cmp -s %D/etc/asterisk/manager.conf %D/etc/asterisk/manager.conf-dist; then rm -f %D/etc/asterisk/manager.conf; fi etc/asterisk/manager.conf-dist -@exec [ -f %B/manager.conf ] || cp %B/%f %B/manager.conf @unexec if cmp -s %D/etc/asterisk/meetme.conf %D/etc/asterisk/meetme.conf-dist; then rm -f %D/etc/asterisk/meetme.conf; fi etc/asterisk/meetme.conf-dist -@exec [ -f %B/meetme.conf ] || cp %B/%f %B/meetme.conf @unexec if cmp -s %D/etc/asterisk/mgcp.conf %D/etc/asterisk/mgcp.conf-dist; then rm -f %D/etc/asterisk/mgcp.conf; fi etc/asterisk/mgcp.conf-dist -@exec [ -f %B/mgcp.conf ] || cp %B/%f %B/mgcp.conf @unexec if cmp -s %D/etc/asterisk/misdn.conf %D/etc/asterisk/misdn.conf-dist; then rm -f %D/etc/asterisk/misdn.conf; fi etc/asterisk/misdn.conf-dist -@exec [ -f %B/misdn.conf ] || cp %B/%f %B/misdn.conf -@unexec if cmp -s %D/etc/asterisk/modem.conf %D/etc/asterisk/modem.conf-dist; then rm -f %D/etc/asterisk/modem.conf; fi -etc/asterisk/modem.conf-dist -@exec [ -f %B/modem.conf ] || cp %B/%f %B/modem.conf @unexec if cmp -s %D/etc/asterisk/modules.conf %D/etc/asterisk/modules.conf-dist; then rm -f %D/etc/asterisk/modules.conf; fi etc/asterisk/modules.conf-dist -@exec [ -f %B/modules.conf ] || cp %B/%f %B/modules.conf @unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi etc/asterisk/musiconhold.conf-dist -@exec [ -f %B/musiconhold.conf ] || cp %B/%f %B/musiconhold.conf @unexec if cmp -s %D/etc/asterisk/osp.conf %D/etc/asterisk/osp.conf-dist; then rm -f %D/etc/asterisk/osp.conf; fi etc/asterisk/osp.conf-dist -@exec [ -f %B/osp.conf ] || cp %B/%f %B/osp.conf @unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi etc/asterisk/oss.conf-dist -@exec [ -f %B/oss.conf ] || cp %B/%f %B/oss.conf @unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi etc/asterisk/phone.conf-dist -@exec [ -f %B/phone.conf ] || cp %B/%f %B/phone.conf @unexec if cmp -s %D/etc/asterisk/privacy.conf %D/etc/asterisk/privacy.conf-dist; then rm -f %D/etc/asterisk/privacy.conf; fi etc/asterisk/privacy.conf-dist -@exec [ -f %B/privacy.conf ] || cp %B/%f %B/privacy.conf @unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi etc/asterisk/queues.conf-dist -@exec [ -f %B/queues.conf ] || cp %B/%f %B/queues.conf +@unexec if cmp -s %D/etc/asterisk/res_pgsql.conf %D/etc/asterisk/res_pgsql.conf-dist; then rm -f %D/etc/asterisk/res_pgsql.conf; fi +etc/asterisk/res_pgsql.conf-dist @unexec if cmp -s %D/etc/asterisk/res_odbc.conf %D/etc/asterisk/res_odbc.conf-dist; then rm -f %D/etc/asterisk/res_odbc.conf; fi etc/asterisk/res_odbc.conf-dist -@exec [ -f %B/res_odbc.conf ] || cp %B/%f %B/res_odbc.conf @unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi etc/asterisk/rpt.conf-dist -@exec [ -f %B/rpt.conf ] || cp %B/%f %B/rpt.conf @unexec if cmp -s %D/etc/asterisk/rtp.conf %D/etc/asterisk/rtp.conf-dist; then rm -f %D/etc/asterisk/rtp.conf; fi etc/asterisk/rtp.conf-dist -@exec [ -f %B/rtp.conf ] || cp %B/%f %B/rtp.conf @unexec if cmp -s %D/etc/asterisk/sip.conf %D/etc/asterisk/sip.conf-dist; then rm -f %D/etc/asterisk/sip.conf; fi etc/asterisk/sip.conf-dist -@exec [ -f %B/sip.conf ] || cp %B/%f %B/sip.conf @unexec if cmp -s %D/etc/asterisk/sip_notify.conf %D/etc/asterisk/sip_notify.conf-dist; then rm -f %D/etc/asterisk/sip_notify.conf; fi etc/asterisk/sip_notify.conf-dist -@exec [ -f %B/sip_notify.conf ] || cp %B/%f %B/sip_notify.conf @unexec if cmp -s %D/etc/asterisk/skinny.conf %D/etc/asterisk/skinny.conf-dist; then rm -f %D/etc/asterisk/skinny.conf; fi etc/asterisk/skinny.conf-dist -@exec [ -f %B/skinny.conf ] || cp %B/%f %B/skinny.conf @unexec if cmp -s %D/etc/asterisk/telcordia-1.adsi %D/etc/asterisk/telcordia-1.adsi-dist; then rm -f %D/etc/asterisk/telcordia-1.adsi; fi etc/asterisk/telcordia-1.adsi-dist -@exec [ -f %B/telcordia-1.adsi ] || cp %B/%f %B/telcordia-1.adsi @unexec if cmp -s %D/etc/asterisk/voicemail.conf %D/etc/asterisk/voicemail.conf-dist; then rm -f %D/etc/asterisk/voicemail.conf; fi etc/asterisk/voicemail.conf-dist -@exec [ -f %B/voicemail.conf ] || cp %B/%f %B/voicemail.conf @unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi etc/asterisk/vpb.conf-dist -@exec [ -f %B/vpb.conf ] || cp %B/%f %B/vpb.conf +@unexec if cmp -s %D/etc/asterisk/chan_dahdi.conf %D/etc/asterisk/chan_dahdi.conf-dist; then rm -f %D/etc/asterisk/chan_dahdi.conf; fi +etc/asterisk/chan_dahdi.conf-dist +@unexec if cmp -s %D/etc/asterisk/udptl.conf %D/etc/asterisk/udptl.conf-dist; then rm -f %D/etc/asterisk/udptl.conf; fi +etc/asterisk/udptl.conf-dist +@unexec if cmp -s %D/etc/asterisk/users.conf %D/etc/asterisk/users.conf-dist; then rm -f %D/etc/asterisk/users.conf; fi +etc/asterisk/users.conf-dist +@unexec if cmp -s %D/etc/asterisk/smdi.conf %D/etc/asterisk/smdi.conf-dist; then rm -f %D/etc/asterisk/smdi.conf; fi +etc/asterisk/smdi.conf-dist +@unexec if cmp -s %D/etc/asterisk/sla.conf %D/etc/asterisk/sla.conf-dist; then rm -f %D/etc/asterisk/sla.conf; fi +etc/asterisk/sla.conf-dist +@unexec if cmp -s %D/etc/asterisk/say.conf %D/etc/asterisk/say.conf-dist; then rm -f %D/etc/asterisk/say.conf; fi +etc/asterisk/say.conf-dist +@unexec if cmp -s %D/etc/asterisk/res_snmp.conf %D/etc/asterisk/res_snmp.conf-dist; then rm -f %D/etc/asterisk/res_snmp.conf; fi +etc/asterisk/res_snmp.conf-dist +@unexec if cmp -s %D/etc/asterisk/muted.conf %D/etc/asterisk/muted.conf-dist; then rm -f %D/etc/asterisk/muted.conf; fi +etc/asterisk/muted.conf-dist +@unexec if cmp -s %D/etc/asterisk/jabber.conf %D/etc/asterisk/jabber.conf-dist; then rm -f %D/etc/asterisk/jabber.conf; fi +etc/asterisk/jabber.conf-dist +@unexec if cmp -s %D/etc/asterisk/http.conf %D/etc/asterisk/http.conf-dist; then rm -f %D/etc/asterisk/http.conf; fi +etc/asterisk/http.conf-dist +@unexec if cmp -s %D/etc/asterisk/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi +etc/asterisk/h323.conf-dist +@unexec if cmp -s %D/etc/asterisk/gtalk.conf %D/etc/asterisk/gtalk.conf-dist; then rm -f %D/etc/asterisk/gtalk.conf; fi +etc/asterisk/gtalk.conf-dist +@unexec if cmp -s %D/etc/asterisk/func_odbc.conf %D/etc/asterisk/func_odbc.conf-dist; then rm -f %D/etc/asterisk/func_odbc.conf; fi +etc/asterisk/func_odbc.conf-dist +@unexec if cmp -s %D/etc/asterisk/followme.conf %D/etc/asterisk/followme.conf-dist; then rm -f %D/etc/asterisk/followme.conf; fi +etc/asterisk/followme.conf-dist +@unexec if cmp -s %D/etc/asterisk/amd.conf %D/etc/asterisk/amd.conf-dist; then rm -f %D/etc/asterisk/amd.conf; fi +etc/asterisk/amd.conf-dist +@unexec if cmp -s %D/etc/asterisk/esel.conf %D/etc/asterisk/esel.conf-dist; then rm -f %D/etc/asterisk/esel.conf; fi +etc/asterisk/esel.conf-dist @unexec if cmp -s %D/etc/asterisk/watchdog.conf %D/etc/asterisk/watchdog.conf-dist; then rm -f %D/etc/asterisk/watchdog.conf; fi etc/asterisk/watchdog.conf-dist -@exec [ -f %B/watchdog.conf ] || cp %B/%f %B/watchdog.conf -@unexec if cmp -s %D/etc/asterisk/zapata.conf %D/etc/asterisk/zapata.conf-dist; then rm -f %D/etc/asterisk/zapata.conf; fi -etc/asterisk/zapata.conf-dist -@exec [ -f %B/zapata.conf ] || cp %B/%f %B/zapata.conf +@exec if test ! -e %D/etc/asterisk/adsi.conf; then cp -p %D/etc/asterisk/adsi.conf-dist %D/etc/asterisk/adsi.conf; fi +@exec if test ! -e %D/etc/asterisk/adtranvofr.conf; then cp -p %D/etc/asterisk/adtranvofr.conf-dist %D/etc/asterisk/adtranvofr.conf; fi +@exec if test ! -e %D/etc/asterisk/agents.conf; then cp -p %D/etc/asterisk/agents.conf-dist %D/etc/asterisk/agents.conf; fi +@exec if test ! -e %D/etc/asterisk/alarmreceiver.conf; then cp -p %D/etc/asterisk/alarmreceiver.conf-dist %D/etc/asterisk/alarmreceiver.conf; fi +@exec if test ! -e %D/etc/asterisk/alsa.conf; then cp -p %D/etc/asterisk/alsa.conf-dist %D/etc/asterisk/alsa.conf; fi +@exec if test ! -e %D/etc/asterisk/asterisk.adsi; then cp -p %D/etc/asterisk/asterisk.adsi-dist %D/etc/asterisk/asterisk.adsi; fi +@exec if test ! -e %D/etc/asterisk/asterisk.conf; then cp -p %D/etc/asterisk/asterisk.conf-dist %D/etc/asterisk/asterisk.conf; fi +@exec if test ! -e %D/etc/asterisk/cdr.conf; then cp -p %D/etc/asterisk/cdr.conf-dist %D/etc/asterisk/cdr.conf; fi +@exec if test ! -e %D/etc/asterisk/cdr_custom.conf; then cp -p %D/etc/asterisk/cdr_custom.conf-dist %D/etc/asterisk/cdr_custom.conf; fi +@exec if test ! -e %D/etc/asterisk/cdr_manager.conf; then cp -p %D/etc/asterisk/cdr_manager.conf-dist %D/etc/asterisk/cdr_manager.conf; fi +@exec if test ! -e %D/etc/asterisk/cdr_odbc.conf; then cp -p %D/etc/asterisk/cdr_odbc.conf-dist %D/etc/asterisk/cdr_odbc.conf; fi +@exec if test ! -e %D/etc/asterisk/cdr_pgsql.conf; then cp -p %D/etc/asterisk/cdr_pgsql.conf-dist %D/etc/asterisk/cdr_pgsql.conf; fi +@exec if test ! -e %D/etc/asterisk/cdr_tds.conf; then cp -p %D/etc/asterisk/cdr_tds.conf-dist %D/etc/asterisk/cdr_tds.conf; fi +@exec if test ! -e %D/etc/asterisk/codecs.conf; then cp -p %D/etc/asterisk/codecs.conf-dist %D/etc/asterisk/codecs.conf; fi +@exec if test ! -e %D/etc/asterisk/dnsmgr.conf; then cp -p %D/etc/asterisk/dnsmgr.conf-dist %D/etc/asterisk/dnsmgr.conf; fi +@exec if test ! -e %D/etc/asterisk/dundi.conf; then cp -p %D/etc/asterisk/dundi.conf-dist %D/etc/asterisk/dundi.conf; fi +@exec if test ! -e %D/etc/asterisk/enum.conf; then cp -p %D/etc/asterisk/enum.conf-dist %D/etc/asterisk/enum.conf; fi +@exec if test ! -e %D/etc/asterisk/extconfig.conf; then cp -p %D/etc/asterisk/extconfig.conf-dist %D/etc/asterisk/extconfig.conf; fi +@exec if test ! -e %D/etc/asterisk/extensions.ael; then cp -p %D/etc/asterisk/extensions.ael-dist %D/etc/asterisk/extensions.ael; fi +@exec if test ! -e %D/etc/asterisk/extensions.conf; then cp -p %D/etc/asterisk/extensions.conf-dist %D/etc/asterisk/extensions.conf; fi +@exec if test ! -e %D/etc/asterisk/features.conf; then cp -p %D/etc/asterisk/features.conf-dist %D/etc/asterisk/features.conf; fi +@exec if test ! -e %D/etc/asterisk/festival.conf; then cp -p %D/etc/asterisk/festival.conf-dist %D/etc/asterisk/festival.conf; fi +@exec if test ! -e %D/etc/asterisk/iax.conf; then cp -p %D/etc/asterisk/iax.conf-dist %D/etc/asterisk/iax.conf; fi +@exec if test ! -e %D/etc/asterisk/iaxprov.conf; then cp -p %D/etc/asterisk/iaxprov.conf-dist %D/etc/asterisk/iaxprov.conf; fi +@exec if test ! -e %D/etc/asterisk/indications.conf; then cp -p %D/etc/asterisk/indications.conf-dist %D/etc/asterisk/indications.conf; fi +@exec if test ! -e %D/etc/asterisk/logger.conf; then cp -p %D/etc/asterisk/logger.conf-dist %D/etc/asterisk/logger.conf; fi +@exec if test ! -e %D/etc/asterisk/manager.conf; then cp -p %D/etc/asterisk/manager.conf-dist %D/etc/asterisk/manager.conf; fi +@exec if test ! -e %D/etc/asterisk/meetme.conf; then cp -p %D/etc/asterisk/meetme.conf-dist %D/etc/asterisk/meetme.conf; fi +@exec if test ! -e %D/etc/asterisk/mgcp.conf; then cp -p %D/etc/asterisk/mgcp.conf-dist %D/etc/asterisk/mgcp.conf; fi +@exec if test ! -e %D/etc/asterisk/misdn.conf; then cp -p %D/etc/asterisk/misdn.conf-dist %D/etc/asterisk/misdn.conf; fi +@exec if test ! -e %D/etc/asterisk/modules.conf; then cp -p %D/etc/asterisk/modules.conf-dist %D/etc/asterisk/modules.conf; fi +@exec if test ! -e %D/etc/asterisk/musiconhold.conf; then cp -p %D/etc/asterisk/musiconhold.conf-dist %D/etc/asterisk/musiconhold.conf; fi +@exec if test ! -e %D/etc/asterisk/osp.conf; then cp -p %D/etc/asterisk/osp.conf-dist %D/etc/asterisk/osp.conf; fi +@exec if test ! -e %D/etc/asterisk/oss.conf; then cp -p %D/etc/asterisk/oss.conf-dist %D/etc/asterisk/oss.conf; fi +@exec if test ! -e %D/etc/asterisk/phone.conf; then cp -p %D/etc/asterisk/phone.conf-dist %D/etc/asterisk/phone.conf; fi +@exec if test ! -e %D/etc/asterisk/privacy.conf; then cp -p %D/etc/asterisk/privacy.conf-dist %D/etc/asterisk/privacy.conf; fi +@exec if test ! -e %D/etc/asterisk/queues.conf; then cp -p %D/etc/asterisk/queues.conf-dist %D/etc/asterisk/queues.conf; fi +@exec if test ! -e %D/etc/asterisk/res_pgsql.conf; then cp -p %D/etc/asterisk/res_pgsql.conf-dist %D/etc/asterisk/res_pgsql.conf; fi +@exec if test ! -e %D/etc/asterisk/res_odbc.conf; then cp -p %D/etc/asterisk/res_odbc.conf-dist %D/etc/asterisk/res_odbc.conf; fi +@exec if test ! -e %D/etc/asterisk/rpt.conf; then cp -p %D/etc/asterisk/rpt.conf-dist %D/etc/asterisk/rpt.conf; fi +@exec if test ! -e %D/etc/asterisk/rtp.conf; then cp -p %D/etc/asterisk/rtp.conf-dist %D/etc/asterisk/rtp.conf; fi +@exec if test ! -e %D/etc/asterisk/sip.conf; then cp -p %D/etc/asterisk/sip.conf-dist %D/etc/asterisk/sip.conf; fi +@exec if test ! -e %D/etc/asterisk/sip_notify.conf; then cp -p %D/etc/asterisk/sip_notify.conf-dist %D/etc/asterisk/sip_notify.conf; fi +@exec if test ! -e %D/etc/asterisk/skinny.conf; then cp -p %D/etc/asterisk/skinny.conf-dist %D/etc/asterisk/skinny.conf; fi +@exec if test ! -e %D/etc/asterisk/telcordia-1.adsi; then cp -p %D/etc/asterisk/telcordia-1.adsi-dist %D/etc/asterisk/telcordia-1.adsi; fi +@exec if test ! -e %D/etc/asterisk/voicemail.conf; then cp -p %D/etc/asterisk/voicemail.conf-dist %D/etc/asterisk/voicemail.conf; fi +@exec if test ! -e %D/etc/asterisk/vpb.conf; then cp -p %D/etc/asterisk/vpb.conf-dist %D/etc/asterisk/vpb.conf; fi +@exec if test ! -e %D/etc/asterisk/chan_dahdi.conf; then cp -p %D/etc/asterisk/chan_dahdi.conf-dist %D/etc/asterisk/chan_dahdi.conf; fi +@exec if test ! -e %D/etc/asterisk/udptl.conf; then cp -p %D/etc/asterisk/udptl.conf-dist %D/etc/asterisk/udptl.conf; fi +@exec if test ! -e %D/etc/asterisk/users.conf; then cp -p %D/etc/asterisk/users.conf-dist %D/etc/asterisk/users.conf; fi +@exec if test ! -e %D/etc/asterisk/smdi.conf; then cp -p %D/etc/asterisk/smdi.conf-dist %D/etc/asterisk/smdi.conf; fi +@exec if test ! -e %D/etc/asterisk/sla.conf; then cp -p %D/etc/asterisk/sla.conf-dist %D/etc/asterisk/sla.conf; fi +@exec if test ! -e %D/etc/asterisk/say.conf; then cp -p %D/etc/asterisk/say.conf-dist %D/etc/asterisk/say.conf; fi +@exec if test ! -e %D/etc/asterisk/res_snmp.conf; then cp -p %D/etc/asterisk/res_snmp.conf-dist %D/etc/asterisk/res_snmp.conf; fi +@exec if test ! -e %D/etc/asterisk/muted.conf; then cp -p %D/etc/asterisk/muted.conf-dist %D/etc/asterisk/muted.conf; fi +@exec if test ! -e %D/etc/asterisk/jabber.conf; then cp -p %D/etc/asterisk/jabber.conf-dist %D/etc/asterisk/jabber.conf; fi +@exec if test ! -e %D/etc/asterisk/http.conf; then cp -p %D/etc/asterisk/http.conf-dist %D/etc/asterisk/http.conf; fi +@exec if test ! -e %D/etc/asterisk/h323.conf; then cp -p %D/etc/asterisk/h323.conf-dist %D/etc/asterisk/h323.conf; fi +@exec if test ! -e %D/etc/asterisk/gtalk.conf; then cp -p %D/etc/asterisk/gtalk.conf-dist %D/etc/asterisk/gtalk.conf; fi +@exec if test ! -e %D/etc/asterisk/func_odbc.conf; then cp -p %D/etc/asterisk/func_odbc.conf-dist %D/etc/asterisk/func_odbc.conf; fi +@exec if test ! -e %D/etc/asterisk/followme.conf; then cp -p %D/etc/asterisk/followme.conf-dist %D/etc/asterisk/followme.conf; fi +@exec if test ! -e %D/etc/asterisk/amd.conf; then cp -p %D/etc/asterisk/amd.conf-dist %D/etc/asterisk/amd.conf; fi +@exec if test ! -e %D/etc/asterisk/esel.conf; then cp -p %D/etc/asterisk/esel.conf-dist %D/etc/asterisk/esel.conf; fi +@exec if test ! -e %D/etc/asterisk/watchdog.conf; then cp -p %D/etc/asterisk/watchdog.conf-dist %D/etc/asterisk/watchdog.conf; fi +include/asterisk.h +include/asterisk/abstract_jb.h include/asterisk/acl.h include/asterisk/adsi.h +include/asterisk/ael_structs.h include/asterisk/aes.h include/asterisk/agi.h include/asterisk/alaw.h @@ -158,23 +203,25 @@ include/asterisk/ast_expr.h include/asterisk/astdb.h include/asterisk/astmm.h include/asterisk/astobj.h +include/asterisk/astobj2.h include/asterisk/astosp.h +include/asterisk/audiohook.h +include/asterisk/autoconfig.h include/asterisk/build.h +include/asterisk/buildopts.h include/asterisk/callerid.h include/asterisk/causes.h include/asterisk/cdr.h -include/asterisk/chan_capi.h -include/asterisk/chan_capi_app.h include/asterisk/channel.h -include/asterisk/chanspy.h include/asterisk/chanvars.h include/asterisk/cli.h include/asterisk/compat.h include/asterisk/compiler.h include/asterisk/config.h include/asterisk/crypto.h +include/asterisk/dahdi_compat.h include/asterisk/devicestate.h -include/asterisk/dlfcn-compat.h +include/asterisk/dial.h include/asterisk/dns.h include/asterisk/dnsmgr.h include/asterisk/doxyref.h @@ -186,10 +233,14 @@ include/asterisk/features.h include/asterisk/file.h include/asterisk/frame.h include/asterisk/fskmodem.h +include/asterisk/global_datastores.h +include/asterisk/http.h include/asterisk/image.h include/asterisk/indications.h include/asterisk/inline_api.h include/asterisk/io.h +include/asterisk/jabber.h +include/asterisk/jingle.h include/asterisk/linkedlists.h include/asterisk/localtime.h include/asterisk/lock.h @@ -201,6 +252,7 @@ include/asterisk/monitor.h include/asterisk/musiconhold.h include/asterisk/netsock.h include/asterisk/options.h +include/asterisk/paths.h include/asterisk/pbx.h include/asterisk/plc.h include/asterisk/poll-compat.h @@ -209,30 +261,37 @@ include/asterisk/res_odbc.h include/asterisk/rtp.h include/asterisk/say.h include/asterisk/sched.h +include/asterisk/sha1.h include/asterisk/slinfactory.h +include/asterisk/smdi.h +include/asterisk/speech.h include/asterisk/srv.h +include/asterisk/stringfields.h include/asterisk/strings.h include/asterisk/tdd.h include/asterisk/term.h +include/asterisk/threadstorage.h include/asterisk/time.h +include/asterisk/tonezone_compat.h include/asterisk/transcap.h include/asterisk/translate.h +include/asterisk/udptl.h include/asterisk/ulaw.h include/asterisk/unaligned.h include/asterisk/utils.h include/asterisk/version.h -include/asterisk/vmodem.h -include/asterisk/xlaw.h lib/asterisk/modules/app_adsiprog.so lib/asterisk/modules/app_alarmreceiver.so +lib/asterisk/modules/app_amd.so lib/asterisk/modules/app_authenticate.so -lib/asterisk/modules/app_callingpres.so lib/asterisk/modules/app_cdr.so lib/asterisk/modules/app_chanisavail.so +lib/asterisk/modules/app_channelredirect.so lib/asterisk/modules/app_chanspy.so lib/asterisk/modules/app_controlplayback.so -lib/asterisk/modules/app_curl.so -lib/asterisk/modules/app_cut.so +%%WITH_ZAPTEL%%lib/asterisk/modules/app_dahdibarge.so +%%WITH_ZAPTEL%%lib/asterisk/modules/app_dahdiras.so +%%WITH_ZAPTEL%%lib/asterisk/modules/app_dahdiscan.so lib/asterisk/modules/app_db.so lib/asterisk/modules/app_devstate.so lib/asterisk/modules/app_dial.so @@ -242,26 +301,23 @@ lib/asterisk/modules/app_directory.so lib/asterisk/modules/app_disa.so lib/asterisk/modules/app_dumpchan.so lib/asterisk/modules/app_echo.so -lib/asterisk/modules/app_enumlookup.so -lib/asterisk/modules/app_eval.so lib/asterisk/modules/app_exec.so lib/asterisk/modules/app_externalivr.so lib/asterisk/modules/app_festival.so %%WITH_ZAPTEL%%lib/asterisk/modules/app_flash.so +lib/asterisk/modules/app_followme.so lib/asterisk/modules/app_forkcdr.so lib/asterisk/modules/app_getcpeid.so -lib/asterisk/modules/app_groupcount.so lib/asterisk/modules/app_hasnewvoicemail.so lib/asterisk/modules/app_ices.so lib/asterisk/modules/app_image.so lib/asterisk/modules/app_lookupblacklist.so lib/asterisk/modules/app_lookupcidname.so lib/asterisk/modules/app_macro.so -lib/asterisk/modules/app_math.so -lib/asterisk/modules/app_md5.so %%WITH_ZAPTEL%%lib/asterisk/modules/app_meetme.so lib/asterisk/modules/app_milliwatt.so lib/asterisk/modules/app_mixmonitor.so +lib/asterisk/modules/app_morsecode.so lib/asterisk/modules/app_mp3.so lib/asterisk/modules/app_nbscat.so %%WITH_ZAPTEL%%lib/asterisk/modules/app_page.so @@ -275,26 +331,21 @@ lib/asterisk/modules/app_read.so lib/asterisk/modules/app_readfile.so lib/asterisk/modules/app_realtime.so lib/asterisk/modules/app_record.so -%%WITH_FAX%%lib/asterisk/modules/app_rxfax.so lib/asterisk/modules/app_sayunixtime.so lib/asterisk/modules/app_segfault.so lib/asterisk/modules/app_senddtmf.so lib/asterisk/modules/app_sendtext.so lib/asterisk/modules/app_setcallerid.so lib/asterisk/modules/app_setcdruserfield.so -lib/asterisk/modules/app_setcidname.so -lib/asterisk/modules/app_setcidnum.so -lib/asterisk/modules/app_setrdnis.so lib/asterisk/modules/app_settransfercapability.so lib/asterisk/modules/app_sms.so lib/asterisk/modules/app_softhangup.so +lib/asterisk/modules/app_speech_utils.so lib/asterisk/modules/app_stack.so lib/asterisk/modules/app_system.so lib/asterisk/modules/app_talkdetect.so lib/asterisk/modules/app_test.so lib/asterisk/modules/app_transfer.so -%%WITH_FAX%%lib/asterisk/modules/app_txfax.so -lib/asterisk/modules/app_txtcidname.so lib/asterisk/modules/app_url.so lib/asterisk/modules/app_userevent.so lib/asterisk/modules/app_verbose.so @@ -303,15 +354,17 @@ lib/asterisk/modules/app_waitforring.so lib/asterisk/modules/app_waitforsilence.so lib/asterisk/modules/app_while.so lib/asterisk/modules/app_zapateller.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapbarge.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapras.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapscan.so lib/asterisk/modules/cdr_csv.so lib/asterisk/modules/cdr_custom.so lib/asterisk/modules/cdr_manager.so %%WITH_ODBC%%lib/asterisk/modules/cdr_odbc.so +%%WITH_POSTGRES%%lib/asterisk/modules/cdr_pgsql.so +%%WITH_RADIUS%%lib/asterisk/modules/cdr_radius.so +%%WITH_SQLITE%%lib/asterisk/modules/cdr_sqlite.so +%%WITH_FREETDS%%lib/asterisk/modules/cdr_tds.so lib/asterisk/modules/chan_agent.so -lib/asterisk/modules/chan_features.so +%%WITH_ZAPTEL%%lib/asterisk/modules/chan_dahdi.so +%%WITH_JABBER%%lib/asterisk/modules/chan_gtalk.so %%WITH_H323%%lib/asterisk/modules/chan_h323.so lib/asterisk/modules/chan_iax2.so lib/asterisk/modules/chan_local.so @@ -319,443 +372,581 @@ lib/asterisk/modules/chan_mgcp.so lib/asterisk/modules/chan_oss.so lib/asterisk/modules/chan_sip.so lib/asterisk/modules/chan_skinny.so -%%WITH_ZAPTEL%%lib/asterisk/modules/chan_zap.so lib/asterisk/modules/codec_a_mu.so lib/asterisk/modules/codec_adpcm.so lib/asterisk/modules/codec_alaw.so +lib/asterisk/modules/codec_dahdi.so lib/asterisk/modules/codec_g726.so lib/asterisk/modules/codec_gsm.so -lib/asterisk/modules/codec_ilbc.so +%%WITH_ILBC%%lib/asterisk/modules/codec_ilbc.so lib/asterisk/modules/codec_lpc10.so lib/asterisk/modules/codec_speex.so lib/asterisk/modules/codec_ulaw.so -lib/asterisk/modules/format_au.so -lib/asterisk/modules/format_g723_1.so +lib/asterisk/modules/format_g723.so lib/asterisk/modules/format_g726.so lib/asterisk/modules/format_g729.so lib/asterisk/modules/format_gsm.so lib/asterisk/modules/format_h263.so +lib/asterisk/modules/format_h264.so lib/asterisk/modules/format_ilbc.so lib/asterisk/modules/format_jpeg.so +%%WITH_OGGVORBIS%%lib/asterisk/modules/format_ogg_vorbis.so lib/asterisk/modules/format_pcm.so -lib/asterisk/modules/format_pcm_alaw.so lib/asterisk/modules/format_sln.so lib/asterisk/modules/format_vox.so lib/asterisk/modules/format_wav.so lib/asterisk/modules/format_wav_gsm.so +lib/asterisk/modules/func_audiohookinherit.so +lib/asterisk/modules/func_base64.so lib/asterisk/modules/func_callerid.so +lib/asterisk/modules/func_cdr.so +lib/asterisk/modules/func_channel.so +lib/asterisk/modules/func_curl.so +lib/asterisk/modules/func_cut.so +lib/asterisk/modules/func_db.so lib/asterisk/modules/func_enum.so +lib/asterisk/modules/func_env.so +lib/asterisk/modules/func_global.so +lib/asterisk/modules/func_groupcount.so +lib/asterisk/modules/func_language.so +lib/asterisk/modules/func_logic.so +lib/asterisk/modules/func_math.so +lib/asterisk/modules/func_md5.so +lib/asterisk/modules/func_moh.so +%%WITH_ODBC%%lib/asterisk/modules/func_odbc.so +lib/asterisk/modules/func_rand.so +lib/asterisk/modules/func_realtime.so +lib/asterisk/modules/func_sha1.so +lib/asterisk/modules/func_strings.so +lib/asterisk/modules/func_timeout.so lib/asterisk/modules/func_uri.so lib/asterisk/modules/pbx_ael.so lib/asterisk/modules/pbx_config.so lib/asterisk/modules/pbx_dundi.so -lib/asterisk/modules/pbx_functions.so lib/asterisk/modules/pbx_loopback.so lib/asterisk/modules/pbx_realtime.so lib/asterisk/modules/pbx_spool.so lib/asterisk/modules/res_adsi.so lib/asterisk/modules/res_agi.so +lib/asterisk/modules/res_clioriginate.so %%WITH_ODBC%%lib/asterisk/modules/res_config_odbc.so +%%WITH_POSTGRES%%lib/asterisk/modules/res_config_pgsql.so +lib/asterisk/modules/res_convert.so lib/asterisk/modules/res_crypto.so +lib/asterisk/modules/res_esel.so lib/asterisk/modules/res_features.so lib/asterisk/modules/res_indications.so +%%WITH_JABBER%%lib/asterisk/modules/res_jabber.so lib/asterisk/modules/res_monitor.so lib/asterisk/modules/res_musiconhold.so %%WITH_ODBC%%lib/asterisk/modules/res_odbc.so +lib/asterisk/modules/res_smdi.so +%%WITH_SNMP%%lib/asterisk/modules/res_snmp.so +lib/asterisk/modules/res_speech.so lib/asterisk/modules/res_watchdog.so +sbin/aelparse sbin/asterisk sbin/astgenkey sbin/astman sbin/autosupport +sbin/muted sbin/rasterisk sbin/safe_asterisk sbin/smsq sbin/stereorize sbin/streamplayer -%%DATADIR%%/agi-bin/agi-test.agi -%%DATADIR%%/agi-bin/eagi-sphinx-test -%%DATADIR%%/agi-bin/eagi-test -%%DATADIR%%/agi-bin/xagi-test -%%DATADIR%%/firmware/iax/iaxy.bin -%%DATADIR%%/images/asterisk-intro.jpg -%%DATADIR%%/keys/freeworlddialup.pub -%%DATADIR%%/keys/iaxtel.pub -%%DATADIR%%/mohmp3/fpm-calm-river.mp3 -%%DATADIR%%/mohmp3/fpm-sunshine.mp3 -%%DATADIR%%/mohmp3/fpm-world-mix.mp3 -%%DATADIR%%/sounds/agent-alreadyon.gsm -%%DATADIR%%/sounds/agent-incorrect.gsm -%%DATADIR%%/sounds/agent-loggedoff.gsm -%%DATADIR%%/sounds/agent-loginok.gsm -%%DATADIR%%/sounds/agent-newlocation.gsm -%%DATADIR%%/sounds/agent-pass.gsm -%%DATADIR%%/sounds/agent-user.gsm -%%DATADIR%%/sounds/auth-incorrect.gsm -%%DATADIR%%/sounds/auth-thankyou.gsm -%%DATADIR%%/sounds/beep.gsm -%%DATADIR%%/sounds/beeperr.gsm -%%DATADIR%%/sounds/conf-adminmenu.gsm -%%DATADIR%%/sounds/conf-enteringno.gsm -%%DATADIR%%/sounds/conf-errormenu.gsm -%%DATADIR%%/sounds/conf-getchannel.gsm -%%DATADIR%%/sounds/conf-getconfno.gsm -%%DATADIR%%/sounds/conf-getpin.gsm -%%DATADIR%%/sounds/conf-hasjoin.gsm -%%DATADIR%%/sounds/conf-hasleft.gsm -%%DATADIR%%/sounds/conf-invalid.gsm -%%DATADIR%%/sounds/conf-invalidpin.gsm -%%DATADIR%%/sounds/conf-kicked.gsm -%%DATADIR%%/sounds/conf-leaderhasleft.gsm -%%DATADIR%%/sounds/conf-locked.gsm -%%DATADIR%%/sounds/conf-lockednow.gsm -%%DATADIR%%/sounds/conf-muted.gsm -%%DATADIR%%/sounds/conf-noempty.gsm -%%DATADIR%%/sounds/conf-onlyone.gsm -%%DATADIR%%/sounds/conf-onlyperson.gsm -%%DATADIR%%/sounds/conf-otherinparty.gsm -%%DATADIR%%/sounds/conf-placeintoconf.gsm -%%DATADIR%%/sounds/conf-thereare.gsm -%%DATADIR%%/sounds/conf-unlockednow.gsm -%%DATADIR%%/sounds/conf-unmuted.gsm -%%DATADIR%%/sounds/conf-usermenu.gsm -%%DATADIR%%/sounds/conf-userswilljoin.gsm -%%DATADIR%%/sounds/conf-userwilljoin.gsm -%%DATADIR%%/sounds/conf-waitforleader.gsm -%%DATADIR%%/sounds/demo-abouttotry.gsm -%%DATADIR%%/sounds/demo-congrats.gsm -%%DATADIR%%/sounds/demo-echodone.gsm -%%DATADIR%%/sounds/demo-echotest.gsm -%%DATADIR%%/sounds/demo-enterkeywords.gsm -%%DATADIR%%/sounds/demo-instruct.gsm -%%DATADIR%%/sounds/demo-moreinfo.gsm -%%DATADIR%%/sounds/demo-nogo.gsm -%%DATADIR%%/sounds/demo-nomatch.gsm -%%DATADIR%%/sounds/demo-thanks.gsm -%%DATADIR%%/sounds/dictate/both_help.gsm -%%DATADIR%%/sounds/dictate/enter_filename.gsm -%%DATADIR%%/sounds/dictate/forhelp.gsm -%%DATADIR%%/sounds/dictate/pause.gsm -%%DATADIR%%/sounds/dictate/paused.gsm -%%DATADIR%%/sounds/dictate/play_help.gsm -%%DATADIR%%/sounds/dictate/playback.gsm -%%DATADIR%%/sounds/dictate/playback_mode.gsm -%%DATADIR%%/sounds/dictate/record.gsm -%%DATADIR%%/sounds/dictate/record_help.gsm -%%DATADIR%%/sounds/dictate/record_mode.gsm -%%DATADIR%%/sounds/dictate/truncating_audio.gsm -%%DATADIR%%/sounds/digits/0.gsm -%%DATADIR%%/sounds/digits/1.gsm -%%DATADIR%%/sounds/digits/10.gsm -%%DATADIR%%/sounds/digits/11.gsm -%%DATADIR%%/sounds/digits/12.gsm -%%DATADIR%%/sounds/digits/13.gsm -%%DATADIR%%/sounds/digits/14.gsm -%%DATADIR%%/sounds/digits/15.gsm -%%DATADIR%%/sounds/digits/16.gsm -%%DATADIR%%/sounds/digits/17.gsm -%%DATADIR%%/sounds/digits/18.gsm -%%DATADIR%%/sounds/digits/19.gsm -%%DATADIR%%/sounds/digits/2.gsm -%%DATADIR%%/sounds/digits/20.gsm -%%DATADIR%%/sounds/digits/3.gsm -%%DATADIR%%/sounds/digits/30.gsm -%%DATADIR%%/sounds/digits/4.gsm -%%DATADIR%%/sounds/digits/40.gsm -%%DATADIR%%/sounds/digits/5.gsm -%%DATADIR%%/sounds/digits/50.gsm -%%DATADIR%%/sounds/digits/6.gsm -%%DATADIR%%/sounds/digits/60.gsm -%%DATADIR%%/sounds/digits/7.gsm -%%DATADIR%%/sounds/digits/70.gsm -%%DATADIR%%/sounds/digits/8.gsm -%%DATADIR%%/sounds/digits/80.gsm -%%DATADIR%%/sounds/digits/9.gsm -%%DATADIR%%/sounds/digits/90.gsm -%%DATADIR%%/sounds/digits/a-m.gsm -%%DATADIR%%/sounds/digits/at.gsm -%%DATADIR%%/sounds/digits/day-0.gsm -%%DATADIR%%/sounds/digits/day-1.gsm -%%DATADIR%%/sounds/digits/day-2.gsm -%%DATADIR%%/sounds/digits/day-3.gsm -%%DATADIR%%/sounds/digits/day-4.gsm -%%DATADIR%%/sounds/digits/day-5.gsm -%%DATADIR%%/sounds/digits/day-6.gsm -%%DATADIR%%/sounds/digits/dollars.gsm -%%DATADIR%%/sounds/digits/h-1.gsm -%%DATADIR%%/sounds/digits/h-10.gsm -%%DATADIR%%/sounds/digits/h-11.gsm -%%DATADIR%%/sounds/digits/h-12.gsm -%%DATADIR%%/sounds/digits/h-13.gsm -%%DATADIR%%/sounds/digits/h-14.gsm -%%DATADIR%%/sounds/digits/h-15.gsm -%%DATADIR%%/sounds/digits/h-16.gsm -%%DATADIR%%/sounds/digits/h-17.gsm -%%DATADIR%%/sounds/digits/h-18.gsm -%%DATADIR%%/sounds/digits/h-19.gsm -%%DATADIR%%/sounds/digits/h-2.gsm -%%DATADIR%%/sounds/digits/h-20.gsm -%%DATADIR%%/sounds/digits/h-3.gsm -%%DATADIR%%/sounds/digits/h-30.gsm -%%DATADIR%%/sounds/digits/h-4.gsm -%%DATADIR%%/sounds/digits/h-5.gsm -%%DATADIR%%/sounds/digits/h-6.gsm -%%DATADIR%%/sounds/digits/h-7.gsm -%%DATADIR%%/sounds/digits/h-8.gsm -%%DATADIR%%/sounds/digits/h-9.gsm -%%DATADIR%%/sounds/digits/hundred.gsm -%%DATADIR%%/sounds/digits/million.gsm -%%DATADIR%%/sounds/digits/minus.gsm -%%DATADIR%%/sounds/digits/mon-0.gsm -%%DATADIR%%/sounds/digits/mon-1.gsm -%%DATADIR%%/sounds/digits/mon-10.gsm -%%DATADIR%%/sounds/digits/mon-11.gsm -%%DATADIR%%/sounds/digits/mon-2.gsm -%%DATADIR%%/sounds/digits/mon-3.gsm -%%DATADIR%%/sounds/digits/mon-4.gsm -%%DATADIR%%/sounds/digits/mon-5.gsm -%%DATADIR%%/sounds/digits/mon-6.gsm -%%DATADIR%%/sounds/digits/mon-7.gsm -%%DATADIR%%/sounds/digits/mon-8.gsm -%%DATADIR%%/sounds/digits/mon-9.gsm -%%DATADIR%%/sounds/digits/oclock.gsm -%%DATADIR%%/sounds/digits/oh.gsm -%%DATADIR%%/sounds/digits/p-m.gsm -%%DATADIR%%/sounds/digits/pound.gsm -%%DATADIR%%/sounds/digits/star.gsm -%%DATADIR%%/sounds/digits/thousand.gsm -%%DATADIR%%/sounds/digits/today.gsm -%%DATADIR%%/sounds/digits/tomorrow.gsm -%%DATADIR%%/sounds/digits/yesterday.gsm -%%DATADIR%%/sounds/dir-instr.gsm -%%DATADIR%%/sounds/dir-intro-fn.gsm -%%DATADIR%%/sounds/dir-intro.gsm -%%DATADIR%%/sounds/dir-nomatch.gsm -%%DATADIR%%/sounds/dir-nomore.gsm -%%DATADIR%%/sounds/hello-world.gsm -%%DATADIR%%/sounds/hours.gsm -%%DATADIR%%/sounds/invalid.gsm -%%DATADIR%%/sounds/letters/a.gsm -%%DATADIR%%/sounds/letters/at.gsm -%%DATADIR%%/sounds/letters/b.gsm -%%DATADIR%%/sounds/letters/c.gsm -%%DATADIR%%/sounds/letters/d.gsm -%%DATADIR%%/sounds/letters/dash.gsm -%%DATADIR%%/sounds/letters/dollar.gsm -%%DATADIR%%/sounds/letters/dot.gsm -%%DATADIR%%/sounds/letters/e.gsm -%%DATADIR%%/sounds/letters/equals.gsm -%%DATADIR%%/sounds/letters/exclaimation-point.gsm -%%DATADIR%%/sounds/letters/f.gsm -%%DATADIR%%/sounds/letters/g.gsm -%%DATADIR%%/sounds/letters/h.gsm -%%DATADIR%%/sounds/letters/i.gsm -%%DATADIR%%/sounds/letters/j.gsm -%%DATADIR%%/sounds/letters/k.gsm -%%DATADIR%%/sounds/letters/l.gsm -%%DATADIR%%/sounds/letters/m.gsm -%%DATADIR%%/sounds/letters/n.gsm -%%DATADIR%%/sounds/letters/o.gsm -%%DATADIR%%/sounds/letters/p.gsm -%%DATADIR%%/sounds/letters/plus.gsm -%%DATADIR%%/sounds/letters/q.gsm -%%DATADIR%%/sounds/letters/r.gsm -%%DATADIR%%/sounds/letters/s.gsm -%%DATADIR%%/sounds/letters/slash.gsm -%%DATADIR%%/sounds/letters/space.gsm -%%DATADIR%%/sounds/letters/t.gsm -%%DATADIR%%/sounds/letters/u.gsm -%%DATADIR%%/sounds/letters/v.gsm -%%DATADIR%%/sounds/letters/w.gsm -%%DATADIR%%/sounds/letters/x.gsm -%%DATADIR%%/sounds/letters/y.gsm -%%DATADIR%%/sounds/letters/z.gsm -%%DATADIR%%/sounds/letters/zed.gsm -%%DATADIR%%/sounds/minutes.gsm -%%DATADIR%%/sounds/pbx-invalid.gsm -%%DATADIR%%/sounds/pbx-invalidpark.gsm -%%DATADIR%%/sounds/pbx-transfer.gsm -%%DATADIR%%/sounds/phonetic/9_p.gsm -%%DATADIR%%/sounds/phonetic/a_p.gsm -%%DATADIR%%/sounds/phonetic/b_p.gsm -%%DATADIR%%/sounds/phonetic/c_p.gsm -%%DATADIR%%/sounds/phonetic/d_p.gsm -%%DATADIR%%/sounds/phonetic/e_p.gsm -%%DATADIR%%/sounds/phonetic/f_p.gsm -%%DATADIR%%/sounds/phonetic/g_p.gsm -%%DATADIR%%/sounds/phonetic/h_p.gsm -%%DATADIR%%/sounds/phonetic/i_p.gsm -%%DATADIR%%/sounds/phonetic/j_p.gsm -%%DATADIR%%/sounds/phonetic/k_p.gsm -%%DATADIR%%/sounds/phonetic/l_p.gsm -%%DATADIR%%/sounds/phonetic/m_p.gsm -%%DATADIR%%/sounds/phonetic/n_p.gsm -%%DATADIR%%/sounds/phonetic/o_p.gsm -%%DATADIR%%/sounds/phonetic/p_p.gsm -%%DATADIR%%/sounds/phonetic/q_p.gsm -%%DATADIR%%/sounds/phonetic/r_p.gsm -%%DATADIR%%/sounds/phonetic/s_p.gsm -%%DATADIR%%/sounds/phonetic/t_p.gsm -%%DATADIR%%/sounds/phonetic/u_p.gsm -%%DATADIR%%/sounds/phonetic/v_p.gsm -%%DATADIR%%/sounds/phonetic/w_p.gsm -%%DATADIR%%/sounds/phonetic/x_p.gsm -%%DATADIR%%/sounds/phonetic/y_p.gsm -%%DATADIR%%/sounds/phonetic/z_p.gsm -%%DATADIR%%/sounds/priv-callee-options.gsm -%%DATADIR%%/sounds/priv-callpending.gsm -%%DATADIR%%/sounds/priv-introsaved.gsm -%%DATADIR%%/sounds/priv-recordintro.gsm -%%DATADIR%%/sounds/privacy-incorrect.gsm -%%DATADIR%%/sounds/privacy-prompt.gsm -%%DATADIR%%/sounds/privacy-thankyou.gsm -%%DATADIR%%/sounds/privacy-unident.gsm -%%DATADIR%%/sounds/queue-callswaiting.gsm -%%DATADIR%%/sounds/queue-holdtime.gsm -%%DATADIR%%/sounds/queue-less-than.gsm -%%DATADIR%%/sounds/queue-minutes.gsm -%%DATADIR%%/sounds/queue-periodic-announce.gsm -%%DATADIR%%/sounds/queue-reporthold.gsm -%%DATADIR%%/sounds/queue-seconds.gsm -%%DATADIR%%/sounds/queue-thankyou.gsm -%%DATADIR%%/sounds/queue-thereare.gsm -%%DATADIR%%/sounds/queue-youarenext.gsm -%%DATADIR%%/sounds/screen-callee-options.gsm -%%DATADIR%%/sounds/seconds.gsm -%%DATADIR%%/sounds/spy-agent.gsm -%%DATADIR%%/sounds/spy-h323.gsm -%%DATADIR%%/sounds/spy-iax.gsm -%%DATADIR%%/sounds/spy-iax2.gsm -%%DATADIR%%/sounds/spy-mgcp.gsm -%%DATADIR%%/sounds/spy-sip.gsm -%%DATADIR%%/sounds/spy-skinny.gsm -%%DATADIR%%/sounds/spy-zap.gsm -%%DATADIR%%/sounds/ss-noservice.gsm -%%DATADIR%%/sounds/transfer.gsm -%%DATADIR%%/sounds/tt-allbusy.gsm -%%DATADIR%%/sounds/tt-monkeys.gsm -%%DATADIR%%/sounds/tt-monkeysintro.gsm -%%DATADIR%%/sounds/tt-somethingwrong.gsm -%%DATADIR%%/sounds/tt-weasels.gsm -%%DATADIR%%/sounds/vm-Cust1.gsm -%%DATADIR%%/sounds/vm-Cust2.gsm -%%DATADIR%%/sounds/vm-Cust3.gsm -%%DATADIR%%/sounds/vm-Cust4.gsm -%%DATADIR%%/sounds/vm-Cust5.gsm -%%DATADIR%%/sounds/vm-Family.gsm -%%DATADIR%%/sounds/vm-Friends.gsm -%%DATADIR%%/sounds/vm-INBOX.gsm -%%DATADIR%%/sounds/vm-Old.gsm -%%DATADIR%%/sounds/vm-Work.gsm -%%DATADIR%%/sounds/vm-advopts.gsm -%%DATADIR%%/sounds/vm-and.gsm -%%DATADIR%%/sounds/vm-calldiffnum.gsm -%%DATADIR%%/sounds/vm-changeto.gsm -%%DATADIR%%/sounds/vm-delete.gsm -%%DATADIR%%/sounds/vm-deleted.gsm -%%DATADIR%%/sounds/vm-dialout.gsm -%%DATADIR%%/sounds/vm-enter-num-to-call.gsm -%%DATADIR%%/sounds/vm-extension.gsm -%%DATADIR%%/sounds/vm-first.gsm -%%DATADIR%%/sounds/vm-for.gsm -%%DATADIR%%/sounds/vm-forward.gsm -%%DATADIR%%/sounds/vm-forwardoptions.gsm -%%DATADIR%%/sounds/vm-from-extension.gsm -%%DATADIR%%/sounds/vm-from-phonenumber.gsm -%%DATADIR%%/sounds/vm-from.gsm -%%DATADIR%%/sounds/vm-goodbye.gsm -%%DATADIR%%/sounds/vm-helpexit.gsm -%%DATADIR%%/sounds/vm-incorrect-mailbox.gsm -%%DATADIR%%/sounds/vm-incorrect.gsm -%%DATADIR%%/sounds/vm-instructions.gsm -%%DATADIR%%/sounds/vm-intro.gsm -%%DATADIR%%/sounds/vm-isonphone.gsm -%%DATADIR%%/sounds/vm-isunavail.gsm -%%DATADIR%%/sounds/vm-last.gsm -%%DATADIR%%/sounds/vm-leavemsg.gsm -%%DATADIR%%/sounds/vm-login.gsm -%%DATADIR%%/sounds/vm-mailboxfull.gsm -%%DATADIR%%/sounds/vm-message.gsm -%%DATADIR%%/sounds/vm-messages.gsm -%%DATADIR%%/sounds/vm-minutes.gsm -%%DATADIR%%/sounds/vm-mismatch.gsm -%%DATADIR%%/sounds/vm-msginstruct.gsm -%%DATADIR%%/sounds/vm-msgsaved.gsm -%%DATADIR%%/sounds/vm-newpassword.gsm -%%DATADIR%%/sounds/vm-newuser.gsm -%%DATADIR%%/sounds/vm-next.gsm -%%DATADIR%%/sounds/vm-no.gsm -%%DATADIR%%/sounds/vm-nobodyavail.gsm -%%DATADIR%%/sounds/vm-nobox.gsm -%%DATADIR%%/sounds/vm-nomore.gsm -%%DATADIR%%/sounds/vm-nonumber.gsm -%%DATADIR%%/sounds/vm-num-i-have.gsm -%%DATADIR%%/sounds/vm-onefor.gsm -%%DATADIR%%/sounds/vm-options.gsm -%%DATADIR%%/sounds/vm-opts.gsm -%%DATADIR%%/sounds/vm-passchanged.gsm -%%DATADIR%%/sounds/vm-password.gsm -%%DATADIR%%/sounds/vm-press.gsm -%%DATADIR%%/sounds/vm-prev.gsm -%%DATADIR%%/sounds/vm-reachoper.gsm -%%DATADIR%%/sounds/vm-rec-busy.gsm -%%DATADIR%%/sounds/vm-rec-name.gsm -%%DATADIR%%/sounds/vm-rec-temp.gsm -%%DATADIR%%/sounds/vm-rec-unv.gsm -%%DATADIR%%/sounds/vm-received.gsm -%%DATADIR%%/sounds/vm-reenterpassword.gsm -%%DATADIR%%/sounds/vm-repeat.gsm -%%DATADIR%%/sounds/vm-review.gsm -%%DATADIR%%/sounds/vm-saved.gsm -%%DATADIR%%/sounds/vm-savedto.gsm -%%DATADIR%%/sounds/vm-savefolder.gsm -%%DATADIR%%/sounds/vm-savemessage.gsm -%%DATADIR%%/sounds/vm-saveoper.gsm -%%DATADIR%%/sounds/vm-sorry.gsm -%%DATADIR%%/sounds/vm-star-cancel.gsm -%%DATADIR%%/sounds/vm-starmain.gsm -%%DATADIR%%/sounds/vm-tempgreeting.gsm -%%DATADIR%%/sounds/vm-tempgreeting2.gsm -%%DATADIR%%/sounds/vm-tempremoved.gsm -%%DATADIR%%/sounds/vm-then-pound.gsm -%%DATADIR%%/sounds/vm-theperson.gsm -%%DATADIR%%/sounds/vm-tocallback.gsm -%%DATADIR%%/sounds/vm-tocallnum.gsm -%%DATADIR%%/sounds/vm-tocancel.gsm -%%DATADIR%%/sounds/vm-tocancelmsg.gsm -%%DATADIR%%/sounds/vm-toenternumber.gsm -%%DATADIR%%/sounds/vm-toforward.gsm -%%DATADIR%%/sounds/vm-tohearenv.gsm -%%DATADIR%%/sounds/vm-tomakecall.gsm -%%DATADIR%%/sounds/vm-tooshort.gsm -%%DATADIR%%/sounds/vm-toreply.gsm -%%DATADIR%%/sounds/vm-torerecord.gsm -%%DATADIR%%/sounds/vm-undelete.gsm -%%DATADIR%%/sounds/vm-undeleted.gsm -%%DATADIR%%/sounds/vm-unknown-caller.gsm -%%DATADIR%%/sounds/vm-whichbox.gsm -%%DATADIR%%/sounds/vm-youhave.gsm -@dirrm %%DATADIR%%/sounds/priv-callerintros -@dirrm %%DATADIR%%/sounds/phonetic -@dirrm %%DATADIR%%/sounds/letters -@dirrm %%DATADIR%%/sounds/digits -@dirrm %%DATADIR%%/sounds/dictate -@dirrm %%DATADIR%%/sounds -@dirrm %%DATADIR%%/mohmp3 -@dirrm %%DATADIR%%/keys -@dirrm %%DATADIR%%/images -@dirrm %%DATADIR%%/firmware/iax -@dirrm %%DATADIR%%/firmware -@dirrm %%DATADIR%%/agi-bin -@dirrm %%DATADIR%% +share/asterisk/agi-bin/agi-test.agi +share/asterisk/agi-bin/eagi-sphinx-test +share/asterisk/agi-bin/eagi-test +share/asterisk/agi-bin/jukebox.agi +share/asterisk/agi-bin/xagi-test +share/asterisk/firmware/iax/iaxy.bin +share/asterisk/images/asterisk-intro.jpg +share/asterisk/keys/freeworlddialup.pub +share/asterisk/keys/iaxtel.pub +share/asterisk/moh/.asterisk-moh-freeplay-wav +share/asterisk/moh/CHANGES-asterisk-moh-opsound-2.01 +share/asterisk/moh/CREDITS-asterisk-moh-opsound-2.01 +share/asterisk/moh/LICENSE-asterisk-moh-opsound-2.01 +share/asterisk/moh/macroform-cold_day.wav +share/asterisk/moh/macroform-robot_dity.wav +share/asterisk/moh/macroform-the_simplicity.wav +share/asterisk/moh/manolo_camp-morning_coffee.wav +share/asterisk/moh/reno_project-system.wav +share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.15 +share/asterisk/sounds/CHANGES-asterisk-core-en-1.4.15 +share/asterisk/sounds/CREDITS-asterisk-core-en-1.4.15 +share/asterisk/sounds/LICENSE-asterisk-core-en-1.4.15 +share/asterisk/sounds/agent-alreadyon.gsm +share/asterisk/sounds/agent-incorrect.gsm +share/asterisk/sounds/agent-loggedoff.gsm +share/asterisk/sounds/agent-loginok.gsm +share/asterisk/sounds/agent-newlocation.gsm +share/asterisk/sounds/agent-pass.gsm +share/asterisk/sounds/agent-user.gsm +share/asterisk/sounds/auth-incorrect.gsm +share/asterisk/sounds/auth-thankyou.gsm +share/asterisk/sounds/beep.gsm +share/asterisk/sounds/beeperr.gsm +share/asterisk/sounds/conf-adminmenu-162.gsm +share/asterisk/sounds/conf-adminmenu.gsm +share/asterisk/sounds/conf-enteringno.gsm +share/asterisk/sounds/conf-errormenu.gsm +share/asterisk/sounds/conf-extended.gsm +share/asterisk/sounds/conf-getchannel.gsm +share/asterisk/sounds/conf-getconfno.gsm +share/asterisk/sounds/conf-getpin.gsm +share/asterisk/sounds/conf-hasjoin.gsm +share/asterisk/sounds/conf-hasleft.gsm +share/asterisk/sounds/conf-invalid.gsm +share/asterisk/sounds/conf-invalidpin.gsm +share/asterisk/sounds/conf-kicked.gsm +share/asterisk/sounds/conf-leaderhasleft.gsm +share/asterisk/sounds/conf-locked.gsm +share/asterisk/sounds/conf-lockednow.gsm +share/asterisk/sounds/conf-muted.gsm +share/asterisk/sounds/conf-noempty.gsm +share/asterisk/sounds/conf-nonextended.gsm +share/asterisk/sounds/conf-onlyone.gsm +share/asterisk/sounds/conf-onlyperson.gsm +share/asterisk/sounds/conf-otherinparty.gsm +share/asterisk/sounds/conf-placeintoconf.gsm +share/asterisk/sounds/conf-thereare.gsm +share/asterisk/sounds/conf-unlockednow.gsm +share/asterisk/sounds/conf-unmuted.gsm +share/asterisk/sounds/conf-usermenu-162.gsm +share/asterisk/sounds/conf-usermenu.gsm +share/asterisk/sounds/conf-userswilljoin.gsm +share/asterisk/sounds/conf-userwilljoin.gsm +share/asterisk/sounds/conf-waitforleader.gsm +share/asterisk/sounds/core-sounds-en.txt +share/asterisk/sounds/demo-abouttotry.gsm +share/asterisk/sounds/demo-congrats.gsm +share/asterisk/sounds/demo-echodone.gsm +share/asterisk/sounds/demo-echotest.gsm +share/asterisk/sounds/demo-enterkeywords.gsm +share/asterisk/sounds/demo-instruct.gsm +share/asterisk/sounds/demo-moreinfo.gsm +share/asterisk/sounds/demo-nogo.gsm +share/asterisk/sounds/demo-nomatch.gsm +share/asterisk/sounds/demo-thanks.gsm +share/asterisk/sounds/dictate/both_help.gsm +share/asterisk/sounds/dictate/enter_filename.gsm +share/asterisk/sounds/dictate/forhelp.gsm +share/asterisk/sounds/dictate/pause.gsm +share/asterisk/sounds/dictate/paused.gsm +share/asterisk/sounds/dictate/play_help.gsm +share/asterisk/sounds/dictate/playback.gsm +share/asterisk/sounds/dictate/playback_mode.gsm +share/asterisk/sounds/dictate/record.gsm +share/asterisk/sounds/dictate/record_help.gsm +share/asterisk/sounds/dictate/record_mode.gsm +share/asterisk/sounds/dictate/truncating_audio.gsm +share/asterisk/sounds/digits/0.gsm +share/asterisk/sounds/digits/1.gsm +share/asterisk/sounds/digits/10.gsm +share/asterisk/sounds/digits/11.gsm +share/asterisk/sounds/digits/12.gsm +share/asterisk/sounds/digits/13.gsm +share/asterisk/sounds/digits/14.gsm +share/asterisk/sounds/digits/15.gsm +share/asterisk/sounds/digits/16.gsm +share/asterisk/sounds/digits/17.gsm +share/asterisk/sounds/digits/18.gsm +share/asterisk/sounds/digits/19.gsm +share/asterisk/sounds/digits/2.gsm +share/asterisk/sounds/digits/20.gsm +share/asterisk/sounds/digits/3.gsm +share/asterisk/sounds/digits/30.gsm +share/asterisk/sounds/digits/4.gsm +share/asterisk/sounds/digits/40.gsm +share/asterisk/sounds/digits/5.gsm +share/asterisk/sounds/digits/50.gsm +share/asterisk/sounds/digits/6.gsm +share/asterisk/sounds/digits/60.gsm +share/asterisk/sounds/digits/7.gsm +share/asterisk/sounds/digits/70.gsm +share/asterisk/sounds/digits/8.gsm +share/asterisk/sounds/digits/80.gsm +share/asterisk/sounds/digits/9.gsm +share/asterisk/sounds/digits/90.gsm +share/asterisk/sounds/digits/a-m.gsm +share/asterisk/sounds/digits/at.gsm +share/asterisk/sounds/digits/day-0.gsm +share/asterisk/sounds/digits/day-1.gsm +share/asterisk/sounds/digits/day-2.gsm +share/asterisk/sounds/digits/day-3.gsm +share/asterisk/sounds/digits/day-4.gsm +share/asterisk/sounds/digits/day-5.gsm +share/asterisk/sounds/digits/day-6.gsm +share/asterisk/sounds/digits/dollars.gsm +share/asterisk/sounds/digits/h-1.gsm +share/asterisk/sounds/digits/h-10.gsm +share/asterisk/sounds/digits/h-11.gsm +share/asterisk/sounds/digits/h-12.gsm +share/asterisk/sounds/digits/h-13.gsm +share/asterisk/sounds/digits/h-14.gsm +share/asterisk/sounds/digits/h-15.gsm +share/asterisk/sounds/digits/h-16.gsm +share/asterisk/sounds/digits/h-17.gsm +share/asterisk/sounds/digits/h-18.gsm +share/asterisk/sounds/digits/h-19.gsm +share/asterisk/sounds/digits/h-2.gsm +share/asterisk/sounds/digits/h-20.gsm +share/asterisk/sounds/digits/h-3.gsm +share/asterisk/sounds/digits/h-30.gsm +share/asterisk/sounds/digits/h-4.gsm +share/asterisk/sounds/digits/h-5.gsm +share/asterisk/sounds/digits/h-6.gsm +share/asterisk/sounds/digits/h-7.gsm +share/asterisk/sounds/digits/h-8.gsm +share/asterisk/sounds/digits/h-9.gsm +share/asterisk/sounds/digits/hundred.gsm +share/asterisk/sounds/digits/million.gsm +share/asterisk/sounds/digits/minus.gsm +share/asterisk/sounds/digits/mon-0.gsm +share/asterisk/sounds/digits/mon-1.gsm +share/asterisk/sounds/digits/mon-10.gsm +share/asterisk/sounds/digits/mon-11.gsm +share/asterisk/sounds/digits/mon-2.gsm +share/asterisk/sounds/digits/mon-3.gsm +share/asterisk/sounds/digits/mon-4.gsm +share/asterisk/sounds/digits/mon-5.gsm +share/asterisk/sounds/digits/mon-6.gsm +share/asterisk/sounds/digits/mon-7.gsm +share/asterisk/sounds/digits/mon-8.gsm +share/asterisk/sounds/digits/mon-9.gsm +share/asterisk/sounds/digits/oclock.gsm +share/asterisk/sounds/digits/oh.gsm +share/asterisk/sounds/digits/p-m.gsm +share/asterisk/sounds/digits/pound.gsm +share/asterisk/sounds/digits/star.gsm +share/asterisk/sounds/digits/thousand.gsm +share/asterisk/sounds/digits/today.gsm +share/asterisk/sounds/digits/tomorrow.gsm +share/asterisk/sounds/digits/yesterday.gsm +share/asterisk/sounds/dir-first.gsm +share/asterisk/sounds/dir-firstlast.gsm +share/asterisk/sounds/dir-instr.gsm +share/asterisk/sounds/dir-intro-fn.gsm +share/asterisk/sounds/dir-intro.gsm +share/asterisk/sounds/dir-last.gsm +share/asterisk/sounds/dir-multi1.gsm +share/asterisk/sounds/dir-multi2.gsm +share/asterisk/sounds/dir-multi3.gsm +share/asterisk/sounds/dir-multi9.gsm +share/asterisk/sounds/dir-nomatch.gsm +share/asterisk/sounds/dir-nomore.gsm +share/asterisk/sounds/dir-pls-enter.gsm +share/asterisk/sounds/dir-usingkeypad.gsm +share/asterisk/sounds/dir-welcome.gsm +share/asterisk/sounds/followme/call-from.gsm +share/asterisk/sounds/followme/no-recording.gsm +share/asterisk/sounds/followme/options.gsm +share/asterisk/sounds/followme/pls-hold-while-try.gsm +share/asterisk/sounds/followme/sorry.gsm +share/asterisk/sounds/followme/status.gsm +share/asterisk/sounds/hello-world.gsm +share/asterisk/sounds/hours.gsm +share/asterisk/sounds/invalid.gsm +share/asterisk/sounds/letters/a.gsm +share/asterisk/sounds/letters/ascii123.gsm +share/asterisk/sounds/letters/ascii124.gsm +share/asterisk/sounds/letters/ascii125.gsm +share/asterisk/sounds/letters/ascii126.gsm +share/asterisk/sounds/letters/ascii34.gsm +share/asterisk/sounds/letters/ascii36.gsm +share/asterisk/sounds/letters/ascii37.gsm +share/asterisk/sounds/letters/ascii38.gsm +share/asterisk/sounds/letters/ascii39.gsm +share/asterisk/sounds/letters/ascii40.gsm +share/asterisk/sounds/letters/ascii41.gsm +share/asterisk/sounds/letters/ascii42.gsm +share/asterisk/sounds/letters/ascii44.gsm +share/asterisk/sounds/letters/ascii58.gsm +share/asterisk/sounds/letters/ascii59.gsm +share/asterisk/sounds/letters/ascii60.gsm +share/asterisk/sounds/letters/ascii62.gsm +share/asterisk/sounds/letters/ascii63.gsm +share/asterisk/sounds/letters/ascii91.gsm +share/asterisk/sounds/letters/ascii92.gsm +share/asterisk/sounds/letters/ascii93.gsm +share/asterisk/sounds/letters/ascii94.gsm +share/asterisk/sounds/letters/ascii95.gsm +share/asterisk/sounds/letters/ascii96.gsm +share/asterisk/sounds/letters/asterisk.gsm +share/asterisk/sounds/letters/at.gsm +share/asterisk/sounds/letters/b.gsm +share/asterisk/sounds/letters/c.gsm +share/asterisk/sounds/letters/d.gsm +share/asterisk/sounds/letters/dash.gsm +share/asterisk/sounds/letters/dollar.gsm +share/asterisk/sounds/letters/dot.gsm +share/asterisk/sounds/letters/e.gsm +share/asterisk/sounds/letters/equals.gsm +share/asterisk/sounds/letters/exclaimation-point.gsm +share/asterisk/sounds/letters/f.gsm +share/asterisk/sounds/letters/g.gsm +share/asterisk/sounds/letters/h.gsm +share/asterisk/sounds/letters/i.gsm +share/asterisk/sounds/letters/j.gsm +share/asterisk/sounds/letters/k.gsm +share/asterisk/sounds/letters/l.gsm +share/asterisk/sounds/letters/m.gsm +share/asterisk/sounds/letters/n.gsm +share/asterisk/sounds/letters/o.gsm +share/asterisk/sounds/letters/p.gsm +share/asterisk/sounds/letters/plus.gsm +share/asterisk/sounds/letters/q.gsm +share/asterisk/sounds/letters/r.gsm +share/asterisk/sounds/letters/s.gsm +share/asterisk/sounds/letters/slash.gsm +share/asterisk/sounds/letters/space.gsm +share/asterisk/sounds/letters/t.gsm +share/asterisk/sounds/letters/u.gsm +share/asterisk/sounds/letters/v.gsm +share/asterisk/sounds/letters/w.gsm +share/asterisk/sounds/letters/x.gsm +share/asterisk/sounds/letters/y.gsm +share/asterisk/sounds/letters/z.gsm +share/asterisk/sounds/letters/zed.gsm +share/asterisk/sounds/minutes.gsm +share/asterisk/sounds/pbx-invalid.gsm +share/asterisk/sounds/pbx-invalidpark.gsm +share/asterisk/sounds/pbx-transfer.gsm +share/asterisk/sounds/phonetic/9_p.gsm +share/asterisk/sounds/phonetic/a_p.gsm +share/asterisk/sounds/phonetic/b_p.gsm +share/asterisk/sounds/phonetic/c_p.gsm +share/asterisk/sounds/phonetic/d_p.gsm +share/asterisk/sounds/phonetic/e_p.gsm +share/asterisk/sounds/phonetic/f_p.gsm +share/asterisk/sounds/phonetic/g_p.gsm +share/asterisk/sounds/phonetic/h_p.gsm +share/asterisk/sounds/phonetic/i_p.gsm +share/asterisk/sounds/phonetic/j_p.gsm +share/asterisk/sounds/phonetic/k_p.gsm +share/asterisk/sounds/phonetic/l_p.gsm +share/asterisk/sounds/phonetic/m_p.gsm +share/asterisk/sounds/phonetic/n_p.gsm +share/asterisk/sounds/phonetic/o_p.gsm +share/asterisk/sounds/phonetic/p_p.gsm +share/asterisk/sounds/phonetic/q_p.gsm +share/asterisk/sounds/phonetic/r_p.gsm +share/asterisk/sounds/phonetic/s_p.gsm +share/asterisk/sounds/phonetic/t_p.gsm +share/asterisk/sounds/phonetic/u_p.gsm +share/asterisk/sounds/phonetic/v_p.gsm +share/asterisk/sounds/phonetic/w_p.gsm +share/asterisk/sounds/phonetic/x_p.gsm +share/asterisk/sounds/phonetic/y_p.gsm +share/asterisk/sounds/phonetic/z_p.gsm +share/asterisk/sounds/priv-callee-options.gsm +share/asterisk/sounds/priv-callpending.gsm +share/asterisk/sounds/priv-introsaved.gsm +share/asterisk/sounds/priv-recordintro.gsm +share/asterisk/sounds/privacy-incorrect.gsm +share/asterisk/sounds/privacy-prompt.gsm +share/asterisk/sounds/privacy-thankyou.gsm +share/asterisk/sounds/privacy-unident.gsm +share/asterisk/sounds/queue-callswaiting.gsm +share/asterisk/sounds/queue-holdtime.gsm +share/asterisk/sounds/queue-less-than.gsm +share/asterisk/sounds/queue-minutes.gsm +share/asterisk/sounds/queue-periodic-announce.gsm +share/asterisk/sounds/queue-quantity1.gsm +share/asterisk/sounds/queue-quantity2.gsm +share/asterisk/sounds/queue-reporthold.gsm +share/asterisk/sounds/queue-seconds.gsm +share/asterisk/sounds/queue-thankyou.gsm +share/asterisk/sounds/queue-thereare.gsm +share/asterisk/sounds/queue-youarenext.gsm +share/asterisk/sounds/screen-callee-options.gsm +share/asterisk/sounds/seconds.gsm +share/asterisk/sounds/silence/1.gsm +share/asterisk/sounds/silence/10.gsm +share/asterisk/sounds/silence/2.gsm +share/asterisk/sounds/silence/3.gsm +share/asterisk/sounds/silence/4.gsm +share/asterisk/sounds/silence/5.gsm +share/asterisk/sounds/silence/6.gsm +share/asterisk/sounds/silence/7.gsm +share/asterisk/sounds/silence/8.gsm +share/asterisk/sounds/silence/9.gsm +share/asterisk/sounds/spy-agent.gsm +share/asterisk/sounds/spy-console.gsm +share/asterisk/sounds/spy-dahdi.gsm +share/asterisk/sounds/spy-h323.gsm +share/asterisk/sounds/spy-iax.gsm +share/asterisk/sounds/spy-iax2.gsm +share/asterisk/sounds/spy-jingle.gsm +share/asterisk/sounds/spy-local.gsm +share/asterisk/sounds/spy-mgcp.gsm +share/asterisk/sounds/spy-misdn.gsm +share/asterisk/sounds/spy-mobile.gsm +share/asterisk/sounds/spy-nbs.gsm +share/asterisk/sounds/spy-sip.gsm +share/asterisk/sounds/spy-skinny.gsm +share/asterisk/sounds/spy-unistim.gsm +share/asterisk/sounds/spy-usbradio.gsm +share/asterisk/sounds/spy-zap.gsm +share/asterisk/sounds/ss-noservice.gsm +share/asterisk/sounds/transfer.gsm +share/asterisk/sounds/tt-allbusy.gsm +share/asterisk/sounds/tt-monkeys.gsm +share/asterisk/sounds/tt-monkeysintro.gsm +share/asterisk/sounds/tt-somethingwrong.gsm +share/asterisk/sounds/tt-weasels.gsm +share/asterisk/sounds/vm-Cust1.gsm +share/asterisk/sounds/vm-Cust2.gsm +share/asterisk/sounds/vm-Cust3.gsm +share/asterisk/sounds/vm-Cust4.gsm +share/asterisk/sounds/vm-Cust5.gsm +share/asterisk/sounds/vm-Family.gsm +share/asterisk/sounds/vm-Friends.gsm +share/asterisk/sounds/vm-INBOX.gsm +share/asterisk/sounds/vm-Old.gsm +share/asterisk/sounds/vm-Urgent.gsm +share/asterisk/sounds/vm-Work.gsm +share/asterisk/sounds/vm-advopts.gsm +share/asterisk/sounds/vm-and.gsm +share/asterisk/sounds/vm-calldiffnum.gsm +share/asterisk/sounds/vm-changeto.gsm +share/asterisk/sounds/vm-delete.gsm +share/asterisk/sounds/vm-deleted.gsm +share/asterisk/sounds/vm-dialout.gsm +share/asterisk/sounds/vm-duration.gsm +share/asterisk/sounds/vm-enter-num-to-call.gsm +share/asterisk/sounds/vm-extension.gsm +share/asterisk/sounds/vm-first.gsm +share/asterisk/sounds/vm-for.gsm +share/asterisk/sounds/vm-forward-multiple.gsm +share/asterisk/sounds/vm-forward.gsm +share/asterisk/sounds/vm-forwardoptions.gsm +share/asterisk/sounds/vm-from-extension.gsm +share/asterisk/sounds/vm-from-phonenumber.gsm +share/asterisk/sounds/vm-from.gsm +share/asterisk/sounds/vm-goodbye.gsm +share/asterisk/sounds/vm-helpexit.gsm +share/asterisk/sounds/vm-incorrect-mailbox.gsm +share/asterisk/sounds/vm-incorrect.gsm +share/asterisk/sounds/vm-instructions.gsm +share/asterisk/sounds/vm-intro.gsm +share/asterisk/sounds/vm-invalid-password.gsm +share/asterisk/sounds/vm-invalidpassword.gsm +share/asterisk/sounds/vm-isonphone.gsm +share/asterisk/sounds/vm-isunavail.gsm +share/asterisk/sounds/vm-last.gsm +share/asterisk/sounds/vm-leavemsg.gsm +share/asterisk/sounds/vm-login.gsm +share/asterisk/sounds/vm-mailboxfull.gsm +share/asterisk/sounds/vm-marked-nonurgent.gsm +share/asterisk/sounds/vm-marked-urgent.gsm +share/asterisk/sounds/vm-message.gsm +share/asterisk/sounds/vm-messages.gsm +share/asterisk/sounds/vm-minutes.gsm +share/asterisk/sounds/vm-mismatch.gsm +share/asterisk/sounds/vm-msginstruct.gsm +share/asterisk/sounds/vm-msgsaved.gsm +share/asterisk/sounds/vm-newpassword.gsm +share/asterisk/sounds/vm-newuser.gsm +share/asterisk/sounds/vm-next.gsm +share/asterisk/sounds/vm-no.gsm +share/asterisk/sounds/vm-nobodyavail.gsm +share/asterisk/sounds/vm-nobox.gsm +share/asterisk/sounds/vm-nomore.gsm +share/asterisk/sounds/vm-nonumber.gsm +share/asterisk/sounds/vm-num-i-have.gsm +share/asterisk/sounds/vm-onefor-full.gsm +share/asterisk/sounds/vm-onefor.gsm +share/asterisk/sounds/vm-options.gsm +share/asterisk/sounds/vm-opts-full.gsm +share/asterisk/sounds/vm-opts.gsm +share/asterisk/sounds/vm-passchanged.gsm +share/asterisk/sounds/vm-password.gsm +share/asterisk/sounds/vm-press.gsm +share/asterisk/sounds/vm-prev.gsm +share/asterisk/sounds/vm-reachoper.gsm +share/asterisk/sounds/vm-rec-busy.gsm +share/asterisk/sounds/vm-rec-name.gsm +share/asterisk/sounds/vm-rec-temp.gsm +share/asterisk/sounds/vm-rec-unv.gsm +share/asterisk/sounds/vm-received.gsm +share/asterisk/sounds/vm-record-prepend.gsm +share/asterisk/sounds/vm-reenterpassword.gsm +share/asterisk/sounds/vm-repeat.gsm +share/asterisk/sounds/vm-review-nonurgent.gsm +share/asterisk/sounds/vm-review-urgent.gsm +share/asterisk/sounds/vm-review.gsm +share/asterisk/sounds/vm-saved.gsm +share/asterisk/sounds/vm-savedto.gsm +share/asterisk/sounds/vm-savefolder.gsm +share/asterisk/sounds/vm-savemessage.gsm +share/asterisk/sounds/vm-saveoper.gsm +share/asterisk/sounds/vm-sorry.gsm +share/asterisk/sounds/vm-star-cancel.gsm +share/asterisk/sounds/vm-starmain.gsm +share/asterisk/sounds/vm-tempgreetactive.gsm +share/asterisk/sounds/vm-tempgreeting.gsm +share/asterisk/sounds/vm-tempgreeting2.gsm +share/asterisk/sounds/vm-tempremoved.gsm +share/asterisk/sounds/vm-then-pound.gsm +share/asterisk/sounds/vm-theperson.gsm +share/asterisk/sounds/vm-tmpexists.gsm +share/asterisk/sounds/vm-tocallback.gsm +share/asterisk/sounds/vm-tocallnum.gsm +share/asterisk/sounds/vm-tocancel.gsm +share/asterisk/sounds/vm-tocancelmsg.gsm +share/asterisk/sounds/vm-toenternumber.gsm +share/asterisk/sounds/vm-toforward.gsm +share/asterisk/sounds/vm-tohearenv.gsm +share/asterisk/sounds/vm-tomakecall.gsm +share/asterisk/sounds/vm-tooshort.gsm +share/asterisk/sounds/vm-toreply.gsm +share/asterisk/sounds/vm-torerecord.gsm +share/asterisk/sounds/vm-undelete.gsm +share/asterisk/sounds/vm-undeleted.gsm +share/asterisk/sounds/vm-unknown-caller.gsm +share/asterisk/sounds/vm-whichbox.gsm +share/asterisk/sounds/vm-youhave.gsm +share/asterisk/static-http/ajamdemo.html +share/asterisk/static-http/astman.css +share/asterisk/static-http/astman.js +share/asterisk/static-http/prototype.js +@dirrm share/asterisk/static-http +@dirrm share/asterisk/sounds/silence +@dirrm share/asterisk/sounds/phonetic +@dirrm share/asterisk/sounds/letters +@dirrm share/asterisk/sounds/fr +@dirrm share/asterisk/sounds/followme +@dirrm share/asterisk/sounds/es +@dirrm share/asterisk/sounds/digits +@dirrm share/asterisk/sounds/dictate +@dirrm share/asterisk/sounds +@dirrm share/asterisk/moh +@dirrm share/asterisk/keys +@dirrm share/asterisk/images +@dirrm share/asterisk/firmware/iax +@dirrm share/asterisk/firmware +@dirrm share/asterisk/agi-bin +@dirrm share/asterisk @dirrm lib/asterisk/modules @dirrm lib/asterisk @dirrm include/asterisk -@dirrm etc/asterisk +@dirrmtry etc/asterisk +@exec mkdir -p %D/share/asterisk/sounds/fr +@exec mkdir -p %D/share/asterisk/sounds/es @cwd /var spool/asterisk/voicemail/default/1234/busy.gsm spool/asterisk/voicemail/default/1234/unavail.gsm @exec mkdir -p %D/log/asterisk/cdr-csv +@exec mkdir -p %D/log/asterisk/cdr-custom @exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX +@exec mkdir -p %D/spool/asterisk/dictate +@exec mkdir -p %D/spool/asterisk/meetme +@exec mkdir -p %D/spool/asterisk/monitor +@exec mkdir -p %D/spool/asterisk/system +@exec mkdir -p %D/spool/asterisk/tmp @dirrm spool/asterisk/dictate @dirrm spool/asterisk/meetme @dirrm spool/asterisk/monitor |