diff options
Diffstat (limited to 'net')
114 files changed, 0 insertions, 12178 deletions
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile deleted file mode 100644 index 7864467f6603..000000000000 --- a/net/asterisk10/Makefile +++ /dev/null @@ -1,245 +0,0 @@ -# New ports collection makefile for: asterisk -# Date created: 17 October 2003 -# Whom: Maxim Sobolev <sobomax@portaone.com> -# -# $FreeBSD$ -# - -PORTNAME= asterisk -PORTVERSION= 1.8.0 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ - http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ -PKGNAMESUFFIX= 18 - -MAINTAINER= flo@smeets.im -COMMENT= An Open Source PBX and telephony toolkit - -LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \ - newt.52:${PORTSDIR}/devel/newt \ - execinfo:${PORTSDIR}/devel/libexecinfo -RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 - -ONLY_FOR_ARCHS= i386 amd64 sparc64 - -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \ - LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-gsm=${LOCALBASE} --localstatedir=/var -CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 -USE_GMAKE= yes -USE_GNOME= libxml2 -USE_BISON= build -USE_RC_SUBR= asterisk.sh -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - MKDIR="${MKDIR}" \ - PWLIBDIR=${LOCALBASE}/share/pwlib \ - OPENH323DIR=${LOCALBASE}/share/openh323 \ - OSVERSION=${OSVERSION} \ - NOISY_BUILD=YES \ - DOCSDIR=${DOCSDIR} \ - ASTCFLAGS="${CFLAGS}" -MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8 -CONFLICTS= asterisk*-1.2* asterisk*-1.4* 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 \ - GSM "Enable GSM codec" on \ - CURL "Enable CURL support" on \ - ILBC "Enable iLBC codec" off \ - SPANDSP "Enable Spandsp faxing support" off \ - EXCHANGE "Enable Exchange calendar support" off - -ASTERISK_USER?= asterisk -ASTERISK_GROUP?= asterisk - -USERS= ${ASTERISK_USER} -GROUPS= ${ASTERISK_GROUP} dahdi - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "i386" || ${ARCH} == "amd64" -OPTIONS+= DAHDI "Enable DAHDI support" on - -# Include this since we have altered OPTIONS. -.include <bsd.port.options.mk> -.endif - -SUB_LIST+= ASTERISK_USER=${ASTERISK_USER} -PLIST_SUB+= ASTERISK_USER=${ASTERISK_USER} -PLIST_SUB+= ASTERISK_GROUP=${ASTERISK_GROUP} - -.if !defined(WITH_H323) -PLIST_SUB+= WITH_H323="@comment " -CONFIGURE_ARGS+= --without-h323 -.else -PLIST_SUB+= WITH_H323="" -CONFIGURE_ARGS+= --with-h323=${LOCALBASE} -LIB_DEPENDS+= pt_r.1:${PORTSDIR}/devel/pwlib \ - h323_r.1:${PORTSDIR}/net/openh323 -.endif - -.if !defined(WITH_DAHDI) -PLIST_SUB+= WITH_DAHDI="@comment " -CONFIGURE_ARGS+= --without-dahdi -.else -PLIST_SUB+= WITH_DAHDI="" -CONFIGURE_ARGS+= --with-dahdi -BUILD_DEPENDS+= libpri>=1.4.10:${PORTSDIR}/misc/libpri \ - ${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi -LIB_DEPENDS+= pri.1:${PORTSDIR}/misc/libpri -RUN_DEPENDS+= ${LOCALBASE}/lib/dahdi/dahdi.ko:${PORTSDIR}/misc/dahdi -.endif - -# -# WITH_FREETDS, WITH_PGSQL and WITH_SQLITE can also be added to MAKE_ENV -# similarly -.if !defined(WITH_ODBC) -PLIST_SUB+= WITH_ODBC="@comment " -CONFIGURE_ARGS+= --without-unixodbc -.else -PLIST_SUB+= WITH_ODBC="" -CONFIGURE_ARGS+= --with-unixodbc --with-ltdl -LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC -USE_AUTOTOOLS= libltdl -.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:${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 \ - --with-sqlite3=no -.else -PLIST_SUB+= WITH_SQLITE="" -CONFIGURE_ARGS+= --with-sqlite -LIB_DEPENDS+= sqlite:${PORTSDIR}/databases/sqlite2 \ - sqlite3:${PORTSDIR}/databases/sqlite3 -.endif - -.if !defined(WITH_ILBC) -PLIST_SUB+= WITH_ILBC="@comment " -.else -PLIST_SUB+= WITH_ILBC="" -EXTRA_PATCHES+= ${PATCHDIR}/ilbc_enable.diff -.endif - -.if !defined(WITH_GSM) -PLIST_SUB+= WITH_GSM="@comment " -CONFIGURE_ARGS+= --without-gsm -.else -PLIST_SUB+= WITH_GSM="" -CONFIGURE_ARGS+= --with-gsm -LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm -.endif - -.if !defined(WITH_CURL) -PLIST_SUB+= WITH_CURL="@comment " -CONFIGURE_ARGS+= --with-libcurl=no -.else -PLIST_SUB+= WITH_CURL="" -CONFIGURE_ARGS+= --with-libcurl -LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl -.endif - -.if !defined(WITH_SPANDSP) -PLIST_SUB+= WITH_SPANDSP="@comment " -CONFIGURE_ARGS+= --without-spandsp -.else -PLIST_SUB+= WITH_SPANDSP="" -CONFIGURE_ARGS+= --with-spandsp -LIB_DEPENDS+= spandsp.2:${PORTSDIR}/comms/spandsp-devel -.endif - -.if !defined(WITH_EXCHANGE) -CONFIGURE_ARGS+= --without-neon --without-neon29 -PLIST_SUB+= WITH_EXCHANGE="@comment " -.else -LIB_DEPENDS+= neon.27:${PORTSDIR}/www/neon29 -PLIST_SUB+= WITH_EXCHANGE="" -.endif - -.if defined(WITH_MISC_PATCHES) -EXTRA_PATCHES+= ${PATCHDIR}/dtmf_debug.diff -EXTRA_PATCHES+= ${PATCHDIR}/feature_disconnect.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 - -post-install: - @${CHOWN} -R ${ASTERISK_USER}:${ASTERISK_GROUP} /var/db/asterisk /var/log/asterisk /var/spool/asterisk - -.include <bsd.port.post.mk> diff --git a/net/asterisk10/distinfo b/net/asterisk10/distinfo deleted file mode 100644 index 2a2c2e11b045..000000000000 --- a/net/asterisk10/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (asterisk-1.8.0.tar.gz) = 8f1edbc8fab23596a6f6ee2881d67c22b4a6cb20bfad84125fcdcb3ff2e1de1b -SIZE (asterisk-1.8.0.tar.gz) = 26035124 diff --git a/net/asterisk10/files/asterisk.sh.in b/net/asterisk10/files/asterisk.sh.in deleted file mode 100644 index 4d10717d64ae..000000000000 --- a/net/asterisk10/files/asterisk.sh.in +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -# PROVIDE: asterisk -# REQUIRE: LOGIN -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf to enable asterisk: -# -# asterisk_enable="YES" -# - -. /etc/rc.subr - -stop_cmd=asterisk_shutdown -asterisk_shutdown () { - echo 'Stopping asterisk' - %%PREFIX%%/sbin/asterisk -nqrx 'core stop now' - sleep 1 - return 0 -} - -name=asterisk -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/asterisk -command_args="-n -U %%ASTERISK_USER%%" - -load_rc_config $name - -pidfile=${asterisk_pidfile:-"/var/run/asterisk.pid"} - -asterisk_enable=${asterisk_enable:-"NO"} - -run_rc_command "$1" diff --git a/net/asterisk10/files/ilbc_enable.diff b/net/asterisk10/files/ilbc_enable.diff deleted file mode 100644 index a2a3c4f73d70..000000000000 --- a/net/asterisk10/files/ilbc_enable.diff +++ /dev/null @@ -1,7599 +0,0 @@ - -$FreeBSD$ - ---- 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/asterisk10/files/patch-Makefile b/net/asterisk10/files/patch-Makefile deleted file mode 100644 index 0fccb52e346a..000000000000 --- a/net/asterisk10/files/patch-Makefile +++ /dev/null @@ -1,112 +0,0 @@ ---- Makefile.orig 2010-10-14 00:24:44.000000000 +0200 -+++ Makefile 2010-11-17 12:24:32.000000000 +0100 -@@ -122,7 +122,7 @@ - OVERWRITE=y - - # Include debug and macro symbols in the executables (-g) and profiling info (-pg) --DEBUG=-g3 -+#DEBUG=-g3 - - # Asterisk.conf is located in ASTETCDIR or by using the -C flag - # when starting Asterisk -@@ -220,11 +220,13 @@ - _ASTCFLAGS+=-isystem /usr/local/include - endif - -+ifneq ($(OSARCH),FreeBSD) - ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),) - 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 -+endif - - ifeq ($(PROC),ppc) - _ASTCFLAGS+=-fsigned-char -@@ -232,7 +234,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) - endif - -@@ -460,13 +462,14 @@ - done - $(INSTALL) -m 644 doc/core-en_US.xml $(DESTDIR)$(ASTDATADIR)/static-http; - if [ -d doc/tex/asterisk ] ; then \ -- $(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \ -+ $(INSTALL) -d $(DESTDIR)$(DOCSDIR) ; \ -+ $(INSTALL) -d $(DESTDIR)$(DOCSDIR)/images ; \ - for n in doc/tex/asterisk/* ; do \ -- $(INSTALL) -m 644 $$n $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \ -+ $(INSTALL) -m 644 $$n $(DESTDIR)$(DOCSDIR) ; \ - done \ - fi - for x in images/*.jpg; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \ -+ $(INSTALL) -m 644 $$x $(DESTDIR)$(DOCSDIR)/images ; \ - done - $(MAKE) -C sounds install - -@@ -526,6 +529,7 @@ - $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/dictate" - $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/meetme" - $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/monitor" -+ $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/outgoing" - $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/system" - $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/tmp" - $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail" -@@ -547,6 +551,7 @@ - $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http" - $(INSTALL) -d "$(DESTDIR)$(ASTMANDIR)/man8" - $(INSTALL) -d "$(DESTDIR)$(AGI_DIR)" -+ $(INSTALL) -d "$(DESTDIR)$(ASTDBDIR)" - - bininstall: _all installdirs $(SUBDIRS_INSTALL) - $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/ -@@ -606,7 +611,7 @@ - @exit 1 - endif - --install: badshell bininstall datafiles -+install: badshell bininstall datafiles samples - @if [ -x /usr/sbin/asterisk-post-install ]; then \ - /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ - fi -@@ -648,29 +653,18 @@ - else \ - echo "Installing $$x" ; \ - fi ; \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ -+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \ - done - - samples: adsi - @echo Installing other config files... - @for x in configs/*.sample; do \ -- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \ -- if [ -f $${dst} ]; then \ -- if [ "$(OVERWRITE)" = "y" ]; then \ -- if cmp -s $${dst} $$x ; then \ -- echo "Config file $$x is unchanged"; \ -- continue; \ -- fi ; \ -- mv -f $${dst} $${dst}.old ; \ -- else \ -- echo "Skipping config file $$x"; \ -- continue; \ -- fi ;\ -+ $(INSTALL) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ; \ -+ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ -+ $(INSTALL) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`; \ - fi ; \ -- echo "Installing file $$x"; \ -- $(INSTALL) -m 644 $$x $${dst} ;\ - done -- if [ "$(OVERWRITE)" = "y" ]; then \ -+ @if true; then \ - echo "Updating asterisk.conf" ; \ - sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ - -e 's|^astmoddir.*$$|astmoddir => $(MODULES_DIR)|' \ diff --git a/net/asterisk10/files/patch-agi::Makefile b/net/asterisk10/files/patch-agi::Makefile deleted file mode 100644 index 277e18e70b08..000000000000 --- a/net/asterisk10/files/patch-agi::Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- ./agi/Makefile.orig 2010-07-23 15:26:41.000000000 +0200 -+++ ./agi/Makefile 2010-11-06 14:54:36.000000000 +0100 -@@ -16,7 +16,9 @@ - - .PHONY: clean all uninstall - --AGIS=$(MENUSELECT_AGIS) -+AGIS_BIN=eagi-test eagi-sphinx-test -+AGIS_SCR=agi-test.agi jukebox.agi -+AGIS=$(AGIS_SCR) $(AGIS_BIN) - - ifeq ($(OSARCH),SunOS) - LIBS+=-lsocket -lnsl diff --git a/net/asterisk10/files/patch-channels-chan_dahdi.c b/net/asterisk10/files/patch-channels-chan_dahdi.c deleted file mode 100644 index ef904b48472e..000000000000 --- a/net/asterisk10/files/patch-channels-chan_dahdi.c +++ /dev/null @@ -1,33 +0,0 @@ ---- channels/chan_dahdi.c.orig 2010-11-09 11:18:39.000000000 +0100 -+++ channels/chan_dahdi.c 2010-11-09 11:22:15.000000000 +0100 -@@ -4688,6 +4688,8 @@ - return; - } - if (p->echocancel.head.tap_length) { -+ struct dahdi_echocanparams *pecp; -+ - #if defined(HAVE_PRI) || defined(HAVE_SS7) - switch (p->sig) { - #if defined(HAVE_PRI) -@@ -4718,7 +4720,9 @@ - break; - } - #endif /* defined(HAVE_PRI) || defined(HAVE_SS7) */ -- res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &p->echocancel); -+ -+ pecp = &p->echocancel.head; -+ res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp); - if (res) { - ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno)); - } else { -@@ -4752,8 +4756,9 @@ - - if (p->echocanon) { - struct dahdi_echocanparams ecp = { .tap_length = 0 }; -+ struct dahdi_echocanparams *pecp = &ecp; - -- res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &ecp); -+ res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp); - - if (res) - ast_log(LOG_WARNING, "Unable to disable echo cancellation on channel %d: %s\n", p->channel, strerror(errno)); diff --git a/net/asterisk10/files/patch-channels::Makefile b/net/asterisk10/files/patch-channels::Makefile deleted file mode 100644 index 323c78d86f9a..000000000000 --- a/net/asterisk10/files/patch-channels::Makefile +++ /dev/null @@ -1,29 +0,0 @@ ---- ./channels/Makefile.orig 2010-06-07 22:04:42.000000000 +0200 -+++ ./channels/Makefile 2010-11-06 14:54:36.000000000 +0100 -@@ -27,9 +27,10 @@ - endif - - ifeq ($(OSARCH),FreeBSD) -- PTLIB=-lpt_FreeBSD_x86_r -- H323LIB=-lh323_FreeBSD_x86_r -+ PTLIB=-lpt_r -+ H323LIB=-lh323_r - CHANH323LIB=-pthread -+ H323LDLIBS=$(PTLIB) $(H323LIB) $(CHANH323LIB) - endif - - ifeq ($(OSARCH),NetBSD) -@@ -86,9 +87,13 @@ - else - chan_h323.so: chan_h323.o h323/libchanh323.a - $(ECHO_PREFIX) echo " [LD] $^ -> $@" -+ifeq ($(OSARCH),FreeBSD) -+ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -L$(LOCALBASE)/lib $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB) -+else - $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat - endif - endif -+endif - - chan_misdn.o: _ASTCFLAGS+=-Imisdn - diff --git a/net/asterisk10/files/patch-channels__sip__include__sip.h b/net/asterisk10/files/patch-channels__sip__include__sip.h deleted file mode 100644 index f19fbf763646..000000000000 --- a/net/asterisk10/files/patch-channels__sip__include__sip.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./channels/sip/include/sip.h.orig 2010-11-08 04:46:46.000000000 +0100 -+++ ./channels/sip/include/sip.h 2010-11-08 04:47:07.000000000 +0100 -@@ -180,7 +180,7 @@ - #define DEFAULT_MOHINTERPRET "default" /*!< The default music class */ - #define DEFAULT_MOHSUGGEST "" - #define DEFAULT_VMEXTEN "asterisk" /*!< Default voicemail extension */ --#define DEFAULT_CALLERID "asterisk" /*!< Default caller ID */ -+#define DEFAULT_CALLERID "Unknown" /*!< Default caller ID */ - #define DEFAULT_MWI_FROM "" - #define DEFAULT_NOTIFYMIME "application/simple-message-summary" - #define DEFAULT_ALLOWGUEST TRUE diff --git a/net/asterisk10/files/patch-channels_h323_Makefile.in b/net/asterisk10/files/patch-channels_h323_Makefile.in deleted file mode 100644 index d5d5c99300c1..000000000000 --- a/net/asterisk10/files/patch-channels_h323_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- ./channels/h323/Makefile.in.orig 2010-06-03 16:48:09.000000000 +0200 -+++ ./channels/h323/Makefile.in 2010-11-06 14:54:36.000000000 +0100 -@@ -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/asterisk10/files/patch-configure b/net/asterisk10/files/patch-configure deleted file mode 100644 index 0cc2a352b5a1..000000000000 --- a/net/asterisk10/files/patch-configure +++ /dev/null @@ -1,33 +0,0 @@ ---- configure.orig 2010-10-07 22:58:47.000000000 +0200 -+++ configure 2010-11-06 15:54:49.000000000 +0100 -@@ -4670,9 +4670,9 @@ - astheaderdir='${includedir}/asterisk' - astlibdir='${libdir}/asterisk' - astmandir='${mandir}' --astvarlibdir='${localstatedir}/lib/asterisk' -+astvarlibdir='${prefix}/share/asterisk' - astdatadir='${astvarlibdir}' --astdbdir='${astvarlibdir}' -+astdbdir='${localstatedir}/db/asterisk' - astkeydir='${astvarlibdir}' - astspooldir='${localstatedir}/spool/asterisk' - astlogdir='${localstatedir}/log/asterisk' -@@ -4694,9 +4694,6 @@ - - case "${host_os}" in - freebsd*) -- -- CPPFLAGS=-I/usr/local/include -- LDFLAGS=-L/usr/local/lib - ;; - openbsd*) - -@@ -25058,7 +25055,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:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5 diff --git a/net/asterisk10/files/patch-main::Makefile b/net/asterisk10/files/patch-main::Makefile deleted file mode 100644 index 4bb726d70c0f..000000000000 --- a/net/asterisk10/files/patch-main::Makefile +++ /dev/null @@ -1,30 +0,0 @@ ---- ./main/Makefile.orig 2010-08-02 16:41:46.000000000 +0200 -+++ ./main/Makefile 2010-11-06 14:54:37.000000000 +0100 -@@ -107,8 +107,8 @@ - cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(_ASTLDFLAGS) $(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: CHECK_SUBDIR -- _ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a -+#db1-ast/libdb1.a: CHECK_SUBDIR -+# _ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a - - ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),) - ast_expr2.c ast_expr2.h: ast_expr2.y -@@ -173,13 +173,13 @@ - - $(OBJS): _ASTCFLAGS+=-DAST_MODULE=\"core\" - --$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -+$(MAIN_TGT): $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) - @$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS) - $(ECHO_PREFIX) echo " [LD] $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -> $@" - ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) -- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) -+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) - else -- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) -+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) - endif - - ifeq ($(GNU_LD),1) diff --git a/net/asterisk10/files/patch-main::db.c b/net/asterisk10/files/patch-main::db.c deleted file mode 100644 index 34c9bd20a8a0..000000000000 --- a/net/asterisk10/files/patch-main::db.c +++ /dev/null @@ -1,18 +0,0 @@ ---- ./main/db.c.orig 2010-09-10 22:31:58.000000000 +0200 -+++ ./main/db.c 2010-11-06 14:54:37.000000000 +0100 -@@ -36,6 +36,7 @@ - #include <sys/time.h> - #include <signal.h> - #include <dirent.h> -+#include <db.h> - - #include "asterisk/channel.h" - #include "asterisk/file.h" -@@ -46,7 +47,6 @@ - #include "asterisk/utils.h" - #include "asterisk/lock.h" - #include "asterisk/manager.h" --#include "db1-ast/include/db.h" - - /*** DOCUMENTATION - <manager name="DBGet" language="en_US"> diff --git a/net/asterisk10/files/patch-main::utils.c b/net/asterisk10/files/patch-main::utils.c deleted file mode 100644 index 7440848a1521..000000000000 --- a/net/asterisk10/files/patch-main::utils.c +++ /dev/null @@ -1,13 +0,0 @@ ---- ./main/utils.c.orig 2010-08-06 20:57:10.000000000 +0200 -+++ ./main/utils.c 2010-11-06 14:54:37.000000000 +0100 -@@ -990,8 +990,8 @@ - pthread_attr_init(attr); - } - --#ifdef __linux__ -- /* On Linux, pthread_attr_init() defaults to PTHREAD_EXPLICIT_SCHED, -+#ifdef __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/asterisk10/files/patch-main__lock.c b/net/asterisk10/files/patch-main__lock.c deleted file mode 100644 index a802d8817a1e..000000000000 --- a/net/asterisk10/files/patch-main__lock.c +++ /dev/null @@ -1,13 +0,0 @@ ---- ./main/lock.c.orig 2010-11-06 15:00:15.000000000 +0100 -+++ ./main/lock.c 2010-11-06 15:00:23.000000000 +0100 -@@ -679,10 +679,6 @@ - - pthread_rwlockattr_init(&attr); - --#ifdef HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NP -- pthread_rwlockattr_setkind_np(&attr, PTHREAD_RWLOCK_PREFER_WRITER_NP); --#endif -- - res = pthread_rwlock_init(&t->lock, &attr); - pthread_rwlockattr_destroy(&attr); - return res; diff --git a/net/asterisk10/files/patch-pbx__pbx_spool.c b/net/asterisk10/files/patch-pbx__pbx_spool.c deleted file mode 100644 index ea2d1a4b1a05..000000000000 --- a/net/asterisk10/files/patch-pbx__pbx_spool.c +++ /dev/null @@ -1,240 +0,0 @@ ---- ./pbx/pbx_spool.c.orig 2010-10-18 17:32:40.000000000 +0200 -+++ ./pbx/pbx_spool.c 2010-11-30 11:14:19.000000000 +0100 -@@ -26,11 +26,6 @@ - - ASTERISK_FILE_VERSION(__FILE__, "$Revision: 292083 $") - --/* Handling of call files using inotify is not functioning correctly currently: -- * Issue 18089 - https://issues.asterisk.org/view.php?id=18089 -- */ --#undef HAVE_INOTIFY -- - #include <sys/stat.h> - #include <time.h> - #include <utime.h> -@@ -67,7 +62,7 @@ - */ - SPOOL_FLAG_ALWAYS_DELETE = (1 << 0), - /* Don't unlink the call file after processing, move in qdonedir */ -- SPOOL_FLAG_ARCHIVE = (1 << 1) -+ SPOOL_FLAG_ARCHIVE = (1 << 1), - }; - - static char qdir[255]; -@@ -260,24 +255,18 @@ - - static void safe_append(struct outgoing *o, time_t now, char *s) - { -- int fd; - FILE *f; -- struct utimbuf tbuf; -- -- if ((fd = open(o->fn, O_WRONLY | O_APPEND)) < 0) -- return; -+ struct utimbuf tbuf = { .actime = now, .modtime = now + o->retrytime }; - -- if ((f = fdopen(fd, "a"))) { -+ if ((f = fopen(o->fn, "a"))) { - fprintf(f, "\n%s: %ld %d (%ld)\n", s, (long)ast_mainpid, o->retries, (long) now); - fclose(f); -- } else -- close(fd); -+ } - - /* Update the file time */ -- tbuf.actime = now; -- tbuf.modtime = now + o->retrytime; -- if (utime(o->fn, &tbuf)) -+ if (utime(o->fn, &tbuf)) { - ast_log(LOG_WARNING, "Unable to set utime on %s: %s\n", o->fn, strerror(errno)); -+ } - } - - /*! -@@ -288,7 +277,6 @@ - */ - static int remove_from_queue(struct outgoing *o, const char *status) - { -- int fd; - FILE *f; - char newfn[256]; - const char *bname; -@@ -297,8 +285,9 @@ - struct stat current_file_status; - - if (!stat(o->fn, ¤t_file_status)) { -- if (time(NULL) < current_file_status.st_mtime) -+ if (time(NULL) < current_file_status.st_mtime) { - return 0; -+ } - } - } - -@@ -313,26 +302,28 @@ - return -1; - } - -- if ((fd = open(o->fn, O_WRONLY | O_APPEND))) { -- if ((f = fdopen(fd, "a"))) { -- fprintf(f, "Status: %s\n", status); -- fclose(f); -- } else -- close(fd); -+ if (!(bname = strrchr(o->fn, '/'))) { -+ bname = o->fn; -+ } else { -+ bname++; - } - -- if (!(bname = strrchr(o->fn, '/'))) -- bname = o->fn; -- else -- bname++; - snprintf(newfn, sizeof(newfn), "%s/%s", qdonedir, bname); - /* a existing call file the archive dir is overwritten */ - unlink(newfn); - if (rename(o->fn, newfn) != 0) { - unlink(o->fn); - return -1; -- } else -- return 0; -+ } -+ -+ /* Only append to the file AFTER we move it out of the watched directory, -+ * otherwise the fclose() causes another event for inotify(7) */ -+ if ((f = fopen(newfn, "a"))) { -+ fprintf(f, "Status: %s\n", status); -+ fclose(f); -+ } -+ -+ return 0; - } - - static void *attempt_thread(void *data) -@@ -399,7 +390,7 @@ - } - - /* Attempt to open the file */ -- if (!(f = fopen(fn, "r+"))) { -+ if (!(f = fopen(fn, "r"))) { - remove_from_queue(o, "Failed"); - free_outgoing(o); - ast_log(LOG_WARNING, "Unable to open %s: %s, deleting\n", fn, strerror(errno)); -@@ -414,7 +405,7 @@ - fclose(f); - return -1; - } -- -+ - #if 0 - printf("Filename: %s, Retries: %d, max: %d\n", fn, o->retries, o->maxretries); - #endif -@@ -432,7 +423,7 @@ - so abort their retry and continue as we were... */ - if (o->callingpid) - safe_append(o, time(NULL), "AbortRetry"); -- -+ - safe_append(o, now, "StartRetry"); - launch_service(o); - } -@@ -455,6 +446,7 @@ - - /* Only one thread is accessing this list, so no lock is necessary */ - static AST_LIST_HEAD_NOLOCK_STATIC(dirlist, direntry); -+static AST_LIST_HEAD_NOLOCK_STATIC(createlist, direntry); - - static void queue_file(const char *filename, time_t when) - { -@@ -482,14 +474,12 @@ - when = st.st_mtime; - } - --#ifndef HAVE_INOTIFY -- /* Need to check the existing list for kqueue(2), in order to avoid duplicates. */ -+ /* Need to check the existing list in order to avoid duplicates. */ - AST_LIST_TRAVERSE(&dirlist, cur, list) { - if (cur->mtime == when && !strcmp(filename, cur->name)) { - return; - } - } --#endif - - if ((res = when) > now || (res = scan_service(filename, now)) > 0) { - if (!(new = ast_calloc(1, sizeof(*new) + strlen(filename) + 1))) { -@@ -517,6 +507,40 @@ - } - } - -+#ifdef HAVE_INOTIFY -+static void queue_file_create(const char *filename) -+{ -+ struct direntry *cur; -+ -+ AST_LIST_TRAVERSE(&createlist, cur, list) { -+ if (!strcmp(cur->name, filename)) { -+ return; -+ } -+ } -+ -+ if (!(cur = ast_calloc(1, sizeof(*cur) + strlen(filename) + 1))) { -+ return; -+ } -+ strcpy(cur->name, filename); -+ AST_LIST_INSERT_TAIL(&createlist, cur, list); -+} -+ -+static void queue_file_write(const char *filename) -+{ -+ struct direntry *cur; -+ /* Only queue entries where an IN_CREATE preceded the IN_CLOSE_WRITE */ -+ AST_LIST_TRAVERSE_SAFE_BEGIN(&createlist, cur, list) { -+ if (!strcmp(cur->name, filename)) { -+ AST_LIST_REMOVE_CURRENT(list); -+ ast_free(cur); -+ queue_file(filename, 0); -+ break; -+ } -+ } -+ AST_LIST_TRAVERSE_SAFE_END -+} -+#endif -+ - static void *scan_thread(void *unused) - { - DIR *dir; -@@ -557,7 +581,7 @@ - } - - #ifdef HAVE_INOTIFY -- inotify_add_watch(inotify_fd, qdir, IN_CLOSE_WRITE | IN_MOVED_TO); -+ inotify_add_watch(inotify_fd, qdir, IN_CREATE | IN_CLOSE_WRITE | IN_MOVED_TO); - #endif - - /* First, run through the directory and clear existing entries */ -@@ -567,7 +591,7 @@ - } - - #ifndef HAVE_INOTIFY -- EV_SET(&kev, dirfd(dir), EVFILT_VNODE, EV_ADD | EV_ENABLE, NOTE_WRITE | NOTE_EXTEND | NOTE_DELETE | NOTE_REVOKE | NOTE_ATTRIB, 0, NULL); -+ EV_SET(&kev, dirfd(dir), EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR, NOTE_WRITE, 0, NULL); - if (kevent(inotify_fd, &kev, 1, NULL, 0, &nowait) < 0 && errno != 0) { - ast_log(LOG_ERROR, "Unable to watch directory %s: %s\n", qdir, strerror(errno)); - } -@@ -598,7 +622,15 @@ - (res = read(inotify_fd, &buf, sizeof(buf))) >= sizeof(buf.iev)) { - /* File(s) added to directory, add them to my list */ - do { -- queue_file(buf.iev.name, 0); -+ if (buf.iev.mask & IN_CREATE) { -+ queue_file_create(buf.iev.name); -+ } else if (buf.iev.mask & IN_CLOSE_WRITE) { -+ queue_file_write(buf.iev.name); -+ } else if (buf.iev.mask & IN_MOVED_TO) { -+ queue_file(buf.iev.name, 0); -+ } else { -+ ast_log(LOG_ERROR, "Unexpected event %d for file '%s'\n", (int) buf.iev.mask, buf.iev.name); -+ } - res -= sizeof(buf.iev) + buf.iev.len; - if (res >= sizeof(buf.iev)) { - memmove(&buf.iev, &buf.iev.name[buf.iev.len], res); diff --git a/net/asterisk10/pkg-descr b/net/asterisk10/pkg-descr deleted file mode 100644 index 28b7a1deb011..000000000000 --- a/net/asterisk10/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Asterisk is an Open Source PBX and telephony toolkit. It is, in a -sense, middleware between Internet and telephony channels on the bottom, -and Internet and telephony applications at the top. - -WWW: http://www.asteriskpbx.com diff --git a/net/asterisk10/pkg-plist b/net/asterisk10/pkg-plist deleted file mode 100644 index be894e5b7850..000000000000 --- a/net/asterisk10/pkg-plist +++ /dev/null @@ -1,1616 +0,0 @@ -@unexec if cmp -s %D/etc/asterisk/ais.conf %D/etc/asterisk/ais.conf-dist; then rm -f %D/etc/asterisk/ais.conf; fi -etc/asterisk/ais.conf-dist -@unexec if cmp -s %D/etc/asterisk/cdr_adaptive_odbc.conf %D/etc/asterisk/cdr_adaptive_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_adaptive_odbc.conf; fi -etc/asterisk/cdr_adaptive_odbc.conf-dist -@unexec if cmp -s %D/etc/asterisk/cdr_sqlite3_custom.conf %D/etc/asterisk/cdr_sqlite3_custom.conf-dist; then rm -f %D/etc/asterisk/cdr_sqlite3_custom.conf; fi -etc/asterisk/cdr_sqlite3_custom.conf-dist -@unexec if cmp -s %D/etc/asterisk/cdr_syslog.conf %D/etc/asterisk/cdr_syslog.conf-dist; then rm -f %D/etc/asterisk/cdr_syslog.conf; fi -etc/asterisk/cdr_syslog.conf-dist -@unexec if cmp -s %D/etc/asterisk/cli.conf %D/etc/asterisk/cli.conf-dist; then rm -f %D/etc/asterisk/cli.conf; fi -etc/asterisk/cli.conf-dist -@unexec if cmp -s %D/etc/asterisk/cli_aliases.conf %D/etc/asterisk/cli_aliases.conf-dist; then rm -f %D/etc/asterisk/cli_aliases.conf; fi -etc/asterisk/cli_aliases.conf-dist -@unexec if cmp -s %D/etc/asterisk/cli_permissions.conf %D/etc/asterisk/cli_permissions.conf-dist; then rm -f %D/etc/asterisk/cli_permissions.conf; fi -etc/asterisk/cli_permissions.conf-dist -@unexec if cmp -s %D/etc/asterisk/console.conf %D/etc/asterisk/console.conf-dist; then rm -f %D/etc/asterisk/console.conf; fi -etc/asterisk/console.conf-dist -@unexec if cmp -s %D/etc/asterisk/dbsep.conf %D/etc/asterisk/dbsep.conf-dist; then rm -f %D/etc/asterisk/dbsep.conf; fi -etc/asterisk/dbsep.conf-dist -@unexec if cmp -s %D/etc/asterisk/dsp.conf %D/etc/asterisk/dsp.conf-dist; then rm -f %D/etc/asterisk/dsp.conf; fi -etc/asterisk/dsp.conf-dist -@unexec if cmp -s %D/etc/asterisk/extensions.lua %D/etc/asterisk/extensions.lua-dist; then rm -f %D/etc/asterisk/extensions.lua; fi -etc/asterisk/extensions.lua-dist -@unexec if cmp -s %D/etc/asterisk/extensions_minivm.conf %D/etc/asterisk/extensions_minivm.conf-dist; then rm -f %D/etc/asterisk/extensions_minivm.conf; fi -etc/asterisk/extensions_minivm.conf-dist -@unexec if cmp -s %D/etc/asterisk/jingle.conf %D/etc/asterisk/jingle.conf-dist; then rm -f %D/etc/asterisk/jingle.conf; fi -etc/asterisk/jingle.conf-dist -@unexec if cmp -s %D/etc/asterisk/minivm.conf %D/etc/asterisk/minivm.conf-dist; then rm -f %D/etc/asterisk/minivm.conf; fi -etc/asterisk/minivm.conf-dist -@unexec if cmp -s %D/etc/asterisk/phoneprov.conf %D/etc/asterisk/phoneprov.conf-dist; then rm -f %D/etc/asterisk/phoneprov.conf; fi -etc/asterisk/phoneprov.conf-dist -@unexec if cmp -s %D/etc/asterisk/queuerules.conf %D/etc/asterisk/queuerules.conf-dist; then rm -f %D/etc/asterisk/queuerules.conf; fi -etc/asterisk/queuerules.conf-dist -@unexec if cmp -s %D/etc/asterisk/res_ldap.conf %D/etc/asterisk/res_ldap.conf-dist; then rm -f %D/etc/asterisk/res_ldap.conf; fi -etc/asterisk/res_ldap.conf-dist -@unexec if cmp -s %D/etc/asterisk/unistim.conf %D/etc/asterisk/unistim.conf-dist; then rm -f %D/etc/asterisk/unistim.conf; fi -etc/asterisk/unistim.conf-dist -@unexec if cmp -s %D/etc/asterisk/usbradio.conf %D/etc/asterisk/usbradio.conf-dist; then rm -f %D/etc/asterisk/usbradio.conf; fi -etc/asterisk/usbradio.conf-dist -@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 -@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 -@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 -@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 -@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 -@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 -etc/asterisk/asterisk.conf -@unexec if cmp -s %D/etc/asterisk/calendar.conf %D/etc/asterisk/calendar.conf-dist; then rm -f %D/etc/asterisk/calendar.conf; fi -etc/asterisk/calendar.conf-dist -@unexec if cmp -s %D/etc/asterisk/ccss.conf %D/etc/asterisk/ccss.conf-dist; then rm -f %D/etc/asterisk/ccss.conf; fi -etc/asterisk/ccss.conf-dist -@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 -@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 -@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 -@unexec if cmp -s %D/etc/asterisk/cdr_mysql.conf %D/etc/asterisk/cdr_mysql.conf-dist; then rm -f %D/etc/asterisk/cdr_mysql.conf; fi -etc/asterisk/cdr_mysql.conf-dist -@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 -@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 -@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 -@unexec if cmp -s %D/etc/asterisk/cel.conf %D/etc/asterisk/cel.conf-dist; then rm -f %D/etc/asterisk/cel.conf; fi -etc/asterisk/cel.conf-dist -@unexec if cmp -s %D/etc/asterisk/cel_custom.conf %D/etc/asterisk/cel_custom.conf-dist; then rm -f %D/etc/asterisk/cel_custom.conf; fi -etc/asterisk/cel_custom.conf-dist -@unexec if cmp -s %D/etc/asterisk/cel_odbc.conf %D/etc/asterisk/cel_odbc.conf-dist; then rm -f %D/etc/asterisk/cel_odbc.conf; fi -etc/asterisk/cel_odbc.conf-dist -@unexec if cmp -s %D/etc/asterisk/cel_pgsql.conf %D/etc/asterisk/cel_pgsql.conf-dist; then rm -f %D/etc/asterisk/cel_pgsql.conf; fi -etc/asterisk/cel_pgsql.conf-dist -@unexec if cmp -s %D/etc/asterisk/cel_sqlite3_custom.conf %D/etc/asterisk/cel_sqlite3_custom.conf-dist; then rm -f %D/etc/asterisk/cel_sqlite3_custom.conf; fi -etc/asterisk/cel_sqlite3_custom.conf-dist -@unexec if cmp -s %D/etc/asterisk/cel_tds.conf %D/etc/asterisk/cel_tds.conf-dist; then rm -f %D/etc/asterisk/cel_tds.conf; fi -etc/asterisk/cel_tds.conf-dist -@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 -@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 -@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 -@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 -@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 -@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 -@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 -@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 -@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 -@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 -@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 -@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 -@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 -@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 -@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 -@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 -@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 -@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 -@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 -@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 -@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 -@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 -@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 -@unexec if cmp -s %D/etc/asterisk/res_config_mysql.conf %D/etc/asterisk/res_config_mysql.conf-dist; then rm -f %D/etc/asterisk/res_config_mysql.conf; fi -etc/asterisk/res_config_mysql.conf-dist -@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_pktccops.conf %D/etc/asterisk/res_pktccops.conf-dist; then rm -f %D/etc/asterisk/res_pktccops.conf; fi -etc/asterisk/res_pktccops.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 -@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 -@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 -@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 -@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 -@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 -@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 -@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 -@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 -@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/chan_mobile.conf %D/etc/asterisk/chan_mobile.conf-dist; then rm -f %D/etc/asterisk/chan_mobile.conf; fi -etc/asterisk/chan_mobile.conf-dist -@unexec if cmp -s %D/etc/asterisk/chan_ooh323.conf %D/etc/asterisk/chan_ooh323.conf-dist; then rm -f %D/etc/asterisk/chan_ooh323.conf; fi -etc/asterisk/chan_ooh323.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/res_stun_monitor.conf %D/etc/asterisk/res_stun_monitor.conf-dist; then rm -f %D/etc/asterisk/res_stun_monitor.conf; fi -etc/asterisk/res_stun_monitor.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/app_mysql.conf %D/etc/asterisk/app_mysql.conf-dist; then rm -f %D/etc/asterisk/app_mysql.conf; fi -etc/asterisk/app_mysql.conf-dist -@unexec if cmp -s %D/etc/asterisk/res_config_sqlite.conf %D/etc/asterisk/res_config_sqlite.conf-dist; then rm -f %D/etc/asterisk/res_config_sqlite.conf; fi -etc/asterisk/res_config_sqlite.conf-dist -@unexec if cmp -s %D/etc/asterisk/res_curl.conf %D/etc/asterisk/res_curl.conf-dist; then rm -f %D/etc/asterisk/res_curl.conf; fi -etc/asterisk/res_curl.conf-dist -@unexec if cmp -s %D/etc/asterisk/res_fax.conf %D/etc/asterisk/res_fax.conf-dist; then rm -f %D/etc/asterisk/res_fax.conf; fi -etc/asterisk/res_fax.conf-dist -@exec if test ! -e %D/etc/asterisk/cdr_adaptive_odbc.conf; then cp -p %D/etc/asterisk/cdr_adaptive_odbc.conf-dist %D/etc/asterisk/cdr_adaptive_odbc.conf; fi -@exec if test ! -e %D/etc/asterisk/cdr_syslog.conf; then cp -p %D/etc/asterisk/cdr_syslog.conf-dist %D/etc/asterisk/cdr_syslog.conf; fi -@exec if test ! -e %D/etc/asterisk/cdr_sqlite3_custom.conf; then cp -p %D/etc/asterisk/cdr_sqlite3_custom.conf-dist %D/etc/asterisk/cdr_sqlite3_custom.conf; fi -@exec if test ! -e %D/etc/asterisk/cli.conf; then cp -p %D/etc/asterisk/cli.conf-dist %D/etc/asterisk/cli.conf; fi -@exec if test ! -e %D/etc/asterisk/console.conf; then cp -p %D/etc/asterisk/console.conf-dist %D/etc/asterisk/console.conf; fi -@exec if test ! -e %D/etc/asterisk/extensions.lua; then cp -p %D/etc/asterisk/extensions.lua-dist %D/etc/asterisk/extensions.lua; fi -@exec if test ! -e %D/etc/asterisk/extensions_minivm.conf; then cp -p %D/etc/asterisk/extensions_minivm.conf-dist %D/etc/asterisk/extensions_minivm.conf; fi -@exec if test ! -e %D/etc/asterisk/jingle.conf; then cp -p %D/etc/asterisk/jingle.conf-dist %D/etc/asterisk/jingle.conf; fi -@exec if test ! -e %D/etc/asterisk/minivm.conf; then cp -p %D/etc/asterisk/minivm.conf-dist %D/etc/asterisk/minivm.conf; fi -@exec if test ! -e %D/etc/asterisk/phoneprov.conf; then cp -p %D/etc/asterisk/phoneprov.conf-dist %D/etc/asterisk/phoneprov.conf; fi -@exec if test ! -e %D/etc/asterisk/queuerules.conf; then cp -p %D/etc/asterisk/queuerules.conf-dist %D/etc/asterisk/queuerules.conf; fi -@exec if test ! -e %D/etc/asterisk/res_ldap.conf; then cp -p %D/etc/asterisk/res_ldap.conf-dist %D/etc/asterisk/res_ldap.conf; fi -@exec if test ! -e %D/etc/asterisk/unistim.conf; then cp -p %D/etc/asterisk/unistim.conf-dist %D/etc/asterisk/unistim.conf; fi -@exec if test ! -e %D/etc/asterisk/usbradio.conf; then cp -p %D/etc/asterisk/usbradio.conf-dist %D/etc/asterisk/usbradio.conf; fi -@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/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/ccss.conf; then cp -p %D/etc/asterisk/ccss.conf-dist %D/etc/asterisk/ccss.conf; fi -@exec if test ! -e %D/etc/asterisk/calendar.conf; then cp -p %D/etc/asterisk/calendar.conf-dist %D/etc/asterisk/calendar.conf; 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_mysql.conf; then cp -p %D/etc/asterisk/cdr_mysql.conf-dist %D/etc/asterisk/cdr_mysql.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/cel_tds.conf; then cp -p %D/etc/asterisk/cel_tds.conf-dist %D/etc/asterisk/cel_tds.conf; fi -@exec if test ! -e %D/etc/asterisk/cel_sqlite3_custom.conf; then cp -p %D/etc/asterisk/cel_sqlite3_custom.conf-dist %D/etc/asterisk/cel_sqlite3_custom.conf; fi -@exec if test ! -e %D/etc/asterisk/cel_pgsql.conf; then cp -p %D/etc/asterisk/cel_pgsql.conf-dist %D/etc/asterisk/cel_pgsql.conf; fi -@exec if test ! -e %D/etc/asterisk/cel_odbc.conf; then cp -p %D/etc/asterisk/cel_odbc.conf-dist %D/etc/asterisk/cel_odbc.conf; fi -@exec if test ! -e %D/etc/asterisk/cel_custom.conf; then cp -p %D/etc/asterisk/cel_custom.conf-dist %D/etc/asterisk/cel_custom.conf; fi -@exec if test ! -e %D/etc/asterisk/cel.conf; then cp -p %D/etc/asterisk/cel.conf-dist %D/etc/asterisk/cel.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/res_fax.conf; then cp -p %D/etc/asterisk/res_fax.conf-dist %D/etc/asterisk/res_fax.conf; fi -@exec if test ! -e %D/etc/asterisk/res_curl.conf; then cp -p %D/etc/asterisk/res_curl.conf-dist %D/etc/asterisk/res_curl.conf; fi -@exec if test ! -e %D/etc/asterisk/res_config_sqlite.conf; then cp -p %D/etc/asterisk/res_config_sqlite.conf-dist %D/etc/asterisk/res_config_sqlite.conf; fi -@exec if test ! -e %D/etc/asterisk/res_config_mysql.conf; then cp -p %D/etc/asterisk/res_config_mysql.conf-dist %D/etc/asterisk/res_config_mysql.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_pktccops.conf; then cp -p %D/etc/asterisk/res_pktccops.conf-dist %D/etc/asterisk/res_pktccops.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_ooh323.conf; then cp -p %D/etc/asterisk/chan_ooh323.conf-dist %D/etc/asterisk/chan_ooh323.conf; fi -@exec if test ! -e %D/etc/asterisk/chan_mobile.conf; then cp -p %D/etc/asterisk/chan_mobile.conf-dist %D/etc/asterisk/chan_mobile.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_stun_monitor.conf; then cp -p %D/etc/asterisk/res_stun_monitor.conf-dist %D/etc/asterisk/res_stun_monitor.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/app_mysql.conf; then cp -p %D/etc/asterisk/app_mysql.conf-dist %D/etc/asterisk/app_mysql.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 -include/asterisk/doxygen/architecture.h -include/asterisk/doxygen/asterisk-git-howto.h -include/asterisk/doxygen/commits.h -include/asterisk/doxygen/licensing.h -include/asterisk/doxygen/mantisworkflow.h -include/asterisk/doxygen/releases.h -include/asterisk/doxygen/reviewboard.h -include/asterisk/_private.h -include/asterisk/aoc.h -include/asterisk/ast_version.h -include/asterisk/autochan.h -include/asterisk/calendar.h -include/asterisk/ccss.h -include/asterisk/cel.h -include/asterisk/channelstate.h -include/asterisk/data.h -include/asterisk/event.h -include/asterisk/event_defs.h -include/asterisk/extconf.h -include/asterisk/frame_defs.h -include/asterisk/framehook.h -include/asterisk/fskmodem_float.h -include/asterisk/fskmodem_int.h -include/asterisk/hashtab.h -include/asterisk/mod_format.h -include/asterisk/netsock2.h -include/asterisk/network.h -include/asterisk/optional_api.h -include/asterisk/pktccops.h -include/asterisk/pval.h -include/asterisk/res_fax.h -include/asterisk/res_srtp.h -include/asterisk/rtp_engine.h -include/asterisk/select.h -include/asterisk/security_events.h -include/asterisk/security_events_defs.h -include/asterisk/stun.h -include/asterisk/syslog.h -include/asterisk/tcptls.h -include/asterisk.h -include/asterisk/abstract_jb.h -include/asterisk/acl.h -include/asterisk/adsi.h -include/asterisk/ael_structs.h -include/asterisk/agi.h -include/asterisk/alaw.h -include/asterisk/app.h -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/bridging.h -include/asterisk/bridging_features.h -include/asterisk/bridging_technology.h -include/asterisk/build.h -include/asterisk/buildinfo.h -include/asterisk/buildopts.h -include/asterisk/callerid.h -include/asterisk/causes.h -include/asterisk/cdr.h -include/asterisk/channel.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/datastore.h -include/asterisk/devicestate.h -include/asterisk/dial.h -include/asterisk/dlinkedlists.h -include/asterisk/dns.h -include/asterisk/dnsmgr.h -include/asterisk/doxyref.h -include/asterisk/dsp.h -include/asterisk/dundi.h -include/asterisk/endian.h -include/asterisk/enum.h -include/asterisk/features.h -include/asterisk/file.h -include/asterisk/frame.h -include/asterisk/fskmodem.h -include/asterisk/global_datastores.h -include/asterisk/heap.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 -include/asterisk/logger.h -include/asterisk/manager.h -include/asterisk/md5.h -include/asterisk/module.h -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 -include/asterisk/privacy.h -include/asterisk/res_odbc.h -include/asterisk/say.h -include/asterisk/sched.h -include/asterisk/sha1.h -include/asterisk/slin.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/taskprocessor.h -include/asterisk/tdd.h -include/asterisk/term.h -include/asterisk/test.h -include/asterisk/threadstorage.h -include/asterisk/time.h -include/asterisk/timing.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/xml.h -include/asterisk/xmldoc.h -lib/asterisk/modules/app_celgenuserevent.so -lib/asterisk/modules/app_confbridge.so -lib/asterisk/modules/app_minivm.so -lib/asterisk/modules/app_originate.so -lib/asterisk/modules/app_playtones.so -lib/asterisk/modules/app_readexten.so -lib/asterisk/modules/app_waituntil.so -lib/asterisk/modules/bridge_builtin_features.so -lib/asterisk/modules/bridge_multiplexed.so -lib/asterisk/modules/bridge_simple.so -lib/asterisk/modules/bridge_softmix.so -%%WITH_ODBC%%lib/asterisk/modules/cdr_adaptive_odbc.so -%%WITH_JABBER%%lib/asterisk/modules/chan_jingle.so -lib/asterisk/modules/chan_bridge.so -lib/asterisk/modules/chan_unistim.so -lib/asterisk/modules/codec_g722.so -lib/asterisk/modules/format_g719.so -lib/asterisk/modules/format_sln16.so -lib/asterisk/modules/format_siren14.so -lib/asterisk/modules/format_siren7.so -lib/asterisk/modules/func_aes.so -lib/asterisk/modules/func_audiohookinherit.so -lib/asterisk/modules/func_blacklist.so -lib/asterisk/modules/func_config.so -lib/asterisk/modules/func_devstate.so -lib/asterisk/modules/func_dialgroup.so -lib/asterisk/modules/func_dialplan.so -lib/asterisk/modules/func_extstate.so -lib/asterisk/modules/func_iconv.so -lib/asterisk/modules/func_lock.so -lib/asterisk/modules/func_module.so -lib/asterisk/modules/func_shell.so -lib/asterisk/modules/func_speex.so -lib/asterisk/modules/func_sprintf.so -lib/asterisk/modules/func_sysinfo.so -lib/asterisk/modules/func_version.so -lib/asterisk/modules/func_vmcount.so -lib/asterisk/modules/func_volume.so -lib/asterisk/modules/res_ael_share.so -lib/asterisk/modules/res_clialiases.so -%%WITH_CURL%%lib/asterisk/modules/res_curl.so -%%WITH_CURL%%lib/asterisk/modules/res_config_curl.so -%%WITH_H323%%lib/asterisk/modules/res_config_ldap.so -%%WITH_SQLITE%%lib/asterisk/modules/res_config_sqlite.so -lib/asterisk/modules/res_limit.so -lib/asterisk/modules/res_phoneprov.so -lib/asterisk/modules/res_realtime.so -%%WITH_DAHDI%%lib/asterisk/modules/res_timing_dahdi.so -lib/asterisk/modules/res_timing_pthread.so -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_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_db.so -lib/asterisk/modules/app_dial.so -lib/asterisk/modules/app_dictate.so -lib/asterisk/modules/app_directed_pickup.so -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_exec.so -lib/asterisk/modules/app_externalivr.so -lib/asterisk/modules/app_festival.so -lib/asterisk/modules/app_followme.so -lib/asterisk/modules/app_forkcdr.so -lib/asterisk/modules/app_getcpeid.so -lib/asterisk/modules/app_ices.so -lib/asterisk/modules/app_image.so -lib/asterisk/modules/app_macro.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 -lib/asterisk/modules/app_parkandannounce.so -lib/asterisk/modules/app_playback.so -lib/asterisk/modules/app_privacy.so -lib/asterisk/modules/app_queue.so -lib/asterisk/modules/app_read.so -lib/asterisk/modules/app_readfile.so -lib/asterisk/modules/app_record.so -lib/asterisk/modules/app_sayunixtime.so -lib/asterisk/modules/app_senddtmf.so -lib/asterisk/modules/app_sendtext.so -lib/asterisk/modules/app_setcallerid.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 -lib/asterisk/modules/app_url.so -lib/asterisk/modules/app_userevent.so -lib/asterisk/modules/app_verbose.so -lib/asterisk/modules/app_voicemail.so -lib/asterisk/modules/app_waitforring.so -lib/asterisk/modules/app_waitforsilence.so -lib/asterisk/modules/app_while.so -lib/asterisk/modules/app_zapateller.so -lib/asterisk/modules/cdr_csv.so -lib/asterisk/modules/cdr_custom.so -lib/asterisk/modules/cdr_manager.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_SQLITE%%lib/asterisk/modules/cdr_sqlite3_custom.so -lib/asterisk/modules/cdr_syslog.so -lib/asterisk/modules/cel_custom.so -lib/asterisk/modules/cel_manager.so -lib/asterisk/modules/cel_odbc.so -lib/asterisk/modules/cel_pgsql.so -lib/asterisk/modules/cel_radius.so -lib/asterisk/modules/cel_sqlite3_custom.so -%%WITH_FREETDS%%lib/asterisk/modules/cel_tds.so -lib/asterisk/modules/chan_agent.so -%%WITH_JABBER%%lib/asterisk/modules/chan_gtalk.so -lib/asterisk/modules/chan_iax2.so -lib/asterisk/modules/chan_local.so -lib/asterisk/modules/chan_mgcp.so -lib/asterisk/modules/chan_multicast_rtp.so -lib/asterisk/modules/chan_oss.so -lib/asterisk/modules/chan_sip.so -lib/asterisk/modules/chan_skinny.so -lib/asterisk/modules/codec_a_mu.so -lib/asterisk/modules/codec_adpcm.so -lib/asterisk/modules/codec_alaw.so -lib/asterisk/modules/codec_g726.so -%%WITH_GSM%%lib/asterisk/modules/codec_gsm.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_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_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_base64.so -lib/asterisk/modules/func_callcompletion.so -lib/asterisk/modules/func_callerid.so -lib/asterisk/modules/func_cdr.so -lib/asterisk/modules/func_channel.so -%%WITH_CURL%%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_frame_trace.so -lib/asterisk/modules/func_global.so -lib/asterisk/modules/func_groupcount.so -lib/asterisk/modules/func_logic.so -lib/asterisk/modules/func_math.so -lib/asterisk/modules/func_md5.so -%%WITH_ODBC%%lib/asterisk/modules/func_odbc.so -lib/asterisk/modules/func_pitchshift.so -lib/asterisk/modules/func_rand.so -lib/asterisk/modules/func_realtime.so -lib/asterisk/modules/func_sha1.so -lib/asterisk/modules/func_srv.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_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_calendar.so -%%WITH_EXCHANGE%%lib/asterisk/modules/res_calendar_ews.so -lib/asterisk/modules/res_clioriginate.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_fax.so -%%WITH_SPANDSP%%lib/asterisk/modules/res_fax_spandsp.so -%%WITH_JABBER%%lib/asterisk/modules/res_jabber.so -lib/asterisk/modules/res_monitor.so -lib/asterisk/modules/res_musiconhold.so -lib/asterisk/modules/res_mutestream.so -lib/asterisk/modules/res_rtp_asterisk.so -lib/asterisk/modules/res_rtp_multicast.so -lib/asterisk/modules/res_security_log.so -lib/asterisk/modules/res_stun_monitor.so -lib/asterisk/modules/res_smdi.so -%%WITH_SNMP%%lib/asterisk/modules/res_snmp.so -lib/asterisk/modules/res_speech.so -sbin/astcanary -sbin/asterisk -sbin/astgenkey -sbin/autosupport -sbin/rasterisk -sbin/safe_asterisk -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/documentation/appdocsxml.dtd -share/asterisk/documentation/core-en_US.xml -share/asterisk/moh/.asterisk-moh-opsound-wav-2.03 -share/asterisk/moh/CHANGES-asterisk-moh-opsound-wav -share/asterisk/moh/CREDITS-asterisk-moh-opsound-wav -share/asterisk/moh/LICENSE-asterisk-moh-opsound-wav -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/phoneprov/000000000000-directory.xml -share/asterisk/phoneprov/000000000000-phone.cfg -share/asterisk/phoneprov/000000000000.cfg -share/asterisk/phoneprov/polycom.xml -share/asterisk/phoneprov/polycom_line.xml -share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.20 -share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.20 -share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.20 -share/asterisk/sounds/en/ascending-2tone.gsm -share/asterisk/sounds/en/conf-adminmenu-162.gsm -share/asterisk/sounds/en/conf-extended.gsm -share/asterisk/sounds/en/conf-nonextended.gsm -share/asterisk/sounds/en/conf-now-muted.gsm -share/asterisk/sounds/en/conf-now-recording.gsm -share/asterisk/sounds/en/conf-now-unmuted.gsm -share/asterisk/sounds/en/conf-roll-callcomplete.gsm -share/asterisk/sounds/en/conf-usermenu-162.gsm -share/asterisk/sounds/en/descending-2tone.gsm -share/asterisk/sounds/en/spy-dahdi.gsm -share/asterisk/sounds/en/vm-Urgent.gsm -share/asterisk/sounds/en/vm-forward-multiple.gsm -share/asterisk/sounds/en/vm-invalid-password.gsm -share/asterisk/sounds/en/vm-marked-nonurgent.gsm -share/asterisk/sounds/en/vm-marked-urgent.gsm -share/asterisk/sounds/en/vm-pls-try-again.gsm -share/asterisk/sounds/en/vm-record-prepend.gsm -share/asterisk/sounds/en/vm-review-nonurgent.gsm -share/asterisk/sounds/en/vm-review-urgent.gsm -share/asterisk/sounds/en/dir-usingkeypad.gsm -share/asterisk/sounds/en/dir-welcome.gsm -share/asterisk/sounds/en/agent-alreadyon.gsm -share/asterisk/sounds/en/agent-incorrect.gsm -share/asterisk/sounds/en/agent-loggedoff.gsm -share/asterisk/sounds/en/agent-loginok.gsm -share/asterisk/sounds/en/agent-newlocation.gsm -share/asterisk/sounds/en/agent-pass.gsm -share/asterisk/sounds/en/agent-user.gsm -share/asterisk/sounds/en/auth-incorrect.gsm -share/asterisk/sounds/en/auth-thankyou.gsm -share/asterisk/sounds/en/beep.gsm -share/asterisk/sounds/en/beeperr.gsm -share/asterisk/sounds/en/conf-adminmenu.gsm -share/asterisk/sounds/en/conf-enteringno.gsm -share/asterisk/sounds/en/conf-errormenu.gsm -share/asterisk/sounds/en/conf-getchannel.gsm -share/asterisk/sounds/en/conf-getconfno.gsm -share/asterisk/sounds/en/conf-getpin.gsm -share/asterisk/sounds/en/conf-hasjoin.gsm -share/asterisk/sounds/en/conf-hasleft.gsm -share/asterisk/sounds/en/conf-invalid.gsm -share/asterisk/sounds/en/conf-invalidpin.gsm -share/asterisk/sounds/en/conf-kicked.gsm -share/asterisk/sounds/en/conf-leaderhasleft.gsm -share/asterisk/sounds/en/conf-locked.gsm -share/asterisk/sounds/en/conf-lockednow.gsm -share/asterisk/sounds/en/conf-muted.gsm -share/asterisk/sounds/en/conf-noempty.gsm -share/asterisk/sounds/en/conf-onlyone.gsm -share/asterisk/sounds/en/conf-onlyperson.gsm -share/asterisk/sounds/en/conf-otherinparty.gsm -share/asterisk/sounds/en/conf-placeintoconf.gsm -share/asterisk/sounds/en/conf-thereare.gsm -share/asterisk/sounds/en/conf-unlockednow.gsm -share/asterisk/sounds/en/conf-unmuted.gsm -share/asterisk/sounds/en/conf-usermenu.gsm -share/asterisk/sounds/en/conf-userswilljoin.gsm -share/asterisk/sounds/en/conf-userwilljoin.gsm -share/asterisk/sounds/en/conf-waitforleader.gsm -share/asterisk/sounds/en/core-sounds-en.txt -share/asterisk/sounds/en/demo-abouttotry.gsm -share/asterisk/sounds/en/demo-congrats.gsm -share/asterisk/sounds/en/demo-echodone.gsm -share/asterisk/sounds/en/demo-echotest.gsm -share/asterisk/sounds/en/demo-enterkeywords.gsm -share/asterisk/sounds/en/demo-instruct.gsm -share/asterisk/sounds/en/demo-moreinfo.gsm -share/asterisk/sounds/en/demo-nogo.gsm -share/asterisk/sounds/en/demo-nomatch.gsm -share/asterisk/sounds/en/demo-thanks.gsm -share/asterisk/sounds/en/dictate/both_help.gsm -share/asterisk/sounds/en/dictate/enter_filename.gsm -share/asterisk/sounds/en/dictate/forhelp.gsm -share/asterisk/sounds/en/dictate/pause.gsm -share/asterisk/sounds/en/dictate/paused.gsm -share/asterisk/sounds/en/dictate/play_help.gsm -share/asterisk/sounds/en/dictate/playback.gsm -share/asterisk/sounds/en/dictate/playback_mode.gsm -share/asterisk/sounds/en/dictate/record.gsm -share/asterisk/sounds/en/dictate/record_help.gsm -share/asterisk/sounds/en/dictate/record_mode.gsm -share/asterisk/sounds/en/dictate/truncating_audio.gsm -share/asterisk/sounds/en/digits/0.gsm -share/asterisk/sounds/en/digits/1.gsm -share/asterisk/sounds/en/digits/10.gsm -share/asterisk/sounds/en/digits/11.gsm -share/asterisk/sounds/en/digits/12.gsm -share/asterisk/sounds/en/digits/13.gsm -share/asterisk/sounds/en/digits/14.gsm -share/asterisk/sounds/en/digits/15.gsm -share/asterisk/sounds/en/digits/16.gsm -share/asterisk/sounds/en/digits/17.gsm -share/asterisk/sounds/en/digits/18.gsm -share/asterisk/sounds/en/digits/19.gsm -share/asterisk/sounds/en/digits/2.gsm -share/asterisk/sounds/en/digits/20.gsm -share/asterisk/sounds/en/digits/3.gsm -share/asterisk/sounds/en/digits/30.gsm -share/asterisk/sounds/en/digits/4.gsm -share/asterisk/sounds/en/digits/40.gsm -share/asterisk/sounds/en/digits/5.gsm -share/asterisk/sounds/en/digits/50.gsm -share/asterisk/sounds/en/digits/6.gsm -share/asterisk/sounds/en/digits/60.gsm -share/asterisk/sounds/en/digits/7.gsm -share/asterisk/sounds/en/digits/70.gsm -share/asterisk/sounds/en/digits/8.gsm -share/asterisk/sounds/en/digits/80.gsm -share/asterisk/sounds/en/digits/9.gsm -share/asterisk/sounds/en/digits/90.gsm -share/asterisk/sounds/en/digits/a-m.gsm -share/asterisk/sounds/en/digits/at.gsm -share/asterisk/sounds/en/digits/billion.gsm -share/asterisk/sounds/en/digits/day-0.gsm -share/asterisk/sounds/en/digits/day-1.gsm -share/asterisk/sounds/en/digits/day-2.gsm -share/asterisk/sounds/en/digits/day-3.gsm -share/asterisk/sounds/en/digits/day-4.gsm -share/asterisk/sounds/en/digits/day-5.gsm -share/asterisk/sounds/en/digits/day-6.gsm -share/asterisk/sounds/en/digits/dollars.gsm -share/asterisk/sounds/en/digits/h-1.gsm -share/asterisk/sounds/en/digits/h-10.gsm -share/asterisk/sounds/en/digits/h-11.gsm -share/asterisk/sounds/en/digits/h-12.gsm -share/asterisk/sounds/en/digits/h-13.gsm -share/asterisk/sounds/en/digits/h-14.gsm -share/asterisk/sounds/en/digits/h-15.gsm -share/asterisk/sounds/en/digits/h-16.gsm -share/asterisk/sounds/en/digits/h-17.gsm -share/asterisk/sounds/en/digits/h-18.gsm -share/asterisk/sounds/en/digits/h-19.gsm -share/asterisk/sounds/en/digits/h-2.gsm -share/asterisk/sounds/en/digits/h-20.gsm -share/asterisk/sounds/en/digits/h-3.gsm -share/asterisk/sounds/en/digits/h-30.gsm -share/asterisk/sounds/en/digits/h-4.gsm -share/asterisk/sounds/en/digits/h-40.gsm -share/asterisk/sounds/en/digits/h-5.gsm -share/asterisk/sounds/en/digits/h-50.gsm -share/asterisk/sounds/en/digits/h-6.gsm -share/asterisk/sounds/en/digits/h-60.gsm -share/asterisk/sounds/en/digits/h-7.gsm -share/asterisk/sounds/en/digits/h-70.gsm -share/asterisk/sounds/en/digits/h-8.gsm -share/asterisk/sounds/en/digits/h-80.gsm -share/asterisk/sounds/en/digits/h-9.gsm -share/asterisk/sounds/en/digits/h-90.gsm -share/asterisk/sounds/en/digits/h-billion.gsm -share/asterisk/sounds/en/digits/h-hundred.gsm -share/asterisk/sounds/en/digits/h-million.gsm -share/asterisk/sounds/en/digits/h-thousand.gsm -share/asterisk/sounds/en/digits/hundred.gsm -share/asterisk/sounds/en/digits/million.gsm -share/asterisk/sounds/en/digits/minus.gsm -share/asterisk/sounds/en/digits/mon-0.gsm -share/asterisk/sounds/en/digits/mon-1.gsm -share/asterisk/sounds/en/digits/mon-10.gsm -share/asterisk/sounds/en/digits/mon-11.gsm -share/asterisk/sounds/en/digits/mon-2.gsm -share/asterisk/sounds/en/digits/mon-3.gsm -share/asterisk/sounds/en/digits/mon-4.gsm -share/asterisk/sounds/en/digits/mon-5.gsm -share/asterisk/sounds/en/digits/mon-6.gsm -share/asterisk/sounds/en/digits/mon-7.gsm -share/asterisk/sounds/en/digits/mon-8.gsm -share/asterisk/sounds/en/digits/mon-9.gsm -share/asterisk/sounds/en/digits/oclock.gsm -share/asterisk/sounds/en/digits/oh.gsm -share/asterisk/sounds/en/digits/p-m.gsm -share/asterisk/sounds/en/digits/pound.gsm -share/asterisk/sounds/en/digits/star.gsm -share/asterisk/sounds/en/digits/thousand.gsm -share/asterisk/sounds/en/digits/today.gsm -share/asterisk/sounds/en/digits/tomorrow.gsm -share/asterisk/sounds/en/digits/yesterday.gsm -share/asterisk/sounds/en/dir-first.gsm -share/asterisk/sounds/en/dir-firstlast.gsm -share/asterisk/sounds/en/dir-instr.gsm -share/asterisk/sounds/en/dir-intro-fn.gsm -share/asterisk/sounds/en/dir-intro.gsm -share/asterisk/sounds/en/dir-last.gsm -share/asterisk/sounds/en/dir-multi1.gsm -share/asterisk/sounds/en/dir-multi2.gsm -share/asterisk/sounds/en/dir-multi3.gsm -share/asterisk/sounds/en/dir-multi9.gsm -share/asterisk/sounds/en/dir-nomatch.gsm -share/asterisk/sounds/en/dir-nomore.gsm -share/asterisk/sounds/en/dir-pls-enter.gsm -share/asterisk/sounds/en/followme/call-from.gsm -share/asterisk/sounds/en/followme/no-recording.gsm -share/asterisk/sounds/en/followme/options.gsm -share/asterisk/sounds/en/followme/pls-hold-while-try.gsm -share/asterisk/sounds/en/followme/sorry.gsm -share/asterisk/sounds/en/followme/status.gsm -share/asterisk/sounds/en/hello-world.gsm -share/asterisk/sounds/en/hours.gsm -share/asterisk/sounds/en/invalid.gsm -share/asterisk/sounds/en/letters/a.gsm -share/asterisk/sounds/en/letters/ascii123.gsm -share/asterisk/sounds/en/letters/ascii124.gsm -share/asterisk/sounds/en/letters/ascii125.gsm -share/asterisk/sounds/en/letters/ascii126.gsm -share/asterisk/sounds/en/letters/ascii34.gsm -share/asterisk/sounds/en/letters/ascii36.gsm -share/asterisk/sounds/en/letters/ascii37.gsm -share/asterisk/sounds/en/letters/ascii38.gsm -share/asterisk/sounds/en/letters/ascii39.gsm -share/asterisk/sounds/en/letters/ascii40.gsm -share/asterisk/sounds/en/letters/ascii41.gsm -share/asterisk/sounds/en/letters/ascii42.gsm -share/asterisk/sounds/en/letters/ascii44.gsm -share/asterisk/sounds/en/letters/ascii58.gsm -share/asterisk/sounds/en/letters/ascii59.gsm -share/asterisk/sounds/en/letters/ascii60.gsm -share/asterisk/sounds/en/letters/ascii62.gsm -share/asterisk/sounds/en/letters/ascii63.gsm -share/asterisk/sounds/en/letters/ascii91.gsm -share/asterisk/sounds/en/letters/ascii92.gsm -share/asterisk/sounds/en/letters/ascii93.gsm -share/asterisk/sounds/en/letters/ascii94.gsm -share/asterisk/sounds/en/letters/ascii95.gsm -share/asterisk/sounds/en/letters/ascii96.gsm -share/asterisk/sounds/en/letters/asterisk.gsm -share/asterisk/sounds/en/letters/at.gsm -share/asterisk/sounds/en/letters/b.gsm -share/asterisk/sounds/en/letters/c.gsm -share/asterisk/sounds/en/letters/d.gsm -share/asterisk/sounds/en/letters/dash.gsm -share/asterisk/sounds/en/letters/dollar.gsm -share/asterisk/sounds/en/letters/dot.gsm -share/asterisk/sounds/en/letters/e.gsm -share/asterisk/sounds/en/letters/equals.gsm -share/asterisk/sounds/en/letters/exclaimation-point.gsm -share/asterisk/sounds/en/letters/f.gsm -share/asterisk/sounds/en/letters/g.gsm -share/asterisk/sounds/en/letters/h.gsm -share/asterisk/sounds/en/letters/i.gsm -share/asterisk/sounds/en/letters/j.gsm -share/asterisk/sounds/en/letters/k.gsm -share/asterisk/sounds/en/letters/l.gsm -share/asterisk/sounds/en/letters/m.gsm -share/asterisk/sounds/en/letters/n.gsm -share/asterisk/sounds/en/letters/o.gsm -share/asterisk/sounds/en/letters/p.gsm -share/asterisk/sounds/en/letters/plus.gsm -share/asterisk/sounds/en/letters/q.gsm -share/asterisk/sounds/en/letters/r.gsm -share/asterisk/sounds/en/letters/s.gsm -share/asterisk/sounds/en/letters/slash.gsm -share/asterisk/sounds/en/letters/space.gsm -share/asterisk/sounds/en/letters/t.gsm -share/asterisk/sounds/en/letters/u.gsm -share/asterisk/sounds/en/letters/v.gsm -share/asterisk/sounds/en/letters/w.gsm -share/asterisk/sounds/en/letters/x.gsm -share/asterisk/sounds/en/letters/y.gsm -share/asterisk/sounds/en/letters/z.gsm -share/asterisk/sounds/en/letters/zed.gsm -share/asterisk/sounds/en/minutes.gsm -share/asterisk/sounds/en/pbx-invalid.gsm -share/asterisk/sounds/en/pbx-invalidpark.gsm -share/asterisk/sounds/en/pbx-parkingfailed.gsm -share/asterisk/sounds/en/pbx-transfer.gsm -share/asterisk/sounds/en/phonetic/9_p.gsm -share/asterisk/sounds/en/phonetic/a_p.gsm -share/asterisk/sounds/en/phonetic/b_p.gsm -share/asterisk/sounds/en/phonetic/c_p.gsm -share/asterisk/sounds/en/phonetic/d_p.gsm -share/asterisk/sounds/en/phonetic/e_p.gsm -share/asterisk/sounds/en/phonetic/f_p.gsm -share/asterisk/sounds/en/phonetic/g_p.gsm -share/asterisk/sounds/en/phonetic/h_p.gsm -share/asterisk/sounds/en/phonetic/i_p.gsm -share/asterisk/sounds/en/phonetic/j_p.gsm -share/asterisk/sounds/en/phonetic/k_p.gsm -share/asterisk/sounds/en/phonetic/l_p.gsm -share/asterisk/sounds/en/phonetic/m_p.gsm -share/asterisk/sounds/en/phonetic/n_p.gsm -share/asterisk/sounds/en/phonetic/o_p.gsm -share/asterisk/sounds/en/phonetic/p_p.gsm -share/asterisk/sounds/en/phonetic/q_p.gsm -share/asterisk/sounds/en/phonetic/r_p.gsm -share/asterisk/sounds/en/phonetic/s_p.gsm -share/asterisk/sounds/en/phonetic/t_p.gsm -share/asterisk/sounds/en/phonetic/u_p.gsm -share/asterisk/sounds/en/phonetic/v_p.gsm -share/asterisk/sounds/en/phonetic/w_p.gsm -share/asterisk/sounds/en/phonetic/x_p.gsm -share/asterisk/sounds/en/phonetic/y_p.gsm -share/asterisk/sounds/en/phonetic/z_p.gsm -share/asterisk/sounds/en/priv-callee-options.gsm -share/asterisk/sounds/en/priv-callpending.gsm -share/asterisk/sounds/en/priv-introsaved.gsm -share/asterisk/sounds/en/priv-recordintro.gsm -share/asterisk/sounds/en/privacy-incorrect.gsm -share/asterisk/sounds/en/privacy-prompt.gsm -share/asterisk/sounds/en/privacy-thankyou.gsm -share/asterisk/sounds/en/privacy-unident.gsm -share/asterisk/sounds/en/queue-callswaiting.gsm -share/asterisk/sounds/en/queue-holdtime.gsm -share/asterisk/sounds/en/queue-less-than.gsm -share/asterisk/sounds/en/queue-minute.gsm -share/asterisk/sounds/en/queue-minutes.gsm -share/asterisk/sounds/en/queue-periodic-announce.gsm -share/asterisk/sounds/en/queue-quantity1.gsm -share/asterisk/sounds/en/queue-quantity2.gsm -share/asterisk/sounds/en/queue-reporthold.gsm -share/asterisk/sounds/en/queue-seconds.gsm -share/asterisk/sounds/en/queue-thankyou.gsm -share/asterisk/sounds/en/queue-thereare.gsm -share/asterisk/sounds/en/queue-youarenext.gsm -share/asterisk/sounds/en/screen-callee-options.gsm -share/asterisk/sounds/en/seconds.gsm -share/asterisk/sounds/en/silence/1.gsm -share/asterisk/sounds/en/silence/10.gsm -share/asterisk/sounds/en/silence/2.gsm -share/asterisk/sounds/en/silence/3.gsm -share/asterisk/sounds/en/silence/4.gsm -share/asterisk/sounds/en/silence/5.gsm -share/asterisk/sounds/en/silence/6.gsm -share/asterisk/sounds/en/silence/7.gsm -share/asterisk/sounds/en/silence/8.gsm -share/asterisk/sounds/en/silence/9.gsm -share/asterisk/sounds/en/spy-agent.gsm -share/asterisk/sounds/en/spy-console.gsm -share/asterisk/sounds/en/spy-h323.gsm -share/asterisk/sounds/en/spy-iax.gsm -share/asterisk/sounds/en/spy-iax2.gsm -share/asterisk/sounds/en/spy-jingle.gsm -share/asterisk/sounds/en/spy-local.gsm -share/asterisk/sounds/en/spy-mgcp.gsm -share/asterisk/sounds/en/spy-misdn.gsm -share/asterisk/sounds/en/spy-mobile.gsm -share/asterisk/sounds/en/spy-nbs.gsm -share/asterisk/sounds/en/spy-sip.gsm -share/asterisk/sounds/en/spy-skinny.gsm -share/asterisk/sounds/en/spy-unistim.gsm -share/asterisk/sounds/en/spy-usbradio.gsm -share/asterisk/sounds/en/spy-zap.gsm -share/asterisk/sounds/en/ss-noservice.gsm -share/asterisk/sounds/en/transfer.gsm -share/asterisk/sounds/en/tt-allbusy.gsm -share/asterisk/sounds/en/tt-monkeys.gsm -share/asterisk/sounds/en/tt-monkeysintro.gsm -share/asterisk/sounds/en/tt-somethingwrong.gsm -share/asterisk/sounds/en/tt-weasels.gsm -share/asterisk/sounds/en/vm-Cust1.gsm -share/asterisk/sounds/en/vm-Cust2.gsm -share/asterisk/sounds/en/vm-Cust3.gsm -share/asterisk/sounds/en/vm-Cust4.gsm -share/asterisk/sounds/en/vm-Cust5.gsm -share/asterisk/sounds/en/vm-Family.gsm -share/asterisk/sounds/en/vm-Friends.gsm -share/asterisk/sounds/en/vm-INBOX.gsm -share/asterisk/sounds/en/vm-Old.gsm -share/asterisk/sounds/en/vm-Work.gsm -share/asterisk/sounds/en/vm-advopts.gsm -share/asterisk/sounds/en/vm-and.gsm -share/asterisk/sounds/en/vm-calldiffnum.gsm -share/asterisk/sounds/en/vm-changeto.gsm -share/asterisk/sounds/en/vm-delete.gsm -share/asterisk/sounds/en/vm-deleted.gsm -share/asterisk/sounds/en/vm-dialout.gsm -share/asterisk/sounds/en/vm-duration.gsm -share/asterisk/sounds/en/vm-enter-num-to-call.gsm -share/asterisk/sounds/en/vm-extension.gsm -share/asterisk/sounds/en/vm-first.gsm -share/asterisk/sounds/en/vm-for.gsm -share/asterisk/sounds/en/vm-forward.gsm -share/asterisk/sounds/en/vm-forwardoptions.gsm -share/asterisk/sounds/en/vm-from-extension.gsm -share/asterisk/sounds/en/vm-from-phonenumber.gsm -share/asterisk/sounds/en/vm-from.gsm -share/asterisk/sounds/en/vm-goodbye.gsm -share/asterisk/sounds/en/vm-helpexit.gsm -share/asterisk/sounds/en/vm-incorrect-mailbox.gsm -share/asterisk/sounds/en/vm-incorrect.gsm -share/asterisk/sounds/en/vm-instructions.gsm -share/asterisk/sounds/en/vm-intro.gsm -share/asterisk/sounds/en/vm-invalidpassword.gsm -share/asterisk/sounds/en/vm-isonphone.gsm -share/asterisk/sounds/en/vm-isunavail.gsm -share/asterisk/sounds/en/vm-last.gsm -share/asterisk/sounds/en/vm-leavemsg.gsm -share/asterisk/sounds/en/vm-login.gsm -share/asterisk/sounds/en/vm-mailboxfull.gsm -share/asterisk/sounds/en/vm-message.gsm -share/asterisk/sounds/en/vm-messages.gsm -share/asterisk/sounds/en/vm-minutes.gsm -share/asterisk/sounds/en/vm-mismatch.gsm -share/asterisk/sounds/en/vm-msginstruct.gsm -share/asterisk/sounds/en/vm-msgsaved.gsm -share/asterisk/sounds/en/vm-newpassword.gsm -share/asterisk/sounds/en/vm-newuser.gsm -share/asterisk/sounds/en/vm-next.gsm -share/asterisk/sounds/en/vm-no.gsm -share/asterisk/sounds/en/vm-nobodyavail.gsm -share/asterisk/sounds/en/vm-nobox.gsm -share/asterisk/sounds/en/vm-nomore.gsm -share/asterisk/sounds/en/vm-nonumber.gsm -share/asterisk/sounds/en/vm-num-i-have.gsm -share/asterisk/sounds/en/vm-onefor.gsm -share/asterisk/sounds/en/vm-onefor-full.gsm -share/asterisk/sounds/en/vm-options.gsm -share/asterisk/sounds/en/vm-opts.gsm -share/asterisk/sounds/en/vm-opts-full.gsm -share/asterisk/sounds/en/vm-passchanged.gsm -share/asterisk/sounds/en/vm-password.gsm -share/asterisk/sounds/en/vm-press.gsm -share/asterisk/sounds/en/vm-prev.gsm -share/asterisk/sounds/en/vm-reachoper.gsm -share/asterisk/sounds/en/vm-rec-busy.gsm -share/asterisk/sounds/en/vm-rec-name.gsm -share/asterisk/sounds/en/vm-rec-temp.gsm -share/asterisk/sounds/en/vm-rec-unv.gsm -share/asterisk/sounds/en/vm-received.gsm -share/asterisk/sounds/en/vm-reenterpassword.gsm -share/asterisk/sounds/en/vm-repeat.gsm -share/asterisk/sounds/en/vm-review.gsm -share/asterisk/sounds/en/vm-saved.gsm -share/asterisk/sounds/en/vm-savedto.gsm -share/asterisk/sounds/en/vm-savefolder.gsm -share/asterisk/sounds/en/vm-savemessage.gsm -share/asterisk/sounds/en/vm-saveoper.gsm -share/asterisk/sounds/en/vm-sorry.gsm -share/asterisk/sounds/en/vm-star-cancel.gsm -share/asterisk/sounds/en/vm-starmain.gsm -share/asterisk/sounds/en/vm-tempgreetactive.gsm -share/asterisk/sounds/en/vm-tempgreeting.gsm -share/asterisk/sounds/en/vm-tempgreeting2.gsm -share/asterisk/sounds/en/vm-tempremoved.gsm -share/asterisk/sounds/en/vm-then-pound.gsm -share/asterisk/sounds/en/vm-theperson.gsm -share/asterisk/sounds/en/vm-tmpexists.gsm -share/asterisk/sounds/en/vm-tocallback.gsm -share/asterisk/sounds/en/vm-tocallnum.gsm -share/asterisk/sounds/en/vm-tocancel.gsm -share/asterisk/sounds/en/vm-tocancelmsg.gsm -share/asterisk/sounds/en/vm-toenternumber.gsm -share/asterisk/sounds/en/vm-toforward.gsm -share/asterisk/sounds/en/vm-tohearenv.gsm -share/asterisk/sounds/en/vm-tomakecall.gsm -share/asterisk/sounds/en/vm-tooshort.gsm -share/asterisk/sounds/en/vm-toreply.gsm -share/asterisk/sounds/en/vm-torerecord.gsm -share/asterisk/sounds/en/vm-undelete.gsm -share/asterisk/sounds/en/vm-undeleted.gsm -share/asterisk/sounds/en/vm-unknown-caller.gsm -share/asterisk/sounds/en/vm-whichbox.gsm -share/asterisk/sounds/en/vm-youhave.gsm -share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.20 -share/asterisk/static-http/ajamdemo.html -share/asterisk/static-http/astman.css -share/asterisk/static-http/astman.js -share/asterisk/static-http/core-en_US.xml -share/asterisk/static-http/prototype.js -share/asterisk/static-http/mantest.html -%%WITH_DAHDI%%lib/asterisk/modules/app_flash.so -%%WITH_DAHDI%%lib/asterisk/modules/app_meetme.so -%%WITH_DAHDI%%lib/asterisk/modules/app_page.so -%%WITH_DAHDI%%lib/asterisk/modules/app_dahdibarge.so -%%WITH_DAHDI%%lib/asterisk/modules/app_dahdiras.so -%%WITH_ODBC%%lib/asterisk/modules/cdr_odbc.so -%%WITH_FREETDS%%lib/asterisk/modules/cdr_tds.so -%%WITH_H323%%lib/asterisk/modules/chan_h323.so -%%WITH_DAHDI%%lib/asterisk/modules/chan_dahdi.so -%%WITH_DAHDI%%lib/asterisk/modules/codec_dahdi.so -%%WITH_ODBC%%lib/asterisk/modules/res_config_odbc.so -%%WITH_ODBC%%lib/asterisk/modules/res_odbc.so -%%DOCSDIR%%/WARNINGS -%%DOCSDIR%%/asterisk.css -%%DOCSDIR%%/asterisk.html -%%DOCSDIR%%/images.aux -%%DOCSDIR%%/images.log -%%DOCSDIR%%/images.out -%%DOCSDIR%%/images.pl -%%DOCSDIR%%/images.tex -%%DOCSDIR%%/img1.png -%%DOCSDIR%%/img2.png -%%DOCSDIR%%/img3.png -%%DOCSDIR%%/img4.png -%%DOCSDIR%%/img5.png -%%DOCSDIR%%/img6.png -%%DOCSDIR%%/img7.png -%%DOCSDIR%%/img8.png -%%DOCSDIR%%/img9.png -%%DOCSDIR%%/index.html -%%DOCSDIR%%/internals.pl -%%DOCSDIR%%/labels.pl -%%DOCSDIR%%/node1.html -%%DOCSDIR%%/node10.html -%%DOCSDIR%%/node100.html -%%DOCSDIR%%/node101.html -%%DOCSDIR%%/node102.html -%%DOCSDIR%%/node103.html -%%DOCSDIR%%/node104.html -%%DOCSDIR%%/node105.html -%%DOCSDIR%%/node106.html -%%DOCSDIR%%/node107.html -%%DOCSDIR%%/node108.html -%%DOCSDIR%%/node109.html -%%DOCSDIR%%/node11.html -%%DOCSDIR%%/node110.html -%%DOCSDIR%%/node111.html -%%DOCSDIR%%/node112.html -%%DOCSDIR%%/node113.html -%%DOCSDIR%%/node114.html -%%DOCSDIR%%/node115.html -%%DOCSDIR%%/node116.html -%%DOCSDIR%%/node117.html -%%DOCSDIR%%/node118.html -%%DOCSDIR%%/node119.html -%%DOCSDIR%%/node12.html -%%DOCSDIR%%/node120.html -%%DOCSDIR%%/node121.html -%%DOCSDIR%%/node122.html -%%DOCSDIR%%/node123.html -%%DOCSDIR%%/node124.html -%%DOCSDIR%%/node125.html -%%DOCSDIR%%/node126.html -%%DOCSDIR%%/node127.html -%%DOCSDIR%%/node128.html -%%DOCSDIR%%/node129.html -%%DOCSDIR%%/node13.html -%%DOCSDIR%%/node130.html -%%DOCSDIR%%/node131.html -%%DOCSDIR%%/node132.html -%%DOCSDIR%%/node133.html -%%DOCSDIR%%/node134.html -%%DOCSDIR%%/node135.html -%%DOCSDIR%%/node136.html -%%DOCSDIR%%/node137.html -%%DOCSDIR%%/node138.html -%%DOCSDIR%%/node139.html -%%DOCSDIR%%/node14.html -%%DOCSDIR%%/node140.html -%%DOCSDIR%%/node141.html -%%DOCSDIR%%/node142.html -%%DOCSDIR%%/node143.html -%%DOCSDIR%%/node144.html -%%DOCSDIR%%/node145.html -%%DOCSDIR%%/node146.html -%%DOCSDIR%%/node147.html -%%DOCSDIR%%/node148.html -%%DOCSDIR%%/node149.html -%%DOCSDIR%%/node15.html -%%DOCSDIR%%/node150.html -%%DOCSDIR%%/node151.html -%%DOCSDIR%%/node152.html -%%DOCSDIR%%/node153.html -%%DOCSDIR%%/node154.html -%%DOCSDIR%%/node155.html -%%DOCSDIR%%/node156.html -%%DOCSDIR%%/node157.html -%%DOCSDIR%%/node158.html -%%DOCSDIR%%/node159.html -%%DOCSDIR%%/node16.html -%%DOCSDIR%%/node160.html -%%DOCSDIR%%/node161.html -%%DOCSDIR%%/node162.html -%%DOCSDIR%%/node163.html -%%DOCSDIR%%/node164.html -%%DOCSDIR%%/node165.html -%%DOCSDIR%%/node166.html -%%DOCSDIR%%/node167.html -%%DOCSDIR%%/node168.html -%%DOCSDIR%%/node169.html -%%DOCSDIR%%/node17.html -%%DOCSDIR%%/node170.html -%%DOCSDIR%%/node171.html -%%DOCSDIR%%/node172.html -%%DOCSDIR%%/node173.html -%%DOCSDIR%%/node174.html -%%DOCSDIR%%/node175.html -%%DOCSDIR%%/node176.html -%%DOCSDIR%%/node177.html -%%DOCSDIR%%/node178.html -%%DOCSDIR%%/node179.html -%%DOCSDIR%%/node18.html -%%DOCSDIR%%/node180.html -%%DOCSDIR%%/node181.html -%%DOCSDIR%%/node182.html -%%DOCSDIR%%/node183.html -%%DOCSDIR%%/node184.html -%%DOCSDIR%%/node185.html -%%DOCSDIR%%/node186.html -%%DOCSDIR%%/node187.html -%%DOCSDIR%%/node188.html -%%DOCSDIR%%/node189.html -%%DOCSDIR%%/node19.html -%%DOCSDIR%%/node190.html -%%DOCSDIR%%/node191.html -%%DOCSDIR%%/node192.html -%%DOCSDIR%%/node193.html -%%DOCSDIR%%/node194.html -%%DOCSDIR%%/node195.html -%%DOCSDIR%%/node196.html -%%DOCSDIR%%/node197.html -%%DOCSDIR%%/node198.html -%%DOCSDIR%%/node199.html -%%DOCSDIR%%/node2.html -%%DOCSDIR%%/node20.html -%%DOCSDIR%%/node200.html -%%DOCSDIR%%/node201.html -%%DOCSDIR%%/node202.html -%%DOCSDIR%%/node203.html -%%DOCSDIR%%/node204.html -%%DOCSDIR%%/node205.html -%%DOCSDIR%%/node206.html -%%DOCSDIR%%/node207.html -%%DOCSDIR%%/node208.html -%%DOCSDIR%%/node209.html -%%DOCSDIR%%/node21.html -%%DOCSDIR%%/node210.html -%%DOCSDIR%%/node211.html -%%DOCSDIR%%/node212.html -%%DOCSDIR%%/node213.html -%%DOCSDIR%%/node214.html -%%DOCSDIR%%/node215.html -%%DOCSDIR%%/node216.html -%%DOCSDIR%%/node217.html -%%DOCSDIR%%/node218.html -%%DOCSDIR%%/node219.html -%%DOCSDIR%%/node22.html -%%DOCSDIR%%/node220.html -%%DOCSDIR%%/node221.html -%%DOCSDIR%%/node222.html -%%DOCSDIR%%/node223.html -%%DOCSDIR%%/node224.html -%%DOCSDIR%%/node225.html -%%DOCSDIR%%/node226.html -%%DOCSDIR%%/node227.html -%%DOCSDIR%%/node228.html -%%DOCSDIR%%/node229.html -%%DOCSDIR%%/node23.html -%%DOCSDIR%%/node230.html -%%DOCSDIR%%/node231.html -%%DOCSDIR%%/node232.html -%%DOCSDIR%%/node233.html -%%DOCSDIR%%/node234.html -%%DOCSDIR%%/node235.html -%%DOCSDIR%%/node236.html -%%DOCSDIR%%/node237.html -%%DOCSDIR%%/node238.html -%%DOCSDIR%%/node239.html -%%DOCSDIR%%/node24.html -%%DOCSDIR%%/node240.html -%%DOCSDIR%%/node241.html -%%DOCSDIR%%/node242.html -%%DOCSDIR%%/node243.html -%%DOCSDIR%%/node244.html -%%DOCSDIR%%/node245.html -%%DOCSDIR%%/node246.html -%%DOCSDIR%%/node247.html -%%DOCSDIR%%/node248.html -%%DOCSDIR%%/node249.html -%%DOCSDIR%%/node25.html -%%DOCSDIR%%/node250.html -%%DOCSDIR%%/node251.html -%%DOCSDIR%%/node252.html -%%DOCSDIR%%/node253.html -%%DOCSDIR%%/node254.html -%%DOCSDIR%%/node255.html -%%DOCSDIR%%/node256.html -%%DOCSDIR%%/node257.html -%%DOCSDIR%%/node258.html -%%DOCSDIR%%/node259.html -%%DOCSDIR%%/node26.html -%%DOCSDIR%%/node260.html -%%DOCSDIR%%/node261.html -%%DOCSDIR%%/node262.html -%%DOCSDIR%%/node263.html -%%DOCSDIR%%/node264.html -%%DOCSDIR%%/node265.html -%%DOCSDIR%%/node266.html -%%DOCSDIR%%/node267.html -%%DOCSDIR%%/node268.html -%%DOCSDIR%%/node269.html -%%DOCSDIR%%/node27.html -%%DOCSDIR%%/node270.html -%%DOCSDIR%%/node271.html -%%DOCSDIR%%/node272.html -%%DOCSDIR%%/node273.html -%%DOCSDIR%%/node274.html -%%DOCSDIR%%/node275.html -%%DOCSDIR%%/node276.html -%%DOCSDIR%%/node277.html -%%DOCSDIR%%/node278.html -%%DOCSDIR%%/node279.html -%%DOCSDIR%%/node28.html -%%DOCSDIR%%/node280.html -%%DOCSDIR%%/node281.html -%%DOCSDIR%%/node282.html -%%DOCSDIR%%/node283.html -%%DOCSDIR%%/node284.html -%%DOCSDIR%%/node285.html -%%DOCSDIR%%/node286.html -%%DOCSDIR%%/node287.html -%%DOCSDIR%%/node288.html -%%DOCSDIR%%/node289.html -%%DOCSDIR%%/node290.html -%%DOCSDIR%%/node291.html -%%DOCSDIR%%/node292.html -%%DOCSDIR%%/node293.html -%%DOCSDIR%%/node294.html -%%DOCSDIR%%/node295.html -%%DOCSDIR%%/node296.html -%%DOCSDIR%%/node297.html -%%DOCSDIR%%/node298.html -%%DOCSDIR%%/node299.html -%%DOCSDIR%%/node29.html -%%DOCSDIR%%/node3.html -%%DOCSDIR%%/node300.html -%%DOCSDIR%%/node301.html -%%DOCSDIR%%/node302.html -%%DOCSDIR%%/node303.html -%%DOCSDIR%%/node304.html -%%DOCSDIR%%/node305.html -%%DOCSDIR%%/node306.html -%%DOCSDIR%%/node307.html -%%DOCSDIR%%/node308.html -%%DOCSDIR%%/node309.html -%%DOCSDIR%%/node30.html -%%DOCSDIR%%/node310.html -%%DOCSDIR%%/node311.html -%%DOCSDIR%%/node312.html -%%DOCSDIR%%/node313.html -%%DOCSDIR%%/node314.html -%%DOCSDIR%%/node315.html -%%DOCSDIR%%/node316.html -%%DOCSDIR%%/node317.html -%%DOCSDIR%%/node318.html -%%DOCSDIR%%/node319.html -%%DOCSDIR%%/node31.html -%%DOCSDIR%%/node320.html -%%DOCSDIR%%/node321.html -%%DOCSDIR%%/node322.html -%%DOCSDIR%%/node323.html -%%DOCSDIR%%/node324.html -%%DOCSDIR%%/node325.html -%%DOCSDIR%%/node326.html -%%DOCSDIR%%/node327.html -%%DOCSDIR%%/node328.html -%%DOCSDIR%%/node329.html -%%DOCSDIR%%/node32.html -%%DOCSDIR%%/node330.html -%%DOCSDIR%%/node331.html -%%DOCSDIR%%/node332.html -%%DOCSDIR%%/node333.html -%%DOCSDIR%%/node334.html -%%DOCSDIR%%/node335.html -%%DOCSDIR%%/node336.html -%%DOCSDIR%%/node337.html -%%DOCSDIR%%/node338.html -%%DOCSDIR%%/node339.html -%%DOCSDIR%%/node33.html -%%DOCSDIR%%/node340.html -%%DOCSDIR%%/node341.html -%%DOCSDIR%%/node342.html -%%DOCSDIR%%/node343.html -%%DOCSDIR%%/node344.html -%%DOCSDIR%%/node345.html -%%DOCSDIR%%/node346.html -%%DOCSDIR%%/node347.html -%%DOCSDIR%%/node348.html -%%DOCSDIR%%/node349.html -%%DOCSDIR%%/node34.html -%%DOCSDIR%%/node350.html -%%DOCSDIR%%/node351.html -%%DOCSDIR%%/node352.html -%%DOCSDIR%%/node353.html -%%DOCSDIR%%/node354.html -%%DOCSDIR%%/node355.html -%%DOCSDIR%%/node356.html -%%DOCSDIR%%/node357.html -%%DOCSDIR%%/node358.html -%%DOCSDIR%%/node359.html -%%DOCSDIR%%/node35.html -%%DOCSDIR%%/node360.html -%%DOCSDIR%%/node361.html -%%DOCSDIR%%/node362.html -%%DOCSDIR%%/node363.html -%%DOCSDIR%%/node364.html -%%DOCSDIR%%/node365.html -%%DOCSDIR%%/node366.html -%%DOCSDIR%%/node367.html -%%DOCSDIR%%/node368.html -%%DOCSDIR%%/node369.html -%%DOCSDIR%%/node36.html -%%DOCSDIR%%/node370.html -%%DOCSDIR%%/node371.html -%%DOCSDIR%%/node372.html -%%DOCSDIR%%/node373.html -%%DOCSDIR%%/node374.html -%%DOCSDIR%%/node375.html -%%DOCSDIR%%/node376.html -%%DOCSDIR%%/node377.html -%%DOCSDIR%%/node378.html -%%DOCSDIR%%/node379.html -%%DOCSDIR%%/node37.html -%%DOCSDIR%%/node380.html -%%DOCSDIR%%/node381.html -%%DOCSDIR%%/node382.html -%%DOCSDIR%%/node383.html -%%DOCSDIR%%/node384.html -%%DOCSDIR%%/node385.html -%%DOCSDIR%%/node386.html -%%DOCSDIR%%/node387.html -%%DOCSDIR%%/node388.html -%%DOCSDIR%%/node389.html -%%DOCSDIR%%/node38.html -%%DOCSDIR%%/node390.html -%%DOCSDIR%%/node391.html -%%DOCSDIR%%/node39.html -%%DOCSDIR%%/node4.html -%%DOCSDIR%%/node40.html -%%DOCSDIR%%/node41.html -%%DOCSDIR%%/node42.html -%%DOCSDIR%%/node43.html -%%DOCSDIR%%/node44.html -%%DOCSDIR%%/node45.html -%%DOCSDIR%%/node46.html -%%DOCSDIR%%/node47.html -%%DOCSDIR%%/node48.html -%%DOCSDIR%%/node49.html -%%DOCSDIR%%/node5.html -%%DOCSDIR%%/node50.html -%%DOCSDIR%%/node51.html -%%DOCSDIR%%/node52.html -%%DOCSDIR%%/node53.html -%%DOCSDIR%%/node54.html -%%DOCSDIR%%/node55.html -%%DOCSDIR%%/node56.html -%%DOCSDIR%%/node57.html -%%DOCSDIR%%/node58.html -%%DOCSDIR%%/node59.html -%%DOCSDIR%%/node6.html -%%DOCSDIR%%/node60.html -%%DOCSDIR%%/node61.html -%%DOCSDIR%%/node62.html -%%DOCSDIR%%/node63.html -%%DOCSDIR%%/node64.html -%%DOCSDIR%%/node65.html -%%DOCSDIR%%/node66.html -%%DOCSDIR%%/node67.html -%%DOCSDIR%%/node68.html -%%DOCSDIR%%/node69.html -%%DOCSDIR%%/node7.html -%%DOCSDIR%%/node70.html -%%DOCSDIR%%/node71.html -%%DOCSDIR%%/node72.html -%%DOCSDIR%%/node73.html -%%DOCSDIR%%/node74.html -%%DOCSDIR%%/node75.html -%%DOCSDIR%%/node76.html -%%DOCSDIR%%/node77.html -%%DOCSDIR%%/node78.html -%%DOCSDIR%%/node79.html -%%DOCSDIR%%/node8.html -%%DOCSDIR%%/node80.html -%%DOCSDIR%%/node81.html -%%DOCSDIR%%/node82.html -%%DOCSDIR%%/node83.html -%%DOCSDIR%%/node84.html -%%DOCSDIR%%/node85.html -%%DOCSDIR%%/node86.html -%%DOCSDIR%%/node87.html -%%DOCSDIR%%/node88.html -%%DOCSDIR%%/node89.html -%%DOCSDIR%%/node9.html -%%DOCSDIR%%/node90.html -%%DOCSDIR%%/node91.html -%%DOCSDIR%%/node92.html -%%DOCSDIR%%/node93.html -%%DOCSDIR%%/node94.html -%%DOCSDIR%%/node95.html -%%DOCSDIR%%/node96.html -%%DOCSDIR%%/node97.html -%%DOCSDIR%%/node98.html -%%DOCSDIR%%/node99.html -%%DOCSDIR%%/images/asterisk-intro.jpg -%%DOCSDIR%%/images/kpad2.jpg -@dirrm %%DOCSDIR%%/images -@dirrm %%DOCSDIR%% -@dirrm share/asterisk/static-http -@dirrm share/asterisk/sounds/en/silence -@dirrm share/asterisk/sounds/en/phonetic -@dirrm share/asterisk/sounds/en/letters -@dirrm share/asterisk/sounds/en/followme -@dirrm share/asterisk/sounds/en/digits -@dirrm share/asterisk/sounds/en/dictate -@dirrm share/asterisk/sounds/en_AU -@dirrm share/asterisk/sounds/en -@dirrm share/asterisk/sounds/es -@dirrm share/asterisk/sounds/fr -@dirrm share/asterisk/sounds -@dirrm share/asterisk/phoneprov -@dirrm share/asterisk/moh -@dirrm share/asterisk/keys -@dirrm share/asterisk/images -@dirrm share/asterisk/firmware/iax -@dirrm share/asterisk/firmware -@dirrm share/asterisk/documentation/thirdparty -@dirrm share/asterisk/documentation -@dirrm share/asterisk/agi-bin -@dirrm share/asterisk -@dirrm lib/asterisk/modules -@dirrm lib/asterisk -@dirrm include/asterisk/doxygen -@dirrm include/asterisk -@dirrmtry etc/asterisk -@exec mkdir -p %D/share/asterisk/keys -@exec mkdir -p %D/share/asterisk/images -@exec mkdir -p %D/share/asterisk/firmware/iax -@exec mkdir -p %D/share/asterisk/documentation/thirdparty -@exec mkdir -p %D/share/asterisk/sounds/es -@exec mkdir -p %D/share/asterisk/sounds/fr -@exec mkdir -p %D/share/asterisk/sounds/en_AU -@cwd /var -spool/asterisk/voicemail/default/1234/en/busy.gsm -spool/asterisk/voicemail/default/1234/en/unavail.gsm -@exec mkdir -p %D/log/asterisk/cdr-csv -@exec mkdir -p %D/log/asterisk/cel-csv -@exec mkdir -p %D/log/asterisk/cdr-custom -@exec mkdir -p %D/log/asterisk/cel-custom -@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/outgoing -@exec mkdir -p %D/spool/asterisk/system -@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX -@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/en -@exec mkdir -p %D/spool/asterisk/tmp -@exec mkdir -p %D/db/asterisk -@exec chown -R %%ASTERISK_USER%%:%%ASTERISK_GROUP%% %D/db/asterisk -@exec chown -R %%ASTERISK_USER%%:%%ASTERISK_GROUP%% %D/spool/asterisk -@exec chown -R %%ASTERISK_USER%%:%%ASTERISK_GROUP%% %D/log/asterisk -@dirrm spool/asterisk/dictate -@dirrm spool/asterisk/meetme -@dirrm spool/asterisk/monitor -@dirrm spool/asterisk/outgoing -@dirrm spool/asterisk/system -@dirrm spool/asterisk/voicemail/default/1234/INBOX -@dirrm spool/asterisk/voicemail/default/1234/en -@dirrm spool/asterisk/voicemail/default/1234 -@dirrm spool/asterisk/voicemail/default -@dirrm spool/asterisk/voicemail -@dirrm spool/asterisk/tmp -@dirrm spool/asterisk -@dirrm log/asterisk/cdr-csv -@dirrm log/asterisk/cel-csv -@dirrm log/asterisk/cdr-custom -@dirrm log/asterisk/cel-custom -@dirrm log/asterisk diff --git a/net/imm/Makefile b/net/imm/Makefile deleted file mode 100644 index 7ad7149eed3c..000000000000 --- a/net/imm/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# New ports collection makefile for: imm -# Date created: 13 October 1994 -# Whom: wollman -# -# $FreeBSD$ -# - -PORTNAME= imm -PORTVERSION= 3.5a1 -PORTREVISION= 3 -CATEGORIES= mbone tk -MASTER_SITES= ftp://ftp.hawaii.edu/paccom/imm-3.5a1/ -DISTNAME= imm.source -EXTRACT_SUFX= .tar.Z - -MAINTAINER= ports@FreeBSD.org -COMMENT= Internet Image(or other data) Multicaster (and receiver) - -USE_TK= 84 -WRKSRC= ${WRKDIR}/mnm - -PORTDOCS= README imm_readme.txt - -.include <bsd.port.pre.mk> - -post-extract: - @${MKDIR} ${WRKSRC}/freebsd - @${CP} ${FILESDIR}/Makefile.work ${WRKSRC}/Makefile - @${CP} ${FILESDIR}/Makefile.freebsd ${WRKSRC}/src - -# The included makefile doesn't have an "install" target. -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/freebsd/imm ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/freebsd/immserv ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/freebsd/lscomp ${PREFIX}/bin -# and no man pages at all yet. -# But include the very limited documentation -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/imm_readme.txt ${DOCSDIR} -.endif -# The sdr plugin is pretty much required. - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/sdr2.plugin.S53.image.imm ${DATADIR} - -.include <bsd.port.post.mk> diff --git a/net/imm/distinfo b/net/imm/distinfo deleted file mode 100644 index 090e9df901b5..000000000000 --- a/net/imm/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (imm.source.tar.Z) = bf2713e5dca81daaecbc0bbcaf7af667 -SHA256 (imm.source.tar.Z) = be66dc74b955cf51de1575662d700b87cb423e3562f163d2f0dc70878b73270b -SIZE (imm.source.tar.Z) = 106067 diff --git a/net/imm/files/Makefile.freebsd b/net/imm/files/Makefile.freebsd deleted file mode 100644 index 379dae4d11a3..000000000000 --- a/net/imm/files/Makefile.freebsd +++ /dev/null @@ -1,77 +0,0 @@ -# Some versions of make, like SGI's, use the following variable to -# determine which shell to use for executing commands: -SHELL = /bin/sh -INCLUDE_DIR = -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include -# Libraries to use when linking: -LIBS = -lm - -TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk84 -ltcl84 -lX11 - -TARGET = ../freebsd - -CFLAGS = -g -DSIG_T=void -DMULTICAST -I. -DERROR_TEST - -CC ?= gcc -CC_SWITCHES = ${CFLAGS} - -ROBJS = protocol.o utils.o - -SOBJS = protocol.o immserv.o sorttree.o utils.o - -MOBJS = protocol.o mnmserver.o sorttree.o utils.o - -all: $(TARGET)/imm $(TARGET)/immserv $(TARGET)/lscomp - -$(TARGET)/mnm: $(ROBJS) main.o xlopen.o mcl.o - $(CC) $(CFLAGS) main.o xlopen.o mcl.o $(ROBJS) $(LIBS) -o $(TARGET)/mnm - -$(TARGET)/imm: $(ROBJS) tkAppInit.o imm_init.o imm.o xlopen_imm.o - $(CC) $(CFLAGS) tkAppInit.o imm_init.o imm.o xlopen_imm.o $(ROBJS) $(TKLIBS) $(LIBS) -o $(TARGET)/imm - -$(TARGET)/immserv: $(SOBJS) - $(CC) $(CFLAGS) $(SOBJS) $(LIBS) -o $(TARGET)/immserv - -$(TARGET)/lscomp: lscomp.o protocol.o sorttree.o utils.o - $(CC) $(CFLAGS) lscomp.o protocol.o sorttree.o utils.o $(LIBS) -o $(TARGET)/lscomp - -clean: - rm -f *.o tcl2c $(TARGET)/mnm $(TARGET)/lscomp $(TARGET)/imm $(TARGET)/immserv - -tcl2c: tcl2c.c - $(CC) $(CFLAGS) tcl2c.c $(LIBS) -o tcl2c - -imm_init.c: tcl2c imm_def.tcl mcl.tcl Radio.tcl Listbox.tcl viewbox.tcl filebox.tcl mkHostname.tcl - ./tcl2c IMM_Init < imm_def.tcl > imm_init.c - ./tcl2c MCL < mcl.tcl >> imm_init.c - ./tcl2c RADIO < Radio.tcl >> imm_init.c - ./tcl2c LISTBOX < Listbox.tcl >> imm_init.c - ./tcl2c VIEWBOX < viewbox.tcl >> imm_init.c - ./tcl2c FILEBOX < filebox.tcl >> imm_init.c - ./tcl2c HOSTBOX < mkHostname.tcl >> imm_init.c - ./tcl2c SERVERBOX < mnmserv.tcl >> imm_init.c - -imm_init.o: imm_init.c - -main.o: main.c - -mcl.o: mcl.c - -imm.o: mcl.c - gcc $(CFLAGS) -DIMM $(INCLUDE_DIR) -c mcl.c -o imm.o - -xlopen_imm.o: xlopen.c - gcc $(CFLAGS) -DIMM $(INCLUDE_DIR) -c xlopen.c -o xlopen_imm.o - -tkAppInit.o: tkAppInit.c - gcc $(CFLAGS) $(INCLUDE_DIR) tkAppInit.c -c - -protocol.o: protocol.c - -utils.o: utils.c - -lscomp.o: lscomp.c - -sorttree.o: sorttree.c immserv.h - -immserv.o: immserv.c immserv.h - diff --git a/net/imm/files/Makefile.work b/net/imm/files/Makefile.work deleted file mode 100644 index cb876d343f9e..000000000000 --- a/net/imm/files/Makefile.work +++ /dev/null @@ -1,2 +0,0 @@ -all install: - cd src; ${MAKE} -f Makefile.freebsd $@ diff --git a/net/imm/files/patch-aa b/net/imm/files/patch-aa deleted file mode 100644 index f7cb9a9cefc8..000000000000 --- a/net/imm/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- src/mcl.c.orig Tue Nov 19 12:33:49 1996 -+++ src/mcl.c Tue Nov 19 12:34:23 1996 -@@ -25,7 +25,7 @@ - - #define MAIN - #include "protocol.h" --#include <malloc.h> -+#include <stdlib.h> - #include <fcntl.h> - #include <sys/socket.h> - #include <netinet/in.h> diff --git a/net/imm/files/patch-ab b/net/imm/files/patch-ab deleted file mode 100644 index 4b1f038304da..000000000000 --- a/net/imm/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- src/xlopen.c.orig Tue Nov 19 12:33:53 1996 -+++ src/xlopen.c Tue Nov 19 12:35:01 1996 -@@ -34,7 +34,7 @@ - extern int optind, opterr; - extern int useimageloader; - extern struct hosttype *hosts_tail; --#ifndef __NetBSD__ -+#if !defined(__NetBSD__) && !defined(__FreeBSD__) /* XXX */ - extern char *sys_errlist[]; - #endif - extern unsigned int total; diff --git a/net/imm/files/patch-ac b/net/imm/files/patch-ac deleted file mode 100644 index 2da9e3a99e12..000000000000 --- a/net/imm/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- src/immserv.c.orig Tue Nov 19 12:36:41 1996 -+++ src/immserv.c Tue Nov 19 12:37:32 1996 -@@ -1407,7 +1407,7 @@ - /******************************************************************************/ - void setackalarm(int nop) {} - /******************************************************************************/ --#ifndef __NetBSD__ -+#if !defined(__NetBSD__) && !defined(__FreeBSD__) /* XXX */ - /* routine to put process to sleep */ - int usleep( wait) - u_int wait; diff --git a/net/imm/files/patch-src-tkAppInit.c b/net/imm/files/patch-src-tkAppInit.c deleted file mode 100644 index 8dacd5fa95aa..000000000000 --- a/net/imm/files/patch-src-tkAppInit.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/tkAppInit.c.orig Thu Mar 15 10:00:05 2007 -+++ src/tkAppInit.c Thu Mar 15 10:00:12 2007 -@@ -97,9 +97,6 @@ - * Sun shared libraries to be used for Tcl. - */ - --extern int matherr(); --void GetDspStatus(); --int *tclDummyMathPtr = (int *) matherr; - - /***************************************************************************/ - /* fork and initiate server process */ diff --git a/net/imm/files/patch-src::utils.c b/net/imm/files/patch-src::utils.c deleted file mode 100644 index a7db5d4e2d04..000000000000 --- a/net/imm/files/patch-src::utils.c +++ /dev/null @@ -1,200 +0,0 @@ ---- src/utils.c.orig Thu Jul 15 12:37:25 2004 -+++ src/utils.c Thu Jul 15 13:36:09 2004 -@@ -20,7 +20,7 @@ - * These notices must be retained in any copies of any part of this software. - ******************************************************************************/ - #include <stdio.h> --#include <varargs.h> -+#include <stdarg.h> - #include <stdlib.h> - #include <string.h> - #ifdef __NetBSD__ -@@ -40,47 +40,118 @@ - - /*----------------------------------------------------------------------------*/ - --void warn( va_alist ) --va_dcl -+/* Allocate memory for format string buffers */ -+int -+vfsalloc(char *fmt, va_list ap) - { -- va_list args; -- char *fmt; -+ char *s; -+ int i, n = 0, len = 0; - -- va_start( args ); -- fmt = va_arg( args, char * ); -- fprintf( stderr, "Warning: " ); -- vfprintf( stderr, fmt, args ); -- va_end( args ); -+ if (!fmt) -+ return 0; -+ -+ s = strchr(fmt, '%'); -+ -+ while (s) { -+ ++s; -+ ++n; -+ -+ switch (*s) { -+ case 'd': -+ i = va_arg(ap, int); -+ len += 1 + sizeof(int)<<1; -+ break; -+ case 's': -+ len += strlen(va_arg(ap, char *)); -+ break; -+ } -+ s = strchr(s, '%'); -+ } -+ -+ len += strlen(fmt) - (2 * n); -+ -+ return len; -+} -+ -+void warn( char *fmt, ... ) -+{ -+ va_list ap; -+ char *buf, *s; -+ int len; -+ -+ if (!fmt) -+ return; -+ -+ va_start(ap, fmt); -+ if (!(len = vfsalloc(fmt, ap))) -+ return; -+ va_end(ap); -+ -+ if (!(buf = malloc(len))) -+ return; -+ -+ va_start(ap, fmt); -+ vsprintf(buf, fmt, ap); -+ va_end(ap); -+ -+ fprintf(stderr, "Warning: %s\n", buf); -+ free(buf); - } - - /*----------------------------------------------------------------------------*/ - --void die( va_alist ) --va_dcl -+void die(char *fmt, ... ) - { -- va_list args; -- char *fmt; -+ va_list ap; -+ char *buf, *s; -+ int len; -+ -+ if (!fmt) -+ return; -+ -+ va_start(ap, fmt); -+ if (!(len = vfsalloc(fmt, ap))) -+ return; -+ va_end(ap); -+ -+ if (!(buf = malloc(len))) -+ return; - -- va_start( args ); -- fmt = va_arg( args, char * ); -- fprintf( stderr, "Error: " ); -- vfprintf( stderr, fmt, args ); -- exit( 1 ); -+ va_start(ap, fmt); -+ vsprintf(buf, fmt, ap); -+ va_end(ap); -+ -+ fprintf(stderr, "Error: %s\n", buf); -+ free(buf); -+ exit(1); - } - - /*----------------------------------------------------------------------------*/ - --void fatal( va_alist ) --va_dcl -+void fatal(char *fmt, ... ) - { -- va_list args; -- char *fmt; -+ va_list ap; -+ char *buf, *s; -+ int len; -+ -+ if (!fmt) -+ return; - -- va_start( args ); -- fmt = va_arg( args, char * ); -- fprintf( stderr, "Internal Error: " ); -- vfprintf( stderr, fmt, args ); -- exit( 2 ); -+ va_start(ap, fmt); -+ if (!(len = vfsalloc(fmt, ap))) -+ return; -+ va_end(ap); -+ -+ if (!(buf = malloc(len))) -+ return; -+ -+ va_start(ap, fmt); -+ vsprintf(buf, fmt, ap); -+ va_end(ap); -+ -+ fprintf(stderr, "Internal error: %s\n", buf); -+ free(buf); -+ exit(2); - } - - /*----------------------------------------------------------------------------*/ -@@ -142,21 +213,34 @@ - - /*----------------------------------------------------------------------------*/ - --void mailmessage( va_alist ) --va_dcl -+void mailmessage(char *fmt, ... ) - { -- va_list args; -- char *fmt; -+ va_list ap; -+ char *buf, s; -+ int len; - FILE *popen(), *fp; - char cmdline[80]; - if (whome == NULL) whome = getlogin(); - sprintf(cmdline,"%s %s",mailprog,whome); - fp = popen(cmdline,"w"); -- va_start( args ); -- fmt = va_arg( args, char * ); -- fprintf( fp, "MNM Warning: " ); -- vfprintf( fp, fmt, args ); -- va_end( args ); -+ -+ if (!fmt) -+ return; -+ -+ va_start(ap, fmt); -+ if (!(len = vfsalloc(fmt, ap))) -+ return; -+ va_end(ap); -+ -+ if (!(buf = malloc(len))) -+ return; -+ -+ va_start(ap, fmt); -+ vsprintf(buf, fmt, ap); -+ va_end(ap); -+ -+ fprintf(fp, "MNM Warning: %s", buf); -+ free(buf); - pclose(fp); - } diff --git a/net/imm/pkg-descr b/net/imm/pkg-descr deleted file mode 100644 index 339f05932750..000000000000 --- a/net/imm/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -IMM has been designed to efficiently replicate files/file directories -using a reliable dissemination protocol framework and provide archiving -and post processing features. The default mode of operation is for imm -to receive and display compressed imagery files (e.g., jpg,gif) using -xv or xloadimage as a post processor. - -This release includes an sdr plug-in, named sdr2.plugin.S53.image.imm, -which must be installed to participate in MBone alpha testing of imm sessions. -Usually in a directory called ~home/.sdr/plugins to be found by sdr. -See the sdr help pages for information on installing plugins. diff --git a/net/imm/pkg-plist b/net/imm/pkg-plist deleted file mode 100644 index 726b2b167e2a..000000000000 --- a/net/imm/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -bin/imm -bin/immserv -bin/lscomp -%%DATADIR%%/sdr2.plugin.S53.image.imm -@dirrm %%DATADIR%% diff --git a/net/mcl/Makefile b/net/mcl/Makefile deleted file mode 100644 index d087695902d6..000000000000 --- a/net/mcl/Makefile +++ /dev/null @@ -1,83 +0,0 @@ -# New ports collection makefile for: mcl -# Date created: 29 October 2003 -# Whom: past@noc.ntua.gr -# -# $FreeBSD$ -# - -PORTNAME= mcl -PORTVERSION= 2.99.1 -PORTREVISION= 1 -CATEGORIES= mbone net -MASTER_SITES= http://www.inrialpes.fr/planete/people/roca/mcl/bin/ -DISTNAME= mcl_v2.99.1 -EXTRACT_SUFX= .tgz - -MAINTAINER= ports@FreeBSD.org -COMMENT= Implementation of the ALC and NORM Reliable Multicast Protocols - -BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \ - gdome-config:${PORTSDIR}/textproc/gdome2 \ - glib-gettextize:${PORTSDIR}/devel/glib20 - -USE_LDCONFIG= yes -USE_GMAKE= yes -MAN1= fcast.1 fcastn.1 mclrecv2.1 mclsend2.1 -MAN2= mcl_abort.2 mcl_close.2 mcl_ctl.2 mcl_open.2 mcl_recv.2 \ - mcl_send.2 mcl_wait_event.2 - -pre-patch: - @cd ${WRKSRC} && \ - ${MKDIR} bin/freebsd - -post-patch: - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/src/alc/Makefile - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/check/alc/Makefile - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/fcast/Makefile - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/flute/Makefile - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/mclftp/Makefile - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/robcast/Makefile - -pre-install: - @${REINPLACE_CMD} -Ee 's#../alc/#alc/#g' \ - ${WRKSRC}/src/common/mcl_lib_api.h - @${REINPLACE_CMD} -Ee 's#../norm/#norm/#g' \ - ${WRKSRC}/src/common/mcl_lib_api.h - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/fcast ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/flute ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/robcast_client ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/robcast_server ${PREFIX}/bin - @${INSTALL_DATA} ${WRKSRC}/bin/freebsd/libmclalc.a ${PREFIX}/lib - @${INSTALL_DATA} ${WRKSRC}/src/common/mcl_lib_api.h ${PREFIX}/include - @${INSTALL_DATA} -d ${PREFIX}/include/alc - @${INSTALL_DATA} ${WRKSRC}/src/alc/mcl_lib_api_alc.h \ - ${PREFIX}/include/alc - @${INSTALL_MAN} ${WRKSRC}/man/fcast.man.1 ${PREFIX}/man/man1/fcast.1 - @${INSTALL_MAN} ${WRKSRC}/man/fcastn.man.1 ${PREFIX}/man/man1/fcastn.1 - @${INSTALL_MAN} ${WRKSRC}/man/mclrecv2.man.1 \ - ${PREFIX}/man/man1/mclrecv2.1 - @${INSTALL_MAN} ${WRKSRC}/man/mclsend2.man.1 \ - ${PREFIX}/man/man1/mclsend2.1 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_abort.man.2 \ - ${PREFIX}/man/man2/mcl_abort.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_close.man.2 \ - ${PREFIX}/man/man2/mcl_close.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_ctl.man.2 ${PREFIX}/man/man2/mcl_ctl.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_open.man.2 \ - ${PREFIX}/man/man2/mcl_open.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_recv.man.2 \ - ${PREFIX}/man/man2/mcl_recv.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_send.man.2 \ - ${PREFIX}/man/man2/mcl_send.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_wait_event.man.2 \ - ${PREFIX}/man/man2/mcl_wait_event.2 - -.include <bsd.port.mk> diff --git a/net/mcl/distinfo b/net/mcl/distinfo deleted file mode 100644 index c2499bb901b5..000000000000 --- a/net/mcl/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (mcl_v2.99.1.tgz) = d4a5c0c384d45dfa6c2a3dcbdcb3a81e -SHA256 (mcl_v2.99.1.tgz) = 141966bf922c2995a29eeb73a536ee3f83438835b0f29f99afb626048decdc35 -SIZE (mcl_v2.99.1.tgz) = 368784 diff --git a/net/mcl/files/patch-Makefile b/net/mcl/files/patch-Makefile deleted file mode 100644 index 8c38fb03e633..000000000000 --- a/net/mcl/files/patch-Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.orig Sun Dec 7 18:35:07 2003 -+++ Makefile Sun Dec 7 18:35:20 2003 -@@ -5,8 +5,8 @@ - # We need the GNU make tool, on some systems it is called - # gmake, on others make is an alias to gmake. Choose one... - # --MAKE = make --#MAKE = gmake -+#MAKE = make -+MAKE = gmake - - - # A phony target is one that is not really the name of a file. diff --git a/net/mcl/files/patch-Makefile.common b/net/mcl/files/patch-Makefile.common deleted file mode 100644 index 4cb001289885..000000000000 --- a/net/mcl/files/patch-Makefile.common +++ /dev/null @@ -1,33 +0,0 @@ ---- Makefile.common.orig Sun Dec 7 18:36:25 2003 -+++ Makefile.common Sun Dec 7 18:38:10 2003 -@@ -24,11 +24,15 @@ - ifeq (${SYSTEM},SunOS) - OS = solaris - endif -+ifeq (${SYSTEM},FreeBSD) -+ OS = freebsd -+endif - # - # and the old way (e.g. if the above lines do not work!) - # - #OS = linux - #OS = solaris -+#OS = freebsd - - - # Do you want/need extended memory debugging? -@@ -59,6 +63,14 @@ - # - CC = /opt/SUNWspro/bin/CC - LD = /opt/SUNWspro/bin/CC -+endif -+ifeq (${OS},freebsd) -+ OSFLAGS = -DFREEBSD -I${LOCALBASE}/g++ -I${LOCALBASE}/c++/3.3 -+ # Which compiler? -+ # NB: use -Wall for compilation warnings with gcc -+ # -+ CC = g++ -Wall -+ LD = g++ -Wall - endif - - diff --git a/net/mcl/files/patch-alc-Makefile b/net/mcl/files/patch-alc-Makefile deleted file mode 100644 index b38cb525c35f..000000000000 --- a/net/mcl/files/patch-alc-Makefile +++ /dev/null @@ -1,16 +0,0 @@ ---- src/alc/Makefile.orig Tue Jul 22 19:42:18 2003 -+++ src/alc/Makefile Wed Oct 15 17:21:25 2003 -@@ -36,6 +36,13 @@ - LIBRARIES = -lc -lm -lsocket -lnsl -L/usr/ucblib -lucb -lpthread - endif - -+ifeq (${OS},freebsd) -+ # FreeBSD version -+ BINDIR = ../../bin/freebsd -+ LDPC_BINDIR = ../../../ldpc/bin/freebsd -+ LIBRARIES = -lm -pthread -+endif -+ - - ###### Other Variables ###### - diff --git a/net/mcl/files/patch-check-alc-Makefile b/net/mcl/files/patch-check-alc-Makefile deleted file mode 100644 index 65fa32515984..000000000000 --- a/net/mcl/files/patch-check-alc-Makefile +++ /dev/null @@ -1,21 +0,0 @@ ---- check/alc/Makefile.orig Wed Oct 15 18:02:27 2003 -+++ check/alc/Makefile Wed Oct 15 17:24:04 2003 -@@ -35,6 +35,18 @@ - LIBRARIES = -lc -lm -lsocket -lnsl -L/usr/ucblib -lucb -lposix4 -mt -lpthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - endif - -+ifeq (${OS},freebsd) -+ # Linux version -+ # -+ BINDIR = ../../bin/freebsd -+ LDPC_BINDIR = ../../../ldpc/bin/freebsd -+ # Edit the following two lines as appropriate, according to the FEC -+ # codec in use: if LDPC is used, then add the libbdpc.a library. -+ # -+ LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a -+ #LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+endif -+ - - ###### Other variables ###### - diff --git a/net/mcl/files/patch-display.c b/net/mcl/files/patch-display.c deleted file mode 100644 index 44ff013dd66f..000000000000 --- a/net/mcl/files/patch-display.c +++ /dev/null @@ -1,14 +0,0 @@ ---- flute/display.c.orig Wed Jan 7 12:08:23 2004 -+++ flute/display.c Wed Jan 7 12:07:24 2004 -@@ -65,7 +65,11 @@ - signal (SIGTERM, sig_catcher); - sigaction (SIGTERM, (struct sigaction *) 0, &sa); - sa.sa_flags |= SA_RESTART; -+#if defined(FREEBSD) -+ sa.sa_flags &= ~SA_NOCLDSTOP; -+#else - sa.sa_flags &= ~SA_INTERRUPT; -+#endif - sigaction (SIGTERM, &sa, (struct sigaction *) 0); - sigaction (SIGINT, &sa, (struct sigaction *) 0); - tcsetattr(0, TCSANOW, &new_settings); diff --git a/net/mcl/files/patch-fcast-Makefile b/net/mcl/files/patch-fcast-Makefile deleted file mode 100644 index dce7b64a9811..000000000000 --- a/net/mcl/files/patch-fcast-Makefile +++ /dev/null @@ -1,28 +0,0 @@ ---- fcast/Makefile.orig Tue Jul 22 19:43:25 2003 -+++ fcast/Makefile Wed Oct 15 17:20:46 2003 -@@ -39,6 +39,14 @@ - - endif - -+ifeq (${OS},freebsd) -+ # FreeBSD version -+ # -+ BINDIR = ../bin/freebsd -+ LDPC_BINDIR = ../../ldpc/bin/freebsd -+ LIBRARIES = -lm -pthread -+endif -+ - - ###### Other variables ###### - -@@ -76,8 +84,8 @@ - # codec in use: if LDPC is used, then add the libbdpc.a library. - # If only RSE is used and if you don't have the LDPC archive, then - # remove the libbdpc.a library. --#alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a --alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a -+#alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - alc: TARGET_FCAST = ${BINDIR}/fcast - #alc: all - diff --git a/net/mcl/files/patch-fcast.h b/net/mcl/files/patch-fcast.h deleted file mode 100644 index bd50c0f41eb7..000000000000 --- a/net/mcl/files/patch-fcast.h +++ /dev/null @@ -1,20 +0,0 @@ ---- fcast/fcast.h.orig Tue Jul 22 19:37:39 2003 -+++ fcast/fcast.h Wed Oct 15 16:59:13 2003 -@@ -62,12 +62,16 @@ - #include "frecv.h" - - -+ - #if defined(LINUX) /* On Linux systems, signal handlers must be of __sighandler_t type */ - #define sighandler_t __sighandler_t - - #elif defined(SOLARIS) || defined(IRIX) || defined(WIN32) -- - #define sighandler_t void (*)(int) -+ -+#elif defined(FREEBSD) -+#define sighandler_t sig_t -+ - #endif - - diff --git a/net/mcl/files/patch-flute-Makefile b/net/mcl/files/patch-flute-Makefile deleted file mode 100644 index 159fef2f7960..000000000000 --- a/net/mcl/files/patch-flute-Makefile +++ /dev/null @@ -1,52 +0,0 @@ ---- flute/Makefile.orig Wed Nov 26 17:18:21 2003 -+++ flute/Makefile Wed Jan 7 12:38:28 2004 -@@ -36,6 +36,18 @@ - - endif - -+ifeq (${OS},freebsd) -+ # FreeBSD version: -+ # CC requires: -mt -lpthread for multithreaded applications -+ # NB: mpatrol not installed ! -+ # -+ BINDIR = ../bin/freebsd -+ LDPC_BINDIR = ../../ldpc/bin/freebsd -+ LIBRARIES = -lm -pthread -lglib-2.0 -lgdome -lxml2 -L${LOCALBASE}/lib -+ # added -I/usr/local/include for libgdome header files -+ ADD_INCLUDES = -I${LOCALBASE}/include/ -I${LOCALBASE}/include/glib-2.0/ -I${LOCALBASE}/include/libgdome/ -+endif -+ - - ###### Other variables ###### - -@@ -73,24 +85,24 @@ - # codec in use: if LDPC is used, then add the libbdpc.a library. - # If only RSE is used and if you don't have the LDPC archive, then - # remove the libbdpc.a library. --#alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a --alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a -+#alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - alc: TARGET_FLUTE = ${BINDIR}/flute - #alc: all - - alc_pure: RM_PROTOCOL = ALC - # Edit the following two lines as appropriate, according to the FEC - # codec in use: if LDPC is used, then add the libbdpc.a library. --#alc_pure: MCL_LIBRARY = ${BINDIR}/libmclalc.a --alc_pure: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+alc_pure: MCL_LIBRARY = ${BINDIR}/libmclalc.a -+#alc_pure: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - alc_pure: TARGET_FLUTE = ${BINDIR}/flute - alc_pure: pure - - alc_quantify: RM_PROTOCOL = ALC - # Edit the following two lines as appropriate, according to the FEC - # codec in use: if LDPC is used, then add the libbdpc.a library. --#alc_quantify: MCL_LIBRARY = ${BINDIR}/libmclalc.a --alc_quantify: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+alc_quantify: MCL_LIBRARY = ${BINDIR}/libmclalc.a -+#alc_quantify: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - alc_quantify: TARGET_FLUTE = ${BINDIR}/flute - alc_quantify: quantify - diff --git a/net/mcl/files/patch-flute.h b/net/mcl/files/patch-flute.h deleted file mode 100644 index c38ad033f34c..000000000000 --- a/net/mcl/files/patch-flute.h +++ /dev/null @@ -1,13 +0,0 @@ ---- flute/flute.h.orig Wed Jan 7 11:13:20 2004 -+++ flute/flute.h Wed Jan 7 11:15:28 2004 -@@ -69,6 +69,10 @@ - #elif defined(SOLARIS) || defined(IRIX) || defined(WIN32) - - #define sighandler_t void (*)(int) -+ -+#elif defined(FREEBSD) -+#define sighandler_t sig_t -+ - #endif - - diff --git a/net/mcl/files/patch-mcl_debug.cpp b/net/mcl/files/patch-mcl_debug.cpp deleted file mode 100644 index 982503f326c9..000000000000 --- a/net/mcl/files/patch-mcl_debug.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/common/mcl_debug.cpp.orig Tue Jul 22 19:37:39 2003 -+++ src/common/mcl_debug.cpp Wed Oct 15 17:55:58 2003 -@@ -73,7 +73,7 @@ - PRINT_OUT((mcl_stdout, "\tDUMP %d first bytes...\n\t", i * sizeof(int))) - for (ptr = (int*)buf; i > 0; i--, ptr++) { - /* convert to big endian format to be sure of byte order */ -- PRINT_OUT((mcl_stdout, "%08x ", htonl(*ptr))) -+ PRINT_OUT((mcl_stdout, "%08lx ", htonl(*ptr))) - if (++j == 8) { - j = 0; - PRINT_OUT((mcl_stdout, "\n\t")) diff --git a/net/mcl/files/patch-mcl_includes.h b/net/mcl/files/patch-mcl_includes.h deleted file mode 100644 index d68a50637331..000000000000 --- a/net/mcl/files/patch-mcl_includes.h +++ /dev/null @@ -1,36 +0,0 @@ ---- src/alc/mcl_includes.h.orig Tue Jul 22 19:37:39 2003 -+++ src/alc/mcl_includes.h Tue Oct 14 15:23:54 2003 -@@ -40,11 +40,13 @@ - #include <sys/types.h> - #include <math.h> - -+#ifndef FREEBSD - #if defined(DEBUG) && defined(MPATROL) && !defined(WIN32) - #include <mpatrol.h> - #else - #include <malloc.h> - #endif -+#endif - #include <new> // required by _set_new_handler on linux - - -@@ -58,14 +60,18 @@ - #else /* UNIX Systems */ - - #include <unistd.h> -+ -+#ifndef FREEBSD - #include <values.h> /* for MAXINT */ -+#endif -+ - #include <strings.h> - #include <sys/time.h> - #include <sys/wait.h> - #include <pthread.h> - #include <sys/uio.h> - --#ifdef SOLARIS -+#if defined(SOLARIS) || defined(FREEBSD) - #include <netinet/in_systm.h> - #endif /* SOLARIS */ - diff --git a/net/mcl/files/patch-mcl_lib.cpp b/net/mcl/files/patch-mcl_lib.cpp deleted file mode 100644 index d40dbe58584c..000000000000 --- a/net/mcl/files/patch-mcl_lib.cpp +++ /dev/null @@ -1,27 +0,0 @@ ---- src/alc/mcl_lib.cpp.orig Wed Nov 26 15:38:14 2003 -+++ src/alc/mcl_lib.cpp Tue Dec 16 23:58:46 2003 -@@ -1384,8 +1384,10 @@ - if (id >= MCLCB_MAX_ID || (mclcb = mclcbs[id]) == NULL) { - TRACE((mcl_stdout, " mcl_recvfrom: not an MCL id, switch to standard recvfrom\n")) - return (recvfrom(id, (char*)buf, len, 0, saddr, --#ifdef LINUX -+#if defined(LINUX) - (size_t*) /* linux => uint, solaris => int */ -+#elif defined(FREEBSD) -+ (socklen_t*) - #endif - saddr_len)); - } -@@ -1520,8 +1522,11 @@ - if (id >= MCLCB_MAX_ID || (mclcb = mclcbs[id]) == NULL) { - TRACE((mcl_stdout, " mcl_recvfrom: not an MCL id, switch to standard recvfrom\n")) - return (recvfrom(id, (char*)buf, len, 0, saddr, --#ifdef LINUX -+#if defined(LINUX) - (size_t*) /* linux => uint, solaris => int */ -+#elif defined(FREEBSD) -+ (socklen_t*) -+ - #endif - saddr_len)); - } diff --git a/net/mcl/files/patch-mcl_network.cpp b/net/mcl/files/patch-mcl_network.cpp deleted file mode 100644 index 6e5a8cfaebfe..000000000000 --- a/net/mcl/files/patch-mcl_network.cpp +++ /dev/null @@ -1,48 +0,0 @@ ---- src/alc/mcl_network.cpp.orig Tue Jul 22 19:37:39 2003 -+++ src/alc/mcl_network.cpp Tue Oct 14 15:47:45 2003 -@@ -414,8 +414,10 @@ - pkt->pkt_len = recvfrom(mg->ses_sock, - pkt->get_buf(), pkt->get_buf_len(), - 0, &saddr, --#ifdef LINUX -+#if defined(LINUX) - (size_t*) -+#elif defined(FREEBSD) -+ (socklen_t*) - #endif - &saddr_len); - #ifdef WIN32 -@@ -483,8 +485,10 @@ - pkt->pkt_len = recvfrom(mg->priv_sock, - pkt->get_buf(), pkt->get_buf_len(), - 0, &saddr, --#ifdef LINUX -+#if defined(LINUX) - (size_t*) -+#elif defined(FREEBSD) -+ (socklen_t*) - #endif - &saddr_len); - #ifdef WIN32 -@@ -663,8 +667,10 @@ - err = setsockopt(fd, SOL_SOCKET, buf, (char*)&val, sizeof(val)); - else - err = getsockopt(fd, SOL_SOCKET, buf, (char*)&val, --#ifdef LINUX -- (size_t*) /* linux => uint, solaris => int */ -+#if defined(LINUX) -+ (size_t*) -+#elif defined(FREEBSD) -+ (socklen_t*) - #endif - &len); - if (err < 0) { -@@ -938,7 +944,7 @@ - - if (mcl_is_valid_sock(mg->priv_sock) && - getsockname(mg->priv_sock, (struct sockaddr *)&tmp_addr, --#ifdef LINUX -+#if defined(LINUX) || defined(FREEBSD) - (socklen_t*) - #endif - &tmp_len) < 0) { diff --git a/net/mcl/files/patch-mcl_osdep.h b/net/mcl/files/patch-mcl_osdep.h deleted file mode 100644 index 1effff377a98..000000000000 --- a/net/mcl/files/patch-mcl_osdep.h +++ /dev/null @@ -1,32 +0,0 @@ ---- src/common/mcl_osdep.h.orig Sun Dec 7 18:58:22 2003 -+++ src/common/mcl_osdep.h Sun Dec 7 19:00:39 2003 -@@ -44,7 +44,7 @@ - * bit field order is compiler/OS dependant - * With linux, see the above LINUX_XXX defines... - */ --#if defined(LINUX_I386) || defined(WIN32) -+#if defined(LINUX_I386) || defined(WIN32) || defined (FREEBSD) - #define _BIT_FIELDS_LTOH - #undef _BIT_FIELDS_HTOL - -@@ -58,7 +58,7 @@ - /* - * sighandler - */ --#if defined(LINUX) -+#if defined(LINUX) || defined (FREEBSD) - /* On Linux systems, signal handlers must be of __sighandler_t type */ - #define sighandler_t __sighandler_t - -@@ -77,9 +77,9 @@ - #define u_int16_t ushort_t /* or uint16_t */ - #define u_int32_t uint_t /* or uint32_t */ - --#elif defined (WIN32) -+#elif defined (WIN32) || defined (FREEBSD) - --/* u_xxx absent from WIN32! */ -+/* u_xxx absent from WIN32 and ulong absent from FreeBSD! */ - #define u_int8_t unsigned char /* or uint8_t */ - #define u_int16_t unsigned short /* or uint16_t */ - #define u_int32_t unsigned int /* or uint32_t */ diff --git a/net/mcl/files/patch-mcl_profile.h b/net/mcl/files/patch-mcl_profile.h deleted file mode 100644 index 24408a4ddbfe..000000000000 --- a/net/mcl/files/patch-mcl_profile.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/alc/mcl_profile.h.orig Tue Dec 16 23:47:58 2003 -+++ src/alc/mcl_profile.h Tue Dec 16 23:48:09 2003 -@@ -130,7 +130,7 @@ - /* - * Do you want to use LDPC large block Forward Error Correction (FEC) ? - */ --#define LDPC_FEC -+//#define LDPC_FEC - - #if defined(RSE_FEC) || defined(LDPC_FEC) - #define FEC diff --git a/net/mcl/files/patch-mclftp-Makefile b/net/mcl/files/patch-mclftp-Makefile deleted file mode 100644 index 0ddac0210fa9..000000000000 --- a/net/mcl/files/patch-mclftp-Makefile +++ /dev/null @@ -1,17 +0,0 @@ ---- mclftp/Makefile.orig Wed Dec 17 00:13:34 2003 -+++ mclftp/Makefile Wed Dec 17 00:15:56 2003 -@@ -36,6 +36,14 @@ - LIBRARIES = -lc -lm -lsocket -lnsl /usr/ucblib/libucb.a -lposix4 -lpthread - endif - -+ifeq (${OS},freebsd) -+ # FreeBSD version -+ # MCL library requires -pthread -+ # -+ BINDIR = ../bin/freebsd -+ LIBRARIES = -lm -pthread -+endif -+ - - - ###### Other variables ###### diff --git a/net/mcl/files/patch-robcast-Makefile b/net/mcl/files/patch-robcast-Makefile deleted file mode 100644 index f6f4a21f0e42..000000000000 --- a/net/mcl/files/patch-robcast-Makefile +++ /dev/null @@ -1,19 +0,0 @@ ---- robcast/Makefile.orig Wed Oct 15 18:03:36 2003 -+++ robcast/Makefile Wed Oct 15 17:33:36 2003 -@@ -29,6 +29,16 @@ - LIBRARIES = -lc -lm -lsocket -lnsl -L/usr/ucblib -lucb -lposix4 -lpthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - endif - -+ifeq (${OS},freebsd) -+ # FreeBSD version -+ # MCL library requires -pthread -+ # -+ BINDIR = ../bin/freebsd -+ LDPC_BINDIR = ../../ldpc/bin/freebsd -+ LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a -+ #LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+endif -+ - - ###### Other variables ###### - diff --git a/net/mcl/files/patch-rse_fec.cpp b/net/mcl/files/patch-rse_fec.cpp deleted file mode 100644 index 70ea7a5e9790..000000000000 --- a/net/mcl/files/patch-rse_fec.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/common/rse_fec.cpp.orig 2007-08-03 13:59:09.000000000 +0200 -+++ src/common/rse_fec.cpp 2007-08-03 14:00:41.000000000 +0200 -@@ -679,7 +679,7 @@ - struct fec_parms *p = (struct fec_parms *)p_vp; /* VR */ - #endif /* CPLUSPLUS_COMPATIBLE */ - if (p==NULL || -- p->magic != ( ( (FEC_MAGIC ^ p->k) ^ p->n) ^ (int)(p->enc_matrix)) ) { -+ p->magic != ( ( (FEC_MAGIC ^ p->k) ^ p->n) ^ (intptr_t)(p->enc_matrix)) ) { - PRINT_ERR((mcl_stderr, "bad parameters to fec_free\n")) - return ; - } -@@ -715,7 +715,7 @@ - retval->k = k ; - retval->n = n ; - retval->enc_matrix = NEW_GF_MATRIX(n, k); -- retval->magic = ( ( FEC_MAGIC ^ k) ^ n) ^ (int)(retval->enc_matrix) ; -+ retval->magic = ( ( FEC_MAGIC ^ k) ^ n) ^ (intptr_t)(retval->enc_matrix) ; - tmp_m = NEW_GF_MATRIX(n, k); - /* - * fill the matrix with powers of field elements, starting from 0. diff --git a/net/mcl/files/patch-test_abort.c b/net/mcl/files/patch-test_abort.c deleted file mode 100644 index ad1116943ab0..000000000000 --- a/net/mcl/files/patch-test_abort.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_abort.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_abort.c Wed Oct 15 17:10:42 2003 -@@ -26,6 +26,10 @@ - #include <stdio.h> - #include <stdlib.h> /* for exit */ - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #include <io.h> diff --git a/net/mcl/files/patch-test_demux_label1_rx.c b/net/mcl/files/patch-test_demux_label1_rx.c deleted file mode 100644 index d172c016a3b0..000000000000 --- a/net/mcl/files/patch-test_demux_label1_rx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_demux_label1_rx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_demux_label1_rx.c Wed Oct 15 17:13:17 2003 -@@ -26,6 +26,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_demux_label1_tx.c b/net/mcl/files/patch-test_demux_label1_tx.c deleted file mode 100644 index 57e1efe5f915..000000000000 --- a/net/mcl/files/patch-test_demux_label1_tx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_demux_label1_tx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_demux_label1_tx.c Wed Oct 15 17:12:56 2003 -@@ -25,6 +25,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_dyn_tsi.c b/net/mcl/files/patch-test_dyn_tsi.c deleted file mode 100644 index bf09722b074f..000000000000 --- a/net/mcl/files/patch-test_dyn_tsi.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_dyn_tsi.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_dyn_tsi.c Wed Oct 15 17:13:37 2003 -@@ -30,6 +30,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_multi_sessions1.c b/net/mcl/files/patch-test_multi_sessions1.c deleted file mode 100644 index 0b0af22dd2b1..000000000000 --- a/net/mcl/files/patch-test_multi_sessions1.c +++ /dev/null @@ -1,14 +0,0 @@ ---- check/alc/test_multi_sessions1.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_multi_sessions1.c Wed Oct 15 17:11:53 2003 -@@ -24,6 +24,11 @@ - */ - - #include <stdio.h> -+ -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_multi_sessions2.c b/net/mcl/files/patch-test_multi_sessions2.c deleted file mode 100644 index 0033a72b5a86..000000000000 --- a/net/mcl/files/patch-test_multi_sessions2.c +++ /dev/null @@ -1,14 +0,0 @@ ---- check/alc/test_multi_sessions2.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_multi_sessions2.c Wed Oct 15 17:12:13 2003 -@@ -25,6 +25,11 @@ - */ - - #include <stdio.h> -+ -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #include <io.h> diff --git a/net/mcl/files/patch-test_no_tx.c b/net/mcl/files/patch-test_no_tx.c deleted file mode 100644 index e6f1e0b90d83..000000000000 --- a/net/mcl/files/patch-test_no_tx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_no_tx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_no_tx.c Wed Oct 15 17:10:20 2003 -@@ -25,6 +25,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_rebootable_client.c b/net/mcl/files/patch-test_rebootable_client.c deleted file mode 100644 index 9ee9725b77a9..000000000000 --- a/net/mcl/files/patch-test_rebootable_client.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_rebootable_client.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_rebootable_client.c Wed Oct 15 17:18:38 2003 -@@ -35,6 +35,10 @@ - #include <stdio.h> - #include <string.h> - -+#ifdef FREEBSD -+#include <sys/time.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_seq_of_tx_sessions.c b/net/mcl/files/patch-test_seq_of_tx_sessions.c deleted file mode 100644 index 31d967ca431e..000000000000 --- a/net/mcl/files/patch-test_seq_of_tx_sessions.c +++ /dev/null @@ -1,14 +0,0 @@ ---- check/alc/test_seq_of_tx_sessions.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_seq_of_tx_sessions.c Wed Oct 15 17:11:13 2003 -@@ -25,6 +25,11 @@ - */ - - #include <stdio.h> -+ -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_several_fec_codecs.c b/net/mcl/files/patch-test_several_fec_codecs.c deleted file mode 100644 index 34da7be64644..000000000000 --- a/net/mcl/files/patch-test_several_fec_codecs.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_several_fec_codecs.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_several_fec_codecs.c Wed Oct 15 17:05:40 2003 -@@ -28,6 +28,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_vtm_rx.c b/net/mcl/files/patch-test_vtm_rx.c deleted file mode 100644 index a0cf05b33306..000000000000 --- a/net/mcl/files/patch-test_vtm_rx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_vtm_rx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_vtm_rx.c Wed Oct 15 17:14:28 2003 -@@ -27,6 +27,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_vtm_tx.c b/net/mcl/files/patch-test_vtm_tx.c deleted file mode 100644 index 8d26b0f60d2d..000000000000 --- a/net/mcl/files/patch-test_vtm_tx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_vtm_tx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_vtm_tx.c Wed Oct 15 17:14:02 2003 -@@ -25,6 +25,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_wait_rx_receiver.c b/net/mcl/files/patch-test_wait_rx_receiver.c deleted file mode 100644 index c03c4a4be206..000000000000 --- a/net/mcl/files/patch-test_wait_rx_receiver.c +++ /dev/null @@ -1,12 +0,0 @@ ---- check/alc/test_wait_rx_receiver.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_wait_rx_receiver.c Wed Oct 15 17:09:56 2003 -@@ -27,6 +27,9 @@ - #include <stdio.h> - - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif - - #ifdef WIN32 - #include <winsock2.h> diff --git a/net/mcl/files/patch-test_wait_rx_sender.c b/net/mcl/files/patch-test_wait_rx_sender.c deleted file mode 100644 index 694af55beed3..000000000000 --- a/net/mcl/files/patch-test_wait_rx_sender.c +++ /dev/null @@ -1,12 +0,0 @@ ---- check/alc/test_wait_rx_sender.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_wait_rx_sender.c Wed Oct 15 17:09:33 2003 -@@ -27,6 +27,9 @@ - #include <stdio.h> - - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif - - #ifdef WIN32 - #include <winsock2.h> diff --git a/net/mcl/files/patch-test_wait_tx.c b/net/mcl/files/patch-test_wait_tx.c deleted file mode 100644 index b0b816cc8cd8..000000000000 --- a/net/mcl/files/patch-test_wait_tx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_wait_tx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_wait_tx.c Wed Oct 15 17:09:00 2003 -@@ -25,6 +25,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/pkg-descr b/net/mcl/pkg-descr deleted file mode 100644 index d3de44a68c11..000000000000 --- a/net/mcl/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -This is a port of MCLv3, an open source implementation of the ALC and -NORM Reliable Multicast Protocols. - -The MCLv3 project is an Open-Source GNU/GPL, multi-platform -implementation of the two major reliable multicast protocols being -standardized by the RMT IETF working group: ALC/LCT and NORM. It is -composed of a C/C++ library and several applications built on top of it -and provides an easy-to-use and integrated solution for reliable and -highly scalable multicast delivery of data. - -WWW: http://www.inrialpes.fr/planete/people/roca/mcl/mcl.html diff --git a/net/mcl/pkg-plist b/net/mcl/pkg-plist deleted file mode 100644 index 2e3b802a574e..000000000000 --- a/net/mcl/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -bin/fcast -bin/flute -bin/robcast_client -bin/robcast_server -lib/libmclalc.a -include/mcl_lib_api.h -include/alc/mcl_lib_api_alc.h -@dirrm include/alc diff --git a/net/ns2/Makefile b/net/ns2/Makefile deleted file mode 100644 index 3496a940136e..000000000000 --- a/net/ns2/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# New ports collection makefile for: ns-2 -# Date created: 26 April 1999 -# Whom: obonilla -# -# $FreeBSD$ -# - -PORTNAME= ns -PORTVERSION= 2.33 -CATEGORIES= net -MASTER_SITES= SF/${PORTNAME}nam/${PORTNAME}-2/${PORTVERSION} - -MAINTAINER= lstewart@FreeBSD.org -COMMENT= Discrete event simulator for networking research - -BUILD_DEPENDS= ${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl - -MAN1= ns.1 -MANCOMPRESSED= no - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-tcl-ver=8.4 --with-tk-ver=8.4 --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include -USE_GMAKE= yes -USE_TK= 84 - -post-patch: - @${REINPLACE_CMD} -e 's|/usr/src/local/Tcl-1.0 \\|${LOCALBASE}/include/tclcl \\|g' \ - -e 's|/usr/src/local/Tcl-1.0\"|${LOCALBASE}/lib\"|g' \ - ${WRKSRC}/configure - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/ns ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/ns.1 ${MANPREFIX}/man/man1 - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/tcl/ex/*.tcl ${EXAMPLESDIR} - -.include <bsd.port.mk> diff --git a/net/ns2/distinfo b/net/ns2/distinfo deleted file mode 100644 index d09fdef5e002..000000000000 --- a/net/ns2/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (ns-2.33.tar.gz) = f12472a4e388572bf0c71354b4bc1898 -SHA256 (ns-2.33.tar.gz) = 2cdd803bc5afec9a60d514e619a1a9c3eaea4ae35e882891519f088ae7d2472b -SIZE (ns-2.33.tar.gz) = 41649114 diff --git a/net/ns2/pkg-descr b/net/ns2/pkg-descr deleted file mode 100644 index 8fa42f66b1cd..000000000000 --- a/net/ns2/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -NS is a discrete event simulator targeted at networking research. -NS provides substantial support for simulation of TCP, routing, -and multicast protocols. - -WWW: http://www.isi.edu/nsnam/ns/ diff --git a/net/ns2/pkg-plist b/net/ns2/pkg-plist deleted file mode 100644 index 0e884a07c452..000000000000 --- a/net/ns2/pkg-plist +++ /dev/null @@ -1,122 +0,0 @@ -bin/ns -%%EXAMPLESDIR%%/agent-gen-script.tcl -%%EXAMPLESDIR%%/agent-gen.tcl -%%EXAMPLESDIR%%/callback_demo.tcl -%%EXAMPLESDIR%%/diffusion-prob-run.tcl -%%EXAMPLESDIR%%/diffusion-rate-run.tcl -%%EXAMPLESDIR%%/dumbbell.tcl -%%EXAMPLESDIR%%/example.tcl -%%EXAMPLESDIR%%/flooding-run.tcl -%%EXAMPLESDIR%%/flooding.tcl -%%EXAMPLESDIR%%/fq-cbr.tcl -%%EXAMPLESDIR%%/fq.tcl -%%EXAMPLESDIR%%/grid2.tcl -%%EXAMPLESDIR%%/gridkeeper.tcl -%%EXAMPLESDIR%%/hier-rtg-10.tcl -%%EXAMPLESDIR%%/hier-rtg-100.tcl -%%EXAMPLESDIR%%/hts100-0.tcl -%%EXAMPLESDIR%%/lantest.tcl -%%EXAMPLESDIR%%/large-scale-web-traffic-old.tcl -%%EXAMPLESDIR%%/large-scale-web-traffic.tcl -%%EXAMPLESDIR%%/large-sim.tcl -%%EXAMPLESDIR%%/mac-test.tcl -%%EXAMPLESDIR%%/many_tcp.tcl -%%EXAMPLESDIR%%/manytcp_trmodel.tcl -%%EXAMPLESDIR%%/mcast.tcl -%%EXAMPLESDIR%%/miptest.tcl -%%EXAMPLESDIR%%/nam-example-em.tcl -%%EXAMPLESDIR%%/nam-example.tcl -%%EXAMPLESDIR%%/nam-large-flowid.tcl -%%EXAMPLESDIR%%/nam-separate-trace.tcl -%%EXAMPLESDIR%%/nam-simplexlink.tcl -%%EXAMPLESDIR%%/omni-run.tcl -%%EXAMPLESDIR%%/pkts.tcl -%%EXAMPLESDIR%%/ranvar.tcl -%%EXAMPLESDIR%%/rbp_demo.tcl -%%EXAMPLESDIR%%/rc.tcl -%%EXAMPLESDIR%%/redlight.tcl -%%EXAMPLESDIR%%/rng-test.tcl -%%EXAMPLESDIR%%/rng-test2.tcl -%%EXAMPLESDIR%%/route-gen.tcl -%%EXAMPLESDIR%%/sat-aloha.tcl -%%EXAMPLESDIR%%/sat-iridium-links.tcl -%%EXAMPLESDIR%%/sat-iridium-nodes.tcl -%%EXAMPLESDIR%%/sat-iridium.tcl -%%EXAMPLESDIR%%/sat-mixed.tcl -%%EXAMPLESDIR%%/sat-repeater.tcl -%%EXAMPLESDIR%%/sat-teledesic-links.tcl -%%EXAMPLESDIR%%/sat-teledesic-nodes.tcl -%%EXAMPLESDIR%%/sat-teledesic.tcl -%%EXAMPLESDIR%%/sat-wired.tcl -%%EXAMPLESDIR%%/shuttle-mcast.tcl -%%EXAMPLESDIR%%/shuttle.tcl -%%EXAMPLESDIR%%/simple-dyn.tcl -%%EXAMPLESDIR%%/simple-eqp.tcl -%%EXAMPLESDIR%%/simple-eqp1.tcl -%%EXAMPLESDIR%%/simple-fsm-tcp.tcl -%%EXAMPLESDIR%%/simple-heap.tcl -%%EXAMPLESDIR%%/simple-plm.tcl -%%EXAMPLESDIR%%/simple-rtg.tcl -%%EXAMPLESDIR%%/simple-rtp.tcl -%%EXAMPLESDIR%%/simple-tcp.tcl -%%EXAMPLESDIR%%/simple-webcache-comp.tcl -%%EXAMPLESDIR%%/simple-webcache-trace.tcl -%%EXAMPLESDIR%%/simple-webcache.tcl -%%EXAMPLESDIR%%/simple-wireless.tcl -%%EXAMPLESDIR%%/simple.tcl -%%EXAMPLESDIR%%/src_test.tcl -%%EXAMPLESDIR%%/srm-adapt-rep-session.tcl -%%EXAMPLESDIR%%/srm-adapt-rep.tcl -%%EXAMPLESDIR%%/srm-adapt-req-session.tcl -%%EXAMPLESDIR%%/srm-adapt-req.tcl -%%EXAMPLESDIR%%/srm-chain-session.tcl -%%EXAMPLESDIR%%/srm-chain.tcl -%%EXAMPLESDIR%%/srm-demo.tcl -%%EXAMPLESDIR%%/srm-session.tcl -%%EXAMPLESDIR%%/srm-star-session.tcl -%%EXAMPLESDIR%%/srm-star.tcl -%%EXAMPLESDIR%%/srm.tcl -%%EXAMPLESDIR%%/ss.tcl -%%EXAMPLESDIR%%/swp.tcl -%%EXAMPLESDIR%%/t1000.tcl -%%EXAMPLESDIR%%/tcp-et.tcl -%%EXAMPLESDIR%%/tcp-int.tcl -%%EXAMPLESDIR%%/tcpapp.tcl -%%EXAMPLESDIR%%/tcpecn.tcl -%%EXAMPLESDIR%%/tcpsrm.tcl -%%EXAMPLESDIR%%/test-drr.tcl -%%EXAMPLESDIR%%/test-emulator.tcl -%%EXAMPLESDIR%%/test-rcvr.tcl -%%EXAMPLESDIR%%/test-rlm.tcl -%%EXAMPLESDIR%%/test-suite-intserv.tcl -%%EXAMPLESDIR%%/test-suite.tcl -%%EXAMPLESDIR%%/test-tbf.tcl -%%EXAMPLESDIR%%/tg.tcl -%%EXAMPLESDIR%%/topo-gen-script.tcl -%%EXAMPLESDIR%%/topo-gen.tcl -%%EXAMPLESDIR%%/topo-view.tcl -%%EXAMPLESDIR%%/trace-driven.tcl -%%EXAMPLESDIR%%/udpdata.tcl -%%EXAMPLESDIR%%/varybell.tcl -%%EXAMPLESDIR%%/virtual-classifier.tcl -%%EXAMPLESDIR%%/vlantest-flat.tcl -%%EXAMPLESDIR%%/vlantest-hier.tcl -%%EXAMPLESDIR%%/vlantest-mcst.tcl -%%EXAMPLESDIR%%/web-traffic-embobj.tcl -%%EXAMPLESDIR%%/web-traffic.tcl -%%EXAMPLESDIR%%/wired-cum-wireless-sim.tcl -%%EXAMPLESDIR%%/wireless-demo-csci694.tcl -%%EXAMPLESDIR%%/wireless-dsdv-newnode.tcl -%%EXAMPLESDIR%%/wireless-flooding.tcl -%%EXAMPLESDIR%%/wireless-landmark.tcl -%%EXAMPLESDIR%%/wireless-mip-test.tcl -%%EXAMPLESDIR%%/wireless-mitf.tcl -%%EXAMPLESDIR%%/wireless-newnode-energy.tcl -%%EXAMPLESDIR%%/wireless-pkt-demo.tcl -%%EXAMPLESDIR%%/wireless-shadowing-test.tcl -%%EXAMPLESDIR%%/wireless-shadowing-vis-test.tcl -%%EXAMPLESDIR%%/wireless-simple-mac.tcl -%%EXAMPLESDIR%%/wireless-test.tcl -%%EXAMPLESDIR%%/wireless.tcl -%%EXAMPLESDIR%%/worm.tcl -@dirrm %%EXAMPLESDIR%% diff --git a/net/openistgt/Makefile b/net/openistgt/Makefile deleted file mode 100644 index 5c8f3f911fbb..000000000000 --- a/net/openistgt/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# New ports collection makefile for: istgt -# Date created: 2009-02-23 -# Whom: Daisuke Aoyama <aoyama@peach.ne.jp> -# -# $FreeBSD$ -# - -PORTNAME= istgt -PORTVERSION= 20100707 -CATEGORIES= net -MASTER_SITES= http://www.peach.ne.jp/archives/istgt/ - -MAINTAINER= aoyama@peach.ne.jp -COMMENT= An iSCSI target for FreeBSD 7.x - -SUB_FILES= pkg-message -PKGMESSAGE= ${WRKDIR}/pkg-message - -GNU_CONFIGURE= yes - -MAN1= istgt.1 -MANCOMPRESSED= yes - -PORTDOCS= README ChangeLog.jp QUICKSTART QUICKSTART.jp - -post-extract: - @${MV} ${WRKSRC}/doc/Makefile.in ${WRKSRC}/doc/Makefile.tmp - @${SED} -e '/\/doc\/istgt/d' < ${WRKSRC}/doc/Makefile.tmp \ - > ${WRKSRC}/doc/Makefile.in - -post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/ChangeLog.jp ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/doc/QUICKSTART ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/doc/QUICKSTART.jp ${DOCSDIR} -.endif - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.mk> diff --git a/net/openistgt/distinfo b/net/openistgt/distinfo deleted file mode 100644 index 0f4f9d983d46..000000000000 --- a/net/openistgt/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (istgt-20100707.tar.gz) = 2774a6487b65a182648503eb76c2c4a3 -SHA256 (istgt-20100707.tar.gz) = 98b910da623a127f575e35f45dfc7f8f5ec3334fc260b28cbd31b83ec32ca868 -SIZE (istgt-20100707.tar.gz) = 221845 diff --git a/net/openistgt/files/pkg-message.in b/net/openistgt/files/pkg-message.in deleted file mode 100644 index 8466449434f3..000000000000 --- a/net/openistgt/files/pkg-message.in +++ /dev/null @@ -1,8 +0,0 @@ -************************************************************************* - -To run istgt at startup, add istgt_enable="YES" to /etc/rc.conf. -Create configuration files manually. -Sample configuration files can be found in %%PREFIX%%/etc/istgt. -QUICKSTART in %%DOCSDIR%% shows you how to configure. - -************************************************************************* diff --git a/net/openistgt/pkg-descr b/net/openistgt/pkg-descr deleted file mode 100644 index 2dd62b807687..000000000000 --- a/net/openistgt/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -This is an iSCSI target, it serves iSCSI protocol and provides -SCSI devices to the initiator (client). - -WWW: http://shell.peach.ne.jp/aoyama/ diff --git a/net/openistgt/pkg-plist b/net/openistgt/pkg-plist deleted file mode 100644 index 3123f2b1d70e..000000000000 --- a/net/openistgt/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -@comment $FreeBSD$ -bin/istgt -bin/istgtcontrol -etc/rc.d/istgt -etc/istgt/istgt.conf.sample -etc/istgt/istgt.large.conf.sample -etc/istgt/auth.conf.sample -etc/istgt/istgtcontrol.conf.sample -@dirrm etc/istgt diff --git a/net/py-zope.proxy/Makefile b/net/py-zope.proxy/Makefile deleted file mode 100644 index 58462e2ca611..000000000000 --- a/net/py-zope.proxy/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# New ports collection makefile for: py-zopeproxy -# Date created: 22 Nov, 2008 -# Whom: Wen Heping <wenheping@gmail.com> -# -# $FreeBSD$ -# - -PORTNAME= zopeproxy -PORTVERSION= 3.6.1 -CATEGORIES= net python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= zope.proxy-${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Generic Transparent Proxies - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zopeInterface>=3.3.0:${PORTSDIR}/devel/py-zopeInterface -RUN_DEPENDS= ${BUILD_DEPENDS} - -USE_ZIP= yes -USE_PYTHON= 2.4+ -USE_PYDISTUTILS= easy_install -PYEASYINSTALL_ARCHDEP= yes -PYDISTUTILS_PKGNAME= zope.proxy - -.include <bsd.port.mk> diff --git a/net/py-zope.proxy/distinfo b/net/py-zope.proxy/distinfo deleted file mode 100644 index 6ecb52f52026..000000000000 --- a/net/py-zope.proxy/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (zope.proxy-3.6.1.zip) = a400b0a26624b17fa889dbcaa989d440 -SHA256 (zope.proxy-3.6.1.zip) = 3d1c8ccd2154e96bda5ef305997fcb2a90f7b79b43f70b85ee3a3287ac708e11 -SIZE (zope.proxy-3.6.1.zip) = 26674 diff --git a/net/py-zope.proxy/pkg-descr b/net/py-zope.proxy/pkg-descr deleted file mode 100644 index 860842a5414f..000000000000 --- a/net/py-zope.proxy/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Proxies are special objects which serve as mostly-transparent wrappers -around another object, intervening in the apparent behavior of the -wrapped object only when necessary to apply the policy (e.g., access -checking, location brokering, etc.) for which the proxy is responsible. - -WWW: http://pypi.python.org/pypi/zope.proxy diff --git a/net/py-zope.proxy/pkg-plist b/net/py-zope.proxy/pkg-plist deleted file mode 100644 index 8a099383a996..000000000000 --- a/net/py-zope.proxy/pkg-plist +++ /dev/null @@ -1,41 +0,0 @@ -@comment $FreeBSD$ -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.py -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyc -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/decorator.py -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/interfaces.py -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/__init__.py -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/_zope_proxy_proxy.c -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/proxy.h -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/_zope_proxy_proxy.so -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/decorator.pyc -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/interfaces.pyc -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/__init__.pyc -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/_zope_proxy_proxy.py -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/_zope_proxy_proxy.pyc -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/tests/__init__.py -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/tests/test_decorator.py -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/tests/test_proxy.py -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/tests/__init__.pyc -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/tests/test_decorator.pyc -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/tests/test_proxy.pyc -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/tests/__init__.pyo -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/tests/test_decorator.pyo -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/tests/test_proxy.pyo -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/decorator.pyo -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/interfaces.pyo -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/__init__.pyo -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/_zope_proxy_proxy.pyo -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/__init__.pyo -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/namespace_packages.txt -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt -@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy/tests -@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope/proxy -@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/zope -@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO -@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%% diff --git a/net/rqm/Makefile b/net/rqm/Makefile deleted file mode 100644 index bdf424e8ee5d..000000000000 --- a/net/rqm/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# New ports collection makefile for: rqm -# Date created: 30 January 2000 -# Whom: fenner -# -# $FreeBSD$ -# - -PORTNAME= rqm -PORTVERSION= 1.0.0 -PORTREVISION= 1 -CATEGORIES= mbone tk -MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rqm/1.0.0/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= A graphical RTP quality monitor - -LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 -BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase - -WRKSRC= ${WRKDIR}/rqm/ - -HAS_CONFIGURE= yes -CONFIGURE_ENV= PREFIX=${PREFIX} X11BASE=${LOCALBASE} - -ALL_TARGET= rqm -PLIST_FILES= bin/rqm -PORTDOCS= README - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/rqm ${PREFIX}/bin -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ -.endif - -.include <bsd.port.mk> diff --git a/net/rqm/distinfo b/net/rqm/distinfo deleted file mode 100644 index 386a40bb1a63..000000000000 --- a/net/rqm/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (rqm-1.0.0.tar.gz) = 406a9bfe4a3e9ad9f1a981701072f54a -SHA256 (rqm-1.0.0.tar.gz) = 8e9a2a0a2ed2abe7feb24f6e7fd47a195cb0e91ee8e0daea736c692f12a01f41 -SIZE (rqm-1.0.0.tar.gz) = 3853534 diff --git a/net/rqm/files/patch-aa b/net/rqm/files/patch-aa deleted file mode 100644 index 31697563d121..000000000000 --- a/net/rqm/files/patch-aa +++ /dev/null @@ -1,35 +0,0 @@ ---- configure.orig Sun Oct 3 08:47:46 1999 -+++ configure Sun Jan 30 16:05:14 2000 -@@ -53,9 +53,9 @@ - - echo "Configuring rqm v$VERSION for $OSTYPE" - --GCCWFLAGS="-W -Wall -Wbad-function-cast -Wmissing-prototypes -Wno-implicit-int -Werror" --TCL_LIBS="../tk-8.0/unix/libtk8.0.a ../tcl-8.0/unix/libtcl8.0.a" --TCL_INCL="-I../tk-8.0/generic -I../tcl-8.0/generic" -+GCCWFLAGS="-W -Wall -Wbad-function-cast -Wmissing-prototypes -Wno-implicit-int" -+TCL_LIBS="-L${PREFIX}/lib -ltk84 -ltcl84" -+TCL_INCL="-I${PREFIX}/include/tk8.4/generic -I${PREFIX}/include/tcl8.4/generic" - DEFS="" - - AR="ar" -@@ -103,7 +103,7 @@ - ;; - FreeBSD ) CC="gcc" - WFLAGS=$GCCWFLAGS -- INCLUDE="-I/usr/local/include" -+ INCLUDE="-I${LOCALBASE}/include" - LDLIBS="-lm" - DEBUG="-g" - CHAR="-fsigned-char" -@@ -172,8 +172,8 @@ - s@__AR__@$AR@ - s@__RANLIB__@$RANLIB@ - s@__WFLAGS__@$WFLAGS@ --s@__INCLUDE__@$TCL_INCL $INCLUDE -I../common@g --s@__LDLIBS__@$TCL_LIBS -L../common -lcommon $LDLIBS@g -+s@__INCLUDE__@$TCL_INCL $INCLUDE -I${PREFIX}/include/uclmmbase@g -+s@__LDLIBS__@$TCL_LIBS -L${PREFIX}/lib -luclmmbase $LDLIBS@g - s@__CHAR__@$CHAR@ - s@__DEBUG__@$DEBUG2@ - s@__OPTIMIZE__@$OPTIMIZE2@ diff --git a/net/rqm/files/patch-ab b/net/rqm/files/patch-ab deleted file mode 100644 index c6f546039ba6..000000000000 --- a/net/rqm/files/patch-ab +++ /dev/null @@ -1,38 +0,0 @@ ---- main.c.orig Wed Mar 8 08:32:07 2000 -+++ main.c Wed Mar 8 08:32:28 2000 -@@ -67,7 +67,7 @@ - } - } - --static void rtp_callback(struct rtp *s, rtp_event *e) -+static void rqm_rtp_callback(struct rtp *s, rtp_event *e) - { - rtp_packet *p = (rtp_packet *) e->data; - rtcp_sr *sr = (rtcp_sr *) e->data; -@@ -177,7 +177,7 @@ - char *addr; - char *port; - char cmd[100]; -- u_int32 curr_rtp_time; -+ u_int32_t curr_rtp_time; - #ifdef WIN32 - WSADATA WSAdata; - if (WSAStartup(WS_VERSION_TWO, &WSAdata) != 0 && WSAStartup(WS_VERSION_ONE, &WSAdata) != 0) { -@@ -199,7 +199,7 @@ - addr = (char *) strtok(argv[1], "/"); - port = (char *) strtok(NULL, "\0"); - -- rtp_session = rtp_init(addr, atoi(port), atoi(port), 15, 64000, rtp_callback, NULL); -+ rtp_session = rtp_init(addr, atoi(port), atoi(port), 15, 64000, rqm_rtp_callback, NULL); - - /* Initialise the user interface... */ - if (tcl_init(argc, argv) == FALSE) { -@@ -215,7 +215,7 @@ - rtp_set_sdes(rtp_session, rtp_my_ssrc(rtp_session), RTCP_SDES_TOOL, VERSION, strlen(VERSION)); - - gettimeofday(&prev_t, NULL); -- curr_rtp_time = (u_int32) lrand48(); -+ curr_rtp_time = (u_int32_t) lrand48(); - while (Tk_GetNumMainWindows() > 0) { - gettimeofday(&curr_t, NULL); - curr_rtp_time += (int) (tv_diff(curr_t, prev_t) * 8000); diff --git a/net/rqm/files/patch-ac b/net/rqm/files/patch-ac deleted file mode 100644 index 00ed9055e3ea..000000000000 --- a/net/rqm/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Sun Feb 1 17:22:05 2004 -+++ Makefile.in Sun Feb 1 17:22:12 2004 -@@ -6,7 +6,7 @@ - OBJS = main.o ui.o - BIN = rqm - --$(BIN): $(OBJS) ../common/libcommon.a -+$(BIN): $(OBJS) - $(CC) $(CFLAGS) $(OBJS) __LDLIBS__ __PROFILE__ __OPTIMIZE__ __CHECK_LIB__ -o $(BIN) - - .c.o: diff --git a/net/rqm/pkg-descr b/net/rqm/pkg-descr deleted file mode 100644 index 0f66e31ecfde..000000000000 --- a/net/rqm/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -The Real-time Transport Protocol, RTP [1], provides quality of service -feedback with reception reports sent alongside the media stream. If the -media is sent via IP multicast it is possible for a third party to snoop -on these reception reports, displaying reception quality for all members -of a group. The RQM application performs such snooping. - -WWW: http://www-mice.cs.ucl.ac.uk/multimedia/software/rqm/ diff --git a/net/rtptools/Makefile b/net/rtptools/Makefile deleted file mode 100644 index ea02adc0d525..000000000000 --- a/net/rtptools/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# New ports collection makefile for: rtptools -# Date created: 5 January 1998 -# Whom: fenner -# -# $FreeBSD$ -# - -PORTNAME= rtptools -PORTVERSION= 1.18 -CATEGORIES= mbone -MASTER_SITES= http://www.cs.columbia.edu/IRT/software/rtptools/download/ - -MAINTAINER= tut@nhamon.com.ua -COMMENT= A set of tools to record, playback and monitor RTPv2 data streams - -GNU_CONFIGURE= yes - -PLIST_FILES= bin/rtpdump bin/rtpplay bin/rtpsend bin/rtptrans -DOCFILES= README ChangeLog.html rtptools.html -PORTDOCS= ${DOCSFILES} - -post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for i in ${DOCFILES} - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/ -.endfor -.endif - -.include <bsd.port.mk> diff --git a/net/rtptools/distinfo b/net/rtptools/distinfo deleted file mode 100644 index 1d1d589b507d..000000000000 --- a/net/rtptools/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (rtptools-1.18.tar.gz) = 9a344c5a4fed2c4be0151cc03f043bb3 -SHA256 (rtptools-1.18.tar.gz) = 7fa16f71713ca16c5ce9cf5ccbd6796315f3402bdef9c7f7023ffac32c8e2ab0 -SIZE (rtptools-1.18.tar.gz) = 119272 diff --git a/net/rtptools/files/patch-ab b/net/rtptools/files/patch-ab deleted file mode 100644 index c1d142b4a914..000000000000 --- a/net/rtptools/files/patch-ab +++ /dev/null @@ -1,23 +0,0 @@ ---- rtp.h.orig Thu Mar 9 07:35:26 2000 -+++ rtp.h Sat Apr 21 21:52:49 2001 -@@ -110,13 +110,18 @@ - #define RTCP_VALID_MASK (0xc000 | 0x2000 | 0xfe) - #define RTCP_VALID_VALUE ((RTP_VERSION << 14) | RTCP_SR) - -+#define RTCP_FRACTION(x) (((x) >> 24) & 0xFF) -+#define RTCP_LOST(x) ((((x) & 0xFFFFFF) < 0x800000) ? \ -+ ((x) & 0xFFFFFF) \ -+ : (((x) & 0xFFFFFF) - 0x1000000)) -+ - /* - * Reception report block - */ - typedef struct { - u_int32 ssrc; /* data source being reported */ -- unsigned int fraction:8; /* fraction lost since last SR/RR */ -- int lost:24; /* cumul. no. pkts lost (signed!) */ -+ u_int32 fraclost; /* fraction lost since last SR/RR and */ -+ /* cumul. no. pkts lost (signed!) */ - u_int32 last_seq; /* extended last seq. no. received */ - u_int32 jitter; /* interarrival jitter */ - u_int32 lsr; /* last SR packet from this source */ diff --git a/net/rtptools/files/patch-ac b/net/rtptools/files/patch-ac deleted file mode 100644 index 28056951ca69..000000000000 --- a/net/rtptools/files/patch-ac +++ /dev/null @@ -1,24 +0,0 @@ ---- rtpdump.c.orig Sat Apr 7 08:02:13 2001 -+++ rtpdump.c Sat Apr 21 21:54:10 2001 -@@ -429,8 +429,8 @@ - for (i = 0; i < r->common.count; i++) { - fprintf(out, " (ssrc=0x%lx fraction=%g lost=%lu last_seq=%lu jit=%lu lsr=%lu dlsr=%lu )\n", - (unsigned long)ntohl(r->r.sr.rr[i].ssrc), -- r->r.sr.rr[i].fraction / 256., -- (unsigned long)ntohl(r->r.sr.rr[i].lost), /* XXX I'm pretty sure this is wrong */ -+ RTCP_FRACTION(ntohl(r->r.sr.rr[i].fraclost)) / 256., -+ RTCP_LOST(ntohl(r->r.sr.rr[i].fraclost)), - (unsigned long)ntohl(r->r.sr.rr[i].last_seq), - (unsigned long)ntohl(r->r.sr.rr[i].jitter), - (unsigned long)ntohl(r->r.sr.rr[i].lsr), -@@ -446,8 +446,8 @@ - for (i = 0; i < r->common.count; i++) { - fprintf(out, " (ssrc=0x%lx fraction=%g lost=%lu last_seq=%lu jit=%lu lsr=%lu dlsr=%lu )\n", - (unsigned long)ntohl(r->r.rr.rr[i].ssrc), -- r->r.rr.rr[i].fraction / 256., -- (unsigned long)ntohl(r->r.rr.rr[i].lost), -+ RTCP_FRACTION(ntohl(r->r.rr.rr[i].fraclost)) / 256., -+ RTCP_LOST(ntohl(r->r.rr.rr[i].fraclost)), - (unsigned long)ntohl(r->r.rr.rr[i].last_seq), - (unsigned long)ntohl(r->r.rr.rr[i].jitter), - (unsigned long)ntohl(r->r.rr.rr[i].lsr), diff --git a/net/rtptools/files/patch-ad b/net/rtptools/files/patch-ad deleted file mode 100644 index 130804a6b732..000000000000 --- a/net/rtptools/files/patch-ad +++ /dev/null @@ -1,27 +0,0 @@ - -$FreeBSD$ - ---- rtpsend.c.orig Tue Sep 10 13:24:10 2002 -+++ rtpsend.c Sat Aug 16 08:58:12 2003 -@@ -353,9 +353,9 @@ - if (strcmp(n->type, "ssrc") == 0) - rr->ssrc = htonl(n->num); - else if (strcmp(n->type, "fraction") == 0) -- rr->fraction = (n->num)*256; -- else if (strcmp(n->type, "lost") == 0) /* PP: alignment OK? */ -- rr->lost = htonl(n->num); -+ rr->fraclost = htonl((ntohl(rr->fraclost) & 0x00ffffff) | ((n->num)*256 << 24)); -+ else if (strcmp(n->type, "lost") == 0) -+ rr->fraclost = htonl((ntohl(rr->fraclost) & 0xff000000) | n->num); - else if (strcmp(n->type, "last_seq") == 0) - rr->last_seq = htonl(n->num); - else if (strcmp(n->type, "jit") == 0) -@@ -919,6 +919,8 @@ - local = (struct in_addr *)host->h_addr_list[0];
- sin.sin_addr = *local;
- } -+ } else { -+ usage(argv[0]); - } - - /* create/connect sockets */ diff --git a/net/rtptools/pkg-descr b/net/rtptools/pkg-descr deleted file mode 100644 index be50ee27bf15..000000000000 --- a/net/rtptools/pkg-descr +++ /dev/null @@ -1,15 +0,0 @@ -The rtptools distribution consists of a number of small applications that -can be used for processing RTP data. - -rtpplay - play back RTP sessions recorded by rtpdump -rtpsend - generate RTP packets from textual description, generated by hand or - rtpdump -rtpdump - parse and print RTP packets, generating output files suitable for - rtpplay and rtpsend -rtptrans - RTP translator between unicast and multicast networks - -WWW: http://www.cs.columbia.edu/irt/software/rtptools/ diff --git a/net/sdr/Makefile b/net/sdr/Makefile deleted file mode 100644 index 1b32fc22d111..000000000000 --- a/net/sdr/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# New ports collection makefile for: sdr -# Date created: 5 September 1996 -# Whom: Bill Fenner <fenner@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= sdr -PORTVERSION= 3.0 -PORTREVISION= 3 -CATEGORIES= mbone tk -MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/3.0/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= Multicast Session Directory - -LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 -BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase - -PLIST_FILES= bin/sdr -WRKSRC= ${WRKDIR}/sdr/freebsd -HAS_CONFIGURE= yes -USE_GMAKE= yes - -post-extract: - @${CP} ${FILESDIR}/Makefile.freebsd ${WRKSRC}/Makefile.freebsd - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 700042 -MAKE_ARGS+= "CC=gcc -g -O" -.endif - -.include <bsd.port.post.mk> diff --git a/net/sdr/distinfo b/net/sdr/distinfo deleted file mode 100644 index 4be266510e61..000000000000 --- a/net/sdr/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (sdr-3.0.tar.gz) = df7df7911b5c08df968296f970f9e31d -SHA256 (sdr-3.0.tar.gz) = 57a6d631e14b2270dad04048a0f50c38dfcf3bfda67b96d8265820d567761460 -SIZE (sdr-3.0.tar.gz) = 304691 diff --git a/net/sdr/files/Makefile.freebsd b/net/sdr/files/Makefile.freebsd deleted file mode 100644 index 34a7a8c8a943..000000000000 --- a/net/sdr/files/Makefile.freebsd +++ /dev/null @@ -1,8 +0,0 @@ -CC = gcc -g -O -fwritable-strings -INCLUDES = -I${LOCALBASE}/include -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/uclmmbase -LIBS = -L${LOCALBASE}/lib -ltk84 -ltcl84 -luclmmbase -lX11 -lz -lm -CFLAGS = $(INCLUDES) -DDIFF_BYTE_ORDER -DFREEBSD -DNORANDPROTO -DDEFINED_ERRLIST -Wall -DAUTH -DHAVE_ZLIB -DFreeBSD - -all:: sdr -install: - install -s -c -o root -g wheel -m 555 sdr ${PREFIX}/bin diff --git a/net/sdr/files/patch-ab b/net/sdr/files/patch-ab deleted file mode 100644 index bb154934fbd1..000000000000 --- a/net/sdr/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src/Makefile.template.orig Tue May 25 16:27:44 1999 -+++ ../src/Makefile.template Thu Nov 4 11:05:39 1999 -@@ -88,7 +88,7 @@ - $(SDR_UI_FILES): tcl2c - - parsed_plugins.tcl: ../src/plugin2tcl.tcl -- tclsh8.0 ../src/plugin2tcl.tcl -+ tclsh8.4 ../src/plugin2tcl.tcl - - uweb: $(WWWOBJS) - $(CC) -ggdb -o uweb $(WWWOBJS) $(LIBS) diff --git a/net/sdr/files/patch-src-generic.tcl b/net/sdr/files/patch-src-generic.tcl deleted file mode 100644 index 6f1ebef5a5c6..000000000000 --- a/net/sdr/files/patch-src-generic.tcl +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src/generic.tcl.orig 2008-08-31 12:38:25.000000000 +0800 -+++ ../src/generic.tcl 2008-08-31 12:39:01.000000000 +0800 -@@ -89,8 +89,6 @@ - proc tixAddBalloon {w class msg {initWait 500}} { - global tixBal - if {$class == "Button" } { -- bind $w <Enter> "+tkButtonEnter $w" -- bind $w <Leave> "+tkButtonLeave $w" - bind $w <ButtonPress> "+tixBalEnd $w" - } else { - if { $class == "Entry" } { diff --git a/net/sdr/pkg-descr b/net/sdr/pkg-descr deleted file mode 100644 index 4c6400374ee6..000000000000 --- a/net/sdr/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Sdr is a session directory tool designed to allow the advertisement -and joining of multicast conferences. It was originally based on -sd written by Van Jacobson at LBNL, but implements a later version -of the session description protocol than sd does. - -WWW: http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/ diff --git a/net/udpcast/Makefile b/net/udpcast/Makefile deleted file mode 100644 index 1c33f6320ea4..000000000000 --- a/net/udpcast/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# New ports collection makefile for: udpcast -# Date created: Mon Jul 19 19:10:56 UTC 2004 -# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= udpcast -PORTVERSION= 0.${RELEASE_DATE} -CATEGORIES= mbone sysutils -MASTER_SITES= http://udpcast.linux.lu/download/ -DISTNAME= ${PORTNAME}-${RELEASE_DATE} - -MAINTAINER= ports@FreeBSD.org -COMMENT= A file transfer tool using ethernet's multicast - -USE_GMAKE= yes -USE_PERL5_BUILD= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-${RELEASE_DATE} - -RELEASE_DATE= 20081213 - -PROGRAM_SBIN_FILES= udp-receiver udp-sender - -PLIST_FILES= sbin/udp-receiver \ - sbin/udp-sender -PORTDOCS= Changelog.txt cmd.html - -MAN1= udp-receiver.1 udp-sender.1 - -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" - -do-install: -.ifndef(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -. for file in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} -. endfor -.endif -.for file in ${PROGRAM_SBIN_FILES} - @${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/sbin/ -.endfor -.for file in ${MAN1} - @${INSTALL_MAN} ${WRKSRC}/${file} ${MANPREFIX}/man/man1/ -.endfor - -.include <bsd.port.mk> diff --git a/net/udpcast/distinfo b/net/udpcast/distinfo deleted file mode 100644 index 66ccd2a93184..000000000000 --- a/net/udpcast/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (udpcast-20081213.tar.gz) = 23f3371cb60a1f66f6be12fa98d4d5ca -SHA256 (udpcast-20081213.tar.gz) = 73adac6869e7653ad33a3b92498080a2a0398c60ac78c50a701057325f612d57 -SIZE (udpcast-20081213.tar.gz) = 160550 diff --git a/net/udpcast/files/patch-libbb_udpcast.h b/net/udpcast/files/patch-libbb_udpcast.h deleted file mode 100644 index 1f2289b163ae..000000000000 --- a/net/udpcast/files/patch-libbb_udpcast.h +++ /dev/null @@ -1,13 +0,0 @@ ---- libbb_udpcast.h.orig 2009-02-10 10:07:40.000000000 +0100 -+++ libbb_udpcast.h 2009-02-10 10:06:51.000000000 +0100 -@@ -24,6 +24,10 @@ - #include <malloc.h> - #endif - -+#ifdef HAVE_STDLIB_H -+ #include <stdlib.h> -+#endif -+ - #define xmalloc malloc - - #endif /* BB_VER */ diff --git a/net/udpcast/files/patch-participants.h b/net/udpcast/files/patch-participants.h deleted file mode 100644 index 6e7ef8da3d7f..000000000000 --- a/net/udpcast/files/patch-participants.h +++ /dev/null @@ -1,13 +0,0 @@ ---- participants.h.orig 2005-12-22 23:59:18.000000000 +0100 -+++ participants.h 2009-02-05 12:18:19.000000000 +0100 -@@ -3,6 +3,10 @@ - - #define MAX_CLIENTS 1024 - -+#include <sys/types.h> -+#include <sys/socket.h> -+ -+ - typedef struct participantsDb *participantsDb_t; - - #define isParticipantValid udpc_isParticipantValid diff --git a/net/udpcast/files/patch-rateGovernor.c b/net/udpcast/files/patch-rateGovernor.c deleted file mode 100644 index 14de493ebb02..000000000000 --- a/net/udpcast/files/patch-rateGovernor.c +++ /dev/null @@ -1,28 +0,0 @@ ---- rateGovernor.c.orig 2008-09-20 09:07:29.000000000 +0200 -+++ rateGovernor.c 2009-02-09 08:20:17.000000000 +0100 -@@ -23,6 +23,25 @@ - #define DL_RATE_GOVERNOR - #endif - -+ -+#ifdef __FreeBSD__ -+char * -+strndup(const char *str, size_t n) -+{ -+ size_t len; -+ char *copy; -+ -+ for (len = 0; len < n && str[len]; len++) -+ continue; -+ -+ if ((copy = malloc(len + 1)) == NULL) -+ return (NULL); -+ memcpy(copy, str, len); -+ copy[len] = '\0'; -+ return (copy); -+} -+#endif -+ - void *rgInitGovernor(struct net_config *cfg, struct rateGovernor_t *gov) - { - if(cfg->nrGovernors == MAX_GOVERNORS) { diff --git a/net/udpcast/files/patch-socklib.c b/net/udpcast/files/patch-socklib.c deleted file mode 100644 index 974921257f31..000000000000 --- a/net/udpcast/files/patch-socklib.c +++ /dev/null @@ -1,46 +0,0 @@ ---- socklib.c.orig 2008-09-18 22:43:15.000000000 +0200 -+++ socklib.c 2009-02-10 10:01:40.000000000 +0100 -@@ -18,6 +18,7 @@ - #endif - - #ifdef HAVE_NET_IF_H -+# include <sys/socket.h> - # include <net/if.h> - #endif - -@@ -66,6 +67,8 @@ - # define DEBUG 0 - #endif - -+#undef SIOCGIFINDEX -+ - #ifdef LOSSTEST - /** - * Packet loss/swap testing... -@@ -353,7 +356,7 @@ - - int setTtl(int sock, int ttl) { - /* set the socket to broadcast */ -- return setsockopt(sock, SOL_IP, IP_MULTICAST_TTL, (char*)&ttl, sizeof(int)); -+ return setsockopt(sock, IPPROTO_IP, IP_MULTICAST_TTL, (char*)&ttl, sizeof(int)); - } - - #ifdef HAVE_STRUCT_IP_MREQN_IMR_IFINDEX -@@ -422,7 +425,7 @@ - - - int setMcastDestination(int sock, net_if_t *net_if, struct sockaddr_in *addr) { --#ifdef WINDOWS -+#if defined(WINDOWS) || defined(__FreeBSD__) - int r; - struct sockaddr_in interface_addr; - struct in_addr if_addr; -@@ -720,7 +723,7 @@ - - net_if->name = strdup(chosen->ifr_name); - --#ifdef HAVE_STRUCT_IP_MREQN_IMR_IFINDEX -+#ifdef HAVE_STRUCT_IP_MREQN_IMR_IFINDEX__TODO - /* Index for multicast subscriptions */ - if(ioctl(s, SIOCGIFINDEX, chosen) < 0) - udpc_fatal(-1, "Error getting index for %s: %s", net_if->name, diff --git a/net/udpcast/files/patch-udpr-negotiate.c b/net/udpcast/files/patch-udpr-negotiate.c deleted file mode 100644 index c1a1fddbd386..000000000000 --- a/net/udpcast/files/patch-udpr-negotiate.c +++ /dev/null @@ -1,29 +0,0 @@ ---- udpr-negotiate.c.orig 2007-05-25 12:01:59.000000000 +0200 -+++ udpr-negotiate.c 2009-02-06 08:18:02.000000000 +0100 -@@ -3,6 +3,10 @@ - #include <errno.h> - #include <sys/stat.h> - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif -+ - #include "log.h" - #include "socklib.h" - #include "udpcast.h" -@@ -82,13 +86,13 @@ - if(disk_config->fileName != NULL) { - int oflags = O_CREAT | O_WRONLY; - if((disk_config->flags & FLAG_SYNC)) { -- oflags |= O_SYNC; -+ oflags |= O_FSYNC; - } else if( !(disk_config->flags & FLAG_NOSYNC)) { - struct stat buf; - if(stat(disk_config->fileName, &buf) == 0) { - /* If target is device, open it synchronously */ - if(S_ISCHR(buf.st_mode) || S_ISBLK(buf.st_mode)) -- oflags |= O_SYNC; -+ oflags |= O_FSYNC; - } - } - outFile = open(disk_config->fileName, oflags | O_BINARY, 0644); diff --git a/net/udpcast/pkg-descr b/net/udpcast/pkg-descr deleted file mode 100644 index 834bd3b3e5e3..000000000000 --- a/net/udpcast/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -[ excerpt taken from developer's www site ] - -UDPcast is a file transfer tool that can send data simultaneously -to many destinations on a LAN. This can for instance be used to -install entire classrooms of PC's at once. The advantage of UDPcast -over using other methods (nfs, ftp, whatever) is that UDPcast uses -Ethernet's multicast abilities: it won't take longer to install 15 -machines than it would to install just 2. - -WWW: http://udpcast.linux.lu/ diff --git a/net/unison232/Makefile b/net/unison232/Makefile deleted file mode 100644 index 3f55db3ab3f1..000000000000 --- a/net/unison232/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -# New ports collection makefile for: unison -# Date created: 4 October 2000 -# Whom: Dan Pelleg <dpelleg+unison@cs.cmu.edu> -# -# $FreeBSD$ -# - -PORTNAME= unison -PORTVERSION= 2.27.157 -PORTREVISION?= 2 -CATEGORIES= net -MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ -DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} -DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} -EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz - -MAINTAINER= daniel+unison@pelleg.org -COMMENT= A user-level file synchronization tool - -PLIST_SUB= PORTVERSION=${PORTVERSION} -USE_GMAKE= yes -MAKE_ARGS= CFLAGS="" -CONFLICTS= unison-devel-[0-9]* unison-nox11-[0-9]* - -.include <bsd.port.pre.mk> - -.if !defined(NOPORTDOCS) -DOCS= BUGS.txt NEWS README -EXTRA_DOCS= unison-${PORTVERSION}-manual.html \ - unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps -.endif - -.if !defined(WITHOUT_GTK2) && !defined(WITHOUT_X11) -WITH_GTK2= yes -.endif - -.if defined(WITH_GTK2) -MAKE_ARGS+= UISTYLE=gtk2 -PLIST_SUB+= TEXT="" -BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml \ - lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 -RUN_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 -PATCH_DEPENDS+= ${BUILD_DEPENDS} -CONFLICTS+= ocaml-nox11* -.else -MAKE_ARGS+= UISTYLE=text -PLIST_SUB+= TEXT="@comment " -BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml-nox11 -PATCH_DEPENDS+= ${BUILD_DEPENDS} -.endif - -.if defined(WITH_GTK2) -post-build: - @${ECHO} Building text-only version - @${ECHO} ${WRKSRC} - @${GMAKE} -C ${WRKSRC} UISTYLE=text NAME=unison-text -.endif - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/unison ${PREFIX}/bin - -post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} - cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${DOCSDIR} -.endif -.if defined(WITH_GTK2) - @${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${PREFIX}/bin - @${CAT} ${PKGMESSAGE} -.else - @${CAT} ${PKGMESSAGE}.nox11 -.endif - -.include <bsd.port.post.mk> diff --git a/net/unison232/distinfo b/net/unison232/distinfo deleted file mode 100644 index 7f16bf256273..000000000000 --- a/net/unison232/distinfo +++ /dev/null @@ -1,12 +0,0 @@ -MD5 (unison-2.27.157/unison-2.27.157.tar.gz) = 4cc2a0332cb8c947adc04b9d4f2a83b0 -SHA256 (unison-2.27.157/unison-2.27.157.tar.gz) = ec04069e95249a5b4e212ab48ec03820b1e1f707fb4c607e7f98851e98735adc -SIZE (unison-2.27.157/unison-2.27.157.tar.gz) = 674332 -MD5 (unison-2.27.157/unison-2.27.157-manual.html) = 5c1185a47a3217351e37dba55ea937c5 -SHA256 (unison-2.27.157/unison-2.27.157-manual.html) = 58f514c4c0818ebed6b2afa8e3dbf84871e240ddb6819d91e1b7c93be36c3f50 -SIZE (unison-2.27.157/unison-2.27.157-manual.html) = 235599 -MD5 (unison-2.27.157/unison-2.27.157-manual.pdf) = d4a780abb68af73177f5d59f759e4c89 -SHA256 (unison-2.27.157/unison-2.27.157-manual.pdf) = 6af0f5242a08056d7dbcfce171083a577ed9748d13d1f9bc5d7050f224ec0162 -SIZE (unison-2.27.157/unison-2.27.157-manual.pdf) = 453255 -MD5 (unison-2.27.157/unison-2.27.157-manual.ps) = 6672037b889e62b392eb269fb7f45fd6 -SHA256 (unison-2.27.157/unison-2.27.157-manual.ps) = 31d2328ccc7006212e90e7eece45942cd32efffde9b3eebc0075f98f0147e5c0 -SIZE (unison-2.27.157/unison-2.27.157-manual.ps) = 551643 diff --git a/net/unison232/pkg-descr b/net/unison232/pkg-descr deleted file mode 100644 index 10d805d9eb0a..000000000000 --- a/net/unison232/pkg-descr +++ /dev/null @@ -1,15 +0,0 @@ -Unison is a file-synchronization tool for Unix and Windows. It allows two -replicas of a collection of files and directories to be stored on different -hosts (or different disks on the same host), modified separately, and then -brought up to date by propagating the changes in each replica to the other. - -Unison shares a number of features with tools such as configuration -management packages (CVS, PRCS, etc.) distributed filesystems (Coda, etc.) -uni-directional mirroring utilities (rsync, etc.) and other synchronizers -(Intellisync, Reconcile, etc). - -WWW: http://www.cis.upenn.edu/~bcpierce/unison/ - -- Dan Pelleg - -daniel+unison@pelleg.org diff --git a/net/unison232/pkg-message b/net/unison232/pkg-message deleted file mode 100644 index 3c1cfd40d2c0..000000000000 --- a/net/unison232/pkg-message +++ /dev/null @@ -1,4 +0,0 @@ -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -Together with a gtk-enabled version, a text-only unison-text binary -is installed as it depends on a smaller number of libraries. -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/net/unison232/pkg-message.nox11 b/net/unison232/pkg-message.nox11 deleted file mode 100644 index fe8b86b9b4eb..000000000000 --- a/net/unison232/pkg-message.nox11 +++ /dev/null @@ -1,3 +0,0 @@ -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -A text-only unison binary is installed. -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/net/unison232/pkg-plist b/net/unison232/pkg-plist deleted file mode 100644 index 7fc5e3d995b4..000000000000 --- a/net/unison232/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -bin/unison -%%TEXT%%bin/unison-text -%%PORTDOCS%%%%DOCSDIR%%/BUGS.txt -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.html -%%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.pdf -%%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.ps -%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/net/wb/Makefile b/net/wb/Makefile deleted file mode 100644 index ce6020a014c1..000000000000 --- a/net/wb/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# New ports collection makefile for: wb -# Date created: 2 Novermber 1996 -# Whom: fenner -# -# $FreeBSD$ -# - -PORTNAME= wb -PORTVERSION= 1.59 -PORTREVISION= 4 -CATEGORIES= mbone -MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/wb/ -DISTFILES= i386-wb-1.59.tar.Z - -MAINTAINER= ports@FreeBSD.org -COMMENT= A shared drawing (whiteboard) tool using multicast - -NO_WRKSUBDIR= yes -NO_BUILD= yes -STRIP= - -# ghostscript, ghostscript3, ghostscript4 or ghostscript5 will all do. -USE_GHOSTSCRIPT_RUN= yes - -PLIST_FILES= bin/wb -PORTDOCS= README CHANGES NOTES lblwb.ps - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/wb ${PREFIX}/bin -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ - ${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}/ - ${INSTALL_DATA} ${WRKSRC}/NOTES ${DOCSDIR}/ - ${INSTALL_DATA} ${WRKSRC}/lblwb.ps ${DOCSDIR}/ -.endif - -.include <bsd.port.mk> diff --git a/net/wb/distinfo b/net/wb/distinfo deleted file mode 100644 index 83c5d40e0f98..000000000000 --- a/net/wb/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (i386-wb-1.59.tar.Z) = 7601eb1192ee2774940d805500c0a9ce -SHA256 (i386-wb-1.59.tar.Z) = 0bae5c24f4c65031e99ac5c5df08e91eab92e5542c5a9f9a278f838c84bb035e -SIZE (i386-wb-1.59.tar.Z) = 2049555 diff --git a/net/wb/pkg-descr b/net/wb/pkg-descr deleted file mode 100644 index 9c196397ccc9..000000000000 --- a/net/wb/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -This is a beta-release of the LBL 'whiteboard'. - -Before using wb, read the file NOTES from the distribution (note -especially the .sd.tcl change needed if you are running sd v1.14 -or earlier) and print and read the postscript file lblwb.ps. - -If you simply want a shared "whiteboard" drawing surface, you -don't need to do anything but install wb. But wb can also be -used to export, view and annotate arbitrary PostScript files. -If you want to include PostScript images in your wb conference, -either your X server has to support Display PostScript (the DEC -& SGI X servers do) or wb has to be able to exec the public -domain postscript renderer `GhostScript'. If you want to -render postscript with Ghostscript, it has to be installed on -your machine and has to be in your shell search path with the -name "gs". |