From 2ba4e0c4c5fbb6c7264f10a834bb73484c72372c Mon Sep 17 00:00:00 2001 From: Max Khon Date: Tue, 30 Nov 2010 03:47:34 +0000 Subject: asterisk 1.2 has been EOL'ed upstream on 21 Nov 2010. --- net/Makefile | 2 - net/asterisk12-app-ldap/Makefile | 25 - net/asterisk12-app-ldap/distinfo | 3 - net/asterisk12-app-ldap/files/patch-Makefile | 34 - net/asterisk12-app-ldap/files/patch-app_ldap.c | 435 -- net/asterisk12-app-ldap/files/patch-cflags.sh | 19 - net/asterisk12-app-ldap/pkg-descr | 4 - net/asterisk12-app-ldap/pkg-plist | 2 - net/asterisk12/Makefile | 107 - net/asterisk12/distinfo | 6 - net/asterisk12/files/asterisk.sh.in | 25 - net/asterisk12/files/patch-Makefile | 507 -- net/asterisk12/files/patch-agi::Makefile | 25 - net/asterisk12/files/patch-apps::Makefile | 72 - net/asterisk12/files/patch-apps::app_flash.c | 14 - net/asterisk12/files/patch-apps::app_meetme.c | 14 - net/asterisk12/files/patch-apps::app_rpt.c | 14 - net/asterisk12/files/patch-apps::app_rxfax.c | 399 -- net/asterisk12/files/patch-apps::app_txfax.c | 326 - net/asterisk12/files/patch-apps::app_zapbarge.c | 14 - net/asterisk12/files/patch-apps::app_zapras.c | 14 - net/asterisk12/files/patch-apps::app_zapscan.c | 14 - net/asterisk12/files/patch-cdr::Makefile | 89 - net/asterisk12/files/patch-channel.c | 27 - net/asterisk12/files/patch-channels::Makefile | 87 - net/asterisk12/files/patch-channels::chan_h323.c | 13 - net/asterisk12/files/patch-channels::chan_iax2.c | 14 - net/asterisk12/files/patch-channels::chan_sip.c | 154 - net/asterisk12/files/patch-channels::chan_skinny.c | 14 - net/asterisk12/files/patch-channels::chan_zap.c | 93 - .../files/patch-channels::h323::Makefile | 20 - net/asterisk12/files/patch-codecs::Makefile | 71 - net/asterisk12/files/patch-codecs::codec_zap.c | 17 - net/asterisk12/files/patch-codecs::gsm::Makefile | 11 - net/asterisk12/files/patch-codecs::ilbc::Makefile | 12 - net/asterisk12/files/patch-codecs_ilbc | 7194 -------------------- .../files/patch-configs::musiconhold.conf.sample | 14 - net/asterisk12/files/patch-db.c | 21 - net/asterisk12/files/patch-formats::Makefile | 23 - .../files/patch-formats::format_g723_1.c | 354 - net/asterisk12/files/patch-formats::format_g729.c | 47 - net/asterisk12/files/patch-frame.c | 14 - net/asterisk12/files/patch-funcs::Makefile | 14 - .../files/patch-include::asterisk::utils.h | 13 - .../files/patch-include_asterisk_astobj2.h | 14 - net/asterisk12/files/patch-pbx::Makefile | 25 - net/asterisk12/files/patch-res::Makefile | 53 - net/asterisk12/files/patch-res::res_musiconhold.c | 14 - net/asterisk12/files/patch-utils.c | 14 - net/asterisk12/files/patch-utils::Makefile | 32 - net/asterisk12/pkg-descr | 5 - net/asterisk12/pkg-plist | 793 --- 52 files changed, 11341 deletions(-) delete mode 100644 net/asterisk12-app-ldap/Makefile delete mode 100644 net/asterisk12-app-ldap/distinfo delete mode 100644 net/asterisk12-app-ldap/files/patch-Makefile delete mode 100644 net/asterisk12-app-ldap/files/patch-app_ldap.c delete mode 100644 net/asterisk12-app-ldap/files/patch-cflags.sh delete mode 100644 net/asterisk12-app-ldap/pkg-descr delete mode 100644 net/asterisk12-app-ldap/pkg-plist delete mode 100644 net/asterisk12/Makefile delete mode 100644 net/asterisk12/distinfo delete mode 100644 net/asterisk12/files/asterisk.sh.in delete mode 100644 net/asterisk12/files/patch-Makefile delete mode 100644 net/asterisk12/files/patch-agi::Makefile delete mode 100644 net/asterisk12/files/patch-apps::Makefile delete mode 100644 net/asterisk12/files/patch-apps::app_flash.c delete mode 100644 net/asterisk12/files/patch-apps::app_meetme.c delete mode 100644 net/asterisk12/files/patch-apps::app_rpt.c delete mode 100644 net/asterisk12/files/patch-apps::app_rxfax.c delete mode 100644 net/asterisk12/files/patch-apps::app_txfax.c delete mode 100644 net/asterisk12/files/patch-apps::app_zapbarge.c delete mode 100644 net/asterisk12/files/patch-apps::app_zapras.c delete mode 100644 net/asterisk12/files/patch-apps::app_zapscan.c delete mode 100644 net/asterisk12/files/patch-cdr::Makefile delete mode 100644 net/asterisk12/files/patch-channel.c delete mode 100644 net/asterisk12/files/patch-channels::Makefile delete mode 100644 net/asterisk12/files/patch-channels::chan_h323.c delete mode 100644 net/asterisk12/files/patch-channels::chan_iax2.c delete mode 100644 net/asterisk12/files/patch-channels::chan_sip.c delete mode 100644 net/asterisk12/files/patch-channels::chan_skinny.c delete mode 100644 net/asterisk12/files/patch-channels::chan_zap.c delete mode 100644 net/asterisk12/files/patch-channels::h323::Makefile delete mode 100644 net/asterisk12/files/patch-codecs::Makefile delete mode 100644 net/asterisk12/files/patch-codecs::codec_zap.c delete mode 100644 net/asterisk12/files/patch-codecs::gsm::Makefile delete mode 100644 net/asterisk12/files/patch-codecs::ilbc::Makefile delete mode 100644 net/asterisk12/files/patch-codecs_ilbc delete mode 100644 net/asterisk12/files/patch-configs::musiconhold.conf.sample delete mode 100644 net/asterisk12/files/patch-db.c delete mode 100644 net/asterisk12/files/patch-formats::Makefile delete mode 100644 net/asterisk12/files/patch-formats::format_g723_1.c delete mode 100644 net/asterisk12/files/patch-formats::format_g729.c delete mode 100644 net/asterisk12/files/patch-frame.c delete mode 100644 net/asterisk12/files/patch-funcs::Makefile delete mode 100644 net/asterisk12/files/patch-include::asterisk::utils.h delete mode 100644 net/asterisk12/files/patch-include_asterisk_astobj2.h delete mode 100644 net/asterisk12/files/patch-pbx::Makefile delete mode 100644 net/asterisk12/files/patch-res::Makefile delete mode 100644 net/asterisk12/files/patch-res::res_musiconhold.c delete mode 100644 net/asterisk12/files/patch-utils.c delete mode 100644 net/asterisk12/files/patch-utils::Makefile delete mode 100644 net/asterisk12/pkg-descr delete mode 100644 net/asterisk12/pkg-plist (limited to 'net') diff --git a/net/Makefile b/net/Makefile index 81ac97d49a15..871a2de07987 100644 --- a/net/Makefile +++ b/net/Makefile @@ -31,8 +31,6 @@ SUBDIR += asterisk-app-ldap SUBDIR += asterisk-app-notify SUBDIR += asterisk-oh323 - SUBDIR += asterisk12 - SUBDIR += asterisk12-app-ldap SUBDIR += asterisk14 SUBDIR += asterisk14-addons SUBDIR += asterisk16 diff --git a/net/asterisk12-app-ldap/Makefile b/net/asterisk12-app-ldap/Makefile deleted file mode 100644 index 8f4ee683d545..000000000000 --- a/net/asterisk12-app-ldap/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# New ports collection makefile for: app_ldap -# Date created: 30 July 2006 -# Whom: Matthias Fechner -# -# $FreeBSD$ -# - -PORTNAME= asterisk12-app-ldap -DISTVERSION= 1.0rc6 -PORTREVISION= 5 -CATEGORIES= net -MASTER_SITES= http://www.mezzo.net/asterisk/ -DISTNAME= app_ldap-${DISTVERSION} -EXTRACT_SUFX= .tgz - -MAINTAINER= idefix@fechner.net -COMMENT= LDAPget application module for the Asterisk PBX - -BUILD_DEPENDS= asterisk:${PORTSDIR}/net/asterisk12 - -USE_GMAKE= yes -USE_ICONV= yes -USE_OPENLDAP= yes - -.include diff --git a/net/asterisk12-app-ldap/distinfo b/net/asterisk12-app-ldap/distinfo deleted file mode 100644 index 3a36792c25eb..000000000000 --- a/net/asterisk12-app-ldap/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (app_ldap-1.0rc6.tgz) = 031470fc962a82dbc987261fd16c6344 -SHA256 (app_ldap-1.0rc6.tgz) = f0a80aa3f63da0204fda18d5b98e61b59c4071519359efa7e1ce9c7c9fa434d0 -SIZE (app_ldap-1.0rc6.tgz) = 6288 diff --git a/net/asterisk12-app-ldap/files/patch-Makefile b/net/asterisk12-app-ldap/files/patch-Makefile deleted file mode 100644 index 1e41aa5a5b3b..000000000000 --- a/net/asterisk12-app-ldap/files/patch-Makefile +++ /dev/null @@ -1,34 +0,0 @@ ---- Makefile.orig Sun Jul 30 12:20:19 2006 -+++ Makefile Sun Jul 30 12:29:12 2006 -@@ -10,16 +10,16 @@ - CONF=ldap.conf - - CFLAGS=$(shell ./cflags.sh) --LIBS=-llber -lldap --RES=$(shell if [ -f /usr/include/asterisk/channel.h ]; then echo "$(NAME).so"; fi) -+LIBS=-llber -lldap -liconv -+RES=$(shell if [ -f /usr/local/include/asterisk/channel.h ]; then echo "$(NAME).so"; fi) - - ifeq (${OSARCH},Darwin) - SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace - else --SOLINK=-shared -Xlinker -x -+SOLINK=-shared -Xlinker -x -L/usr/local/lib - endif - --MODULES_DIR=/usr/lib/asterisk/modules -+MODULES_DIR=/usr/local/lib/asterisk/modules - - %.so : %.o - $(CC) $(SOLINK) -o $@ $(LIBS) $< -@@ -30,8 +30,8 @@ - rm -f $(NAME).o $(NAME).so - - install: all -- if ! [ -f /etc/asterisk/$(CONF) ]; then \ -- install -m 644 $(CONF).sample /etc/asterisk/$(CONF) ; \ -+ if ! [ -f /usr/local/etc/asterisk/$(CONF).sample ]; then \ -+ install -m 644 $(CONF).sample /usr/local/etc/asterisk/$(CONF).sample ; \ - fi - if [ -f $(NAME).so ]; then \ - install -m 755 $(NAME).so $(MODULES_DIR) ; \ diff --git a/net/asterisk12-app-ldap/files/patch-app_ldap.c b/net/asterisk12-app-ldap/files/patch-app_ldap.c deleted file mode 100644 index bb69325a8c38..000000000000 --- a/net/asterisk12-app-ldap/files/patch-app_ldap.c +++ /dev/null @@ -1,435 +0,0 @@ ---- app_ldap.c.orig Sun Jul 30 12:22:29 2006 -+++ app_ldap.c Wed Aug 23 15:18:29 2006 -@@ -9,6 +9,8 @@ - * - */ - -+/*#define LDAP_DEPRECATED 1*/ -+ - #include - #include - #include -@@ -27,19 +28,23 @@ - #include - #include - - #include - #include - #include - #include - - #define LDAP_CONFIG "ldap.conf" -+#define SIZELIMIT 2048 - - char *replace_ast_vars(struct ast_channel *chan, const char *string); -+LDAP* ldap_open_connection(char *host, int port, int version); -+int ldap_bind_connection(LDAP *ld, char *user, char *pass); -+int ldap_search_in_connection(LDAP *ld, char *base, char *scope, char *filter, char *attribute, char *result); - int ldap_lookup(char *host, int port, int version, int timeout, char *user, char *pass, char *base, char *scope, char *filter, char *attribute, char *result); --int strconvert(const char *incharset, const char *outcharset, char *in, char *out); -+int strconvert(const char *incharset, const char *outcharset, const char *in, char *out); - char *strtrim (char *string); - --static char *tdesc = "LDAP directory lookup function for Asterisk extension logic."; -+static char *tdesc = "LDAP directory lookup function for Asterisk extension logic(Version: $version$)."; - - static char *g_descrip = - " LDAPget(varname=config-file-section/key): Retrieves a value from an LDAP\n" -@@ -58,11 +65,11 @@ - int arglen; - struct localuser *u; - char *argv, *varname, *config, *keys = NULL, *key = NULL, *tail = NULL; -- char result[2048]; -+ char result[SIZELIMIT+1]; - char *result_conv; - struct ast_config *cfg; - -- int port = LDAP_PORT, version = LDAP_VERSION2, timeout = 10; -+ int port = LDAP_PORT, version = LDAP_VERSION3, timeout = 10; - char *temp, *host, *user, *pass, *base, *scope, *filter, *_filter, *attribute, - *convert_from = NULL, *convert_to = NULL; - -@@ -145,9 +152,11 @@ - if(option_verbose > 3) - ast_verbose (VERBOSE_PREFIX_4 "LDAPget: ldap://%s/%s?%s?%s?%s\n", host, base, attribute, scope, _filter); - -+// ast_log(LOG_WARNING, "LDAPget: filter: before replace_ast_vars in main: -%s-\n", filter); - filter = replace_ast_vars(chan, _filter); -+// ast_log(LOG_WARNING, "LDAPget: filter: after replace_ast_vars in main: -%s-\n", filter); - if(option_verbose > 3) -- ast_verbose (VERBOSE_PREFIX_4 "LDAPget: %s\n", filter); -+ ast_verbose (VERBOSE_PREFIX_4 "LDAPget: replaced string: %s\n", filter); - - if(keys && strstr(filter, "%s") != NULL) { - filter = (char *)realloc(filter, (strlen(filter)+strlen(keys)+1)*sizeof(char)); -@@ -163,24 +172,31 @@ - if(option_verbose > 2) - ast_verbose (VERBOSE_PREFIX_3 "LDAPget: ldap://%s/%s?%s?%s?%s\n", host, base, attribute, scope, filter); - -+// ast_log(LOG_WARNING, "LDAPget: filter before ldap_lookup: -%s-\n", filter); - if(ldap_lookup(host, port, version, timeout, user, pass, base, scope, filter, attribute, result)) { - -- if(convert_from) { -+ if(convert_from && strlen(result)>0) { - if(option_verbose > 2) - ast_verbose(VERBOSE_PREFIX_3 "LDAPget: convert: %s -> %s\n", convert_from, convert_to); - result_conv = malloc(strlen(result) * 2); -- strconvert(convert_from, convert_to, result, result_conv); -+ strconvert(convert_from, convert_to, (const char*)result, result_conv); - strcpy(result, result_conv); - free(result_conv); - } - - if(strcmp("CALLERIDNAME", varname)==0) { - #ifdef CHANNEL_HAS_CID -+ if(option_verbose > 2) -+ ast_verbose(VERBOSE_PREFIX_3 "LDAPget: set callerid with HAS_CID ast_set_callerid\n"); -+ result_conv = malloc(strlen(result) * 2); -+// ast_set_callerid(chan, chan->cid.cid_num, result, NULL); - ast_set_callerid(chan, NULL, result, NULL); - #else - char *cidnum, *cidname, newcid[512] = ""; - ast_callerid_parse(chan->callerid, &cidname, &cidnum); - snprintf(newcid, sizeof(newcid), "\"%s\" <%s>", result, cidnum); -+ if(option_verbose > 2) -+ ast_verbose(VERBOSE_PREFIX_3 "LDAPget: set callerid with NO HAS_CID ast_set_callerid\n"); - ast_set_callerid(chan, newcid, 0); - #endif - if(option_verbose > 2) -@@ -237,37 +253,95 @@ - return ASTERISK_GPL_KEY; - } - --int ldap_lookup(char *host, int port, int version, int timeout, char *user, char *pass, -- char *base, char *scope, char *filter, char *attribute, char *result) { -- char *attrs[] = { NULL }; -- char **values; -- LDAP *ld; -- LDAPMessage *res, *entry; -- int ret, ldap_scope = LDAP_SCOPE_SUBTREE; -- -- //ast_verbose(VERBOSE_PREFIX_3 "LDAPget: %s\n", filter); -- ld = ldap_init(host, port); -- if(!ld) { -- ast_log(LOG_WARNING, "LDAPget: unable to initialize ldap connection to %s:%d\n", host, port); -+LDAP* ldap_open_connection(char *host, int port, int version) -+{ -+ LDAP *ld=NULL; -+ LDAPURLDesc url; -+ char *ldapuri=NULL; -+ int ret; -+// int ldap_debug=0xffff; -+ int ldap_debug=0; -+ -+ // Open connection to the LDAP server -+ memset(&url, 0, sizeof(url)); -+ url.lud_host=host; -+ url.lud_port=port; -+ url.lud_scope=LDAP_SCOPE_DEFAULT; -+ url.lud_scheme="ldap"; -+ -+ ldapuri=ldap_url_desc2str(&url); -+ (void) ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &ldap_debug); -+ -+ if(option_verbose > 2) -+ ast_verbose(VERBOSE_PREFIX_3 "LDAPget: open connection to %s with version: %d\n", ldapuri, version); -+ ret = ldap_initialize(&ld, ldapuri); -+ if(ret != LDAP_SUCCESS) { -+ ast_log(LOG_WARNING, "LDAPget: unable to initialize ldap connection to %s(%d)\n", ldap_err2string(ret),ret); - return 0; - } -- ldap_set_option(ld, LDAP_OPT_TIMELIMIT, &timeout); -- ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &version); -- if(user) { -- if (option_verbose > 2) -- ast_verbose(VERBOSE_PREFIX_3 "LDAPget: bind to %s as %s\n", host, user); -- ret = ldap_simple_bind_s(ld, user, pass); -- } else { -- if (option_verbose > 2) -- ast_verbose(VERBOSE_PREFIX_3 "LDAPget: bind to %s anonymously\n", host); -- ret = ldap_simple_bind_s(ld, NULL, NULL); -- } -- if(ret) { -- ast_log(LOG_WARNING, "LDAPget: bind failed: %s\n", ldap_err2string(ret)); -- ldap_unbind(ld); -- return 0; -+ -+ // Disable option referrals -+ if(ldap_set_option(ld, LDAP_OPT_REFERRALS, LDAP_OPT_OFF) != LDAP_OPT_SUCCESS) -+ { -+ ast_log(LOG_WARNING, "LDAPget: unable to disable LDAP_OPT_REFERRALS\n"); -+ return 0; -+ } -+ -+ // set protocol to version -+ if(ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &version)!= LDAP_OPT_SUCCESS) -+ { -+ ast_log(LOG_WARNING, "LDAPget: unable to set LDAP_OPT_PROTOCOL_VERSION %d\n",version); -+ return 0; - } -+ return ld; -+} -+ -+int ldap_bind_connection(LDAP *ld, char *user, char *pass) -+{ -+ int rc; -+ char *sasl_secprops=NULL; -+ -+ if( sasl_secprops != NULL) -+ { -+ rc= ldap_set_option( ld, LDAP_OPT_X_SASL_SECPROPS, (void *) sasl_secprops); -+ if(rc != LDAP_OPT_SUCCESS) -+ { -+ ast_log(LOG_WARNING, "LDAPget: Could not set LDAP_OPT_X_SASL_SECPROPS: %s\n", sasl_secprops); -+ return 0; -+ } -+ } -+ if(option_verbose > 2) -+ ast_verbose(VERBOSE_PREFIX_3 "LDAPget: bind as %s\n", user); -+ -+ struct berval passwd= {0, NULL}; -+ passwd.bv_val=ber_strdup(pass); -+ passwd.bv_len=strlen(passwd.bv_val); -+ -+ rc=ldap_sasl_bind_s(ld, user, NULL, &passwd, NULL, NULL, NULL); -+ -+ if(rc != LDAP_SUCCESS) -+ { -+ ast_log(LOG_WARNING, "LDAPget: ldap_sasl_interactive_bind_s failed: %s (%d)\n", ldap_err2string(rc),rc); -+ return 0; -+ } -+ -+ return 1; -+} - -+ -+int ldap_search_in_connection(LDAP *ld, char *base, char *scope, char *filter, char *attribute, char *result) -+{ -+ char *attrs[] = { NULL }; -+ int ret, ldap_scope = LDAP_SCOPE_SUBTREE; -+ LDAPMessage *msg, *res; -+ int num_entries=0; -+ int msgtype; -+ char *dn, *a; -+ BerElement *ber=NULL; -+ struct berval **vals; -+ struct berval val; -+ -+// ast_log(LOG_WARNING, "LDAPget: filter start of ldap_search_in_connections: -%s-\n", filter); - if(strncmp(scope,"sub",3)==0) { - ldap_scope = LDAP_SCOPE_SUBTREE; - } else if(strncmp(scope,"base",4)==0) { -@@ -276,48 +350,126 @@ - ldap_scope = LDAP_SCOPE_ONELEVEL; - } - -- ret = ldap_search_s(ld, base, ldap_scope, filter, attrs, 0, &res); -- if(ret) { -- ast_log(LOG_DEBUG, "LDAPget: search failed: %s\n", ldap_err2string(ret)); -+ if(option_verbose > 2) -+ ast_verbose(VERBOSE_PREFIX_3 "LDAPget: send search command to LDAP server\n"); -+ ret = ldap_search_ext_s(ld, base, ldap_scope, filter, attrs, 0, NULL, NULL, NULL, SIZELIMIT, &res); -+ if(ret != LDAP_SUCCESS) { -+ ast_log(LOG_WARNING, "LDAPget: search failed: %s (%d)\n", ldap_err2string(ret),ret); -+ ast_log(LOG_WARNING, "LDAPget: filter: %s\n", filter); -+// XXXX need to check - ldap_msgfree(res); -- ldap_unbind(ld); -+ ldap_unbind_ext_s(ld,NULL,NULL); -+ ast_log(LOG_WARNING, "LDAPget: search failed resourceses released, cancel search\n"); - return 0; - } -+ num_entries=ldap_count_entries(ld, res); -+ msg=ldap_first_message(ld, res); -+ msgtype=ldap_msgtype(msg); - -- entry = ldap_first_entry(ld, res); -- if(!entry) { -- if (option_verbose > 2) -- ast_verbose (VERBOSE_PREFIX_3 "LDAPget: Value not found in directory.\n"); -- ldap_msgfree(res); -- ldap_unbind(ld); -- return 0; -- } -+ if(option_verbose > 2) -+ ast_verbose(VERBOSE_PREFIX_3 "LDAPget: found %d entry in LDAP server\n", num_entries); - -- values = ldap_get_values(ld, entry, attribute); -- if(values && values[0]) { -- memset(result, 0, strlen(values[0])); -- strncpy(result, values[0], strlen(values[0])); -- result[strlen(values[0])] = '\0'; -- if (option_verbose > 2) -- ast_verbose(VERBOSE_PREFIX_3 "LDAPget: %s=%s\n", attribute, result); -- } else { -- if (option_verbose > 2) -- ast_verbose (VERBOSE_PREFIX_3 "LDAPget: %s not found.\n", attribute); -- ldap_msgfree(res); -- ldap_unbind(ld); -- return 0; -+ for ( msg = ldap_first_message( ld, res ); msg != NULL; msg = ldap_next_message( ld, msg ) ) { -+ /* Determine what type of message was sent from the server. */ -+ -+ msgtype = ldap_msgtype( msg ); -+ switch( msgtype ) { -+ /* If the result was an entry found by the search, get and print the -+ attributes and values of the entry. */ -+ case LDAP_RES_SEARCH_ENTRY: -+ /* Get and print the DN of the entry. */ -+ if(option_verbose > 2) -+ ast_verbose(VERBOSE_PREFIX_3 "Found a LDAP_RES_SEARCH_ENTRY\n"); -+ ret=ldap_get_dn_ber(ld,msg,&ber,&val); -+ -+ if (( dn = ldap_get_dn( ld, res )) != NULL ) { -+ ldap_memfree( dn ); -+ } -+ /* Iterate through each attribute in the entry. */ -+ for ( a = ldap_first_attribute( ld, res, &ber ); -+ a != NULL; a = ldap_next_attribute( ld, res, ber ) ) { -+ /* Get the searched attribute and value */ -+ if(!strcmp(a,attribute)) -+ { -+ -+ if (( vals = ldap_get_values_len( ld, res, a )) != NULL ) { -+ val=*vals[0]; -+ // remove space at end of string -+ if(val.bv_val[val.bv_len-1]==' ') -+ { -+ val.bv_len--; -+// val.bv_val[val.bv_len]=NULL; -+ } -+ if(option_verbose > 2) -+ ast_verbose(VERBOSE_PREFIX_3 "Found <%s>: <%s>\n", a, val.bv_val); -+ memcpy(result,val.bv_val,val.bv_len); -+ ldap_value_free_len( vals ); -+ ldap_memfree(a); -+ break; -+ } -+ } -+ ldap_memfree( a ); -+ } -+ if ( ber != NULL ) { -+ ber_free( ber, 0 ); -+ } -+ break; -+ case LDAP_RES_SEARCH_REFERENCE: -+ if(option_verbose > 2) -+ ast_verbose(VERBOSE_PREFIX_3 "LDAP_RES_SEARCH_REFERENCE\n"); -+ break; -+ case LDAP_RES_SEARCH_RESULT: -+ if(option_verbose > 2) -+ ast_verbose(VERBOSE_PREFIX_3 "LDAPRES_SERCH_RESULT\n"); -+ break; -+ default: -+ break; -+ } - } -- ldap_value_free(values); -- ldap_msgfree(res); -- ldap_unbind_s(ld); - return 1; - } - -+int ldap_lookup(char *host, int port, int version, int timeout, char *user, char *pass, -+ char *base, char *scope, char *filter, char *attribute, char *result) { -+ LDAP *ld=NULL; -+ -+// ast_log(LOG_WARNING, "LDAPget: filter in ldap_lookup: -%s-\n", filter); -+ // open connection to LDAP server -+ if(option_verbose > 2) -+ ast_verbose(VERBOSE_PREFIX_3 "LDAPget: Initialize connection to LDAP server\n"); -+ ld=ldap_open_connection(host, port, version); -+ if(ld==0) -+ return 0; -+ -+ // authenticate to the LDAP-Server -+ if(option_verbose > 2) -+ ast_verbose(VERBOSE_PREFIX_3 "LDAPget: bind to LDAP server\n"); -+ if(ldap_bind_connection(ld, user, pass) == 0) -+ return 0; -+ -+ // Search in the LDAP directory -+ if(option_verbose > 2) -+ ast_verbose(VERBOSE_PREFIX_3 "LDAPget: search attribute %s in LDAP directory\n", attribute); -+ if(ldap_search_in_connection(ld, base, scope, filter, attribute, result)==0) -+ return 0; -+ -+ // Close connection to the LDAP server -+ int err = ldap_set_option(ld, LDAP_OPT_SERVER_CONTROLS, NULL); -+ if(err != LDAP_OPT_SUCCESS) -+ { -+ ast_log(LOG_WARNING, "LDAPget: Could not unset controls\n"); -+ } -+ -+ ldap_unbind_ext_s(ld, NULL, NULL); -+ return 1; -+} -+ - - char *replace_ast_vars(struct ast_channel *chan, const char *_string) - { - char *var_start, *var_end, *key, *value, *string; - int begin, end; -+ - if(!_string) return ""; - string = (char *)malloc((strlen(_string)+1)*sizeof(char)); - memcpy(string, _string, strlen(_string)+1); -@@ -328,21 +480,37 @@ - key = (char *)alloca((end-begin-1)*sizeof(char)); - memcpy(key, var_start+2, end-begin-2); - key[end-begin-2] = '\0'; -- value = pbx_builtin_getvar_helper(chan, key); -- if(value) { -- //ast_verbose (VERBOSE_PREFIX_3 "LDAPget: %s=%s\n", key, value); -+ if(!strcmp(key,"CALLERIDNUM")) -+ { -+ value=chan->cid.cid_num; -+ }else -+ { -+ value = pbx_builtin_getvar_helper(chan, key); -+// ast_log(LOG_WARNING, "LDAPget: key=-%s-, value=-%s-\n",key,value); -+ } -+ -+ if(option_verbose > 2) -+ { -+ ast_verbose (VERBOSE_PREFIX_3 "LDAPget: key=%s\n", key); -+ ast_verbose (VERBOSE_PREFIX_3 "LDAPget: value=%s\n", value); -+ } -+ if(strcmp(value,"")) { - string = (char *)realloc(string, (strlen(string)-(end-begin+1)+strlen(value)+1)*sizeof(char)); -+ - memmove(var_start+strlen(value), var_end+1, strlen(var_end+1)+1); - memcpy(var_start, value, strlen(value)); - } else { -- memmove(var_start, var_end+1, strlen(var_end+1)+1); -+ memmove(var_start, var_end+1, strlen(var_end+1)+1); - } -- //ast_verbose (VERBOSE_PREFIX_3 "LDAPget: filter:%s\n", string); -+ if(option_verbose > 2) -+ ast_verbose (VERBOSE_PREFIX_3 "LDAPget: filter:%s\n", string); - } - return string; - } - --int strconvert(const char *incharset, const char *outcharset, char *in, char *out) -+ -+ -+int strconvert(const char *incharset, const char *outcharset, const char *in, char *out) - { - iconv_t cd; - size_t incount, outcount, result; -@@ -352,8 +520,14 @@ - *out = L'\0'; - return -1; - } -+ if(option_verbose > 2) -+ ast_verbose(VERBOSE_PREFIX_3 "LDAPget: convert: now with icon string: %s\n", in); - result = iconv(cd, &in, &incount, &out, &outcount); -+ if(option_verbose > 2) -+ ast_verbose(VERBOSE_PREFIX_3 "LDAPget: convert: close inconv %d\n",result); - iconv_close(cd); -+ if(option_verbose > 2) -+ ast_verbose(VERBOSE_PREFIX_3 "LDAPget: result with icon\n"); - out[strlen(out)] = '\0'; - return 1; - } diff --git a/net/asterisk12-app-ldap/files/patch-cflags.sh b/net/asterisk12-app-ldap/files/patch-cflags.sh deleted file mode 100644 index bc0b24a42f43..000000000000 --- a/net/asterisk12-app-ldap/files/patch-cflags.sh +++ /dev/null @@ -1,19 +0,0 @@ ---- cflags.sh.orig Sun Jul 30 12:23:23 2006 -+++ cflags.sh Wed Jul 19 10:09:51 2006 -@@ -1,13 +1,13 @@ - #!/bin/sh - --CFLAGS="-g -Wall -D_REENTRANT -D_GNU_SOURCE -fPIC" -+CFLAGS="-g -Wall -D_REENTRANT -D_GNU_SOURCE -fPIC -I/usr/local/include -L/usr/local/lib" - --CHANNEL_H=/usr/include/asterisk/channel.h -+CHANNEL_H=/usr/local/include/asterisk/channel.h - if [ "`grep 'struct ast_callerid cid' ${CHANNEL_H}`" != "" ]; then - CFLAGS="${CFLAGS} -DCHANNEL_HAS_CID" - fi - --CONFIG_H=/usr/include/asterisk/config.h -+CONFIG_H=/usr/local/include/asterisk/config.h - if [ "`grep 'ast_config_load' ${CONFIG_H}`" != "" ]; then - CFLAGS="${CFLAGS} -DNEW_CONFIG" - fi diff --git a/net/asterisk12-app-ldap/pkg-descr b/net/asterisk12-app-ldap/pkg-descr deleted file mode 100644 index 80609c98f441..000000000000 --- a/net/asterisk12-app-ldap/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -LDAPget is an Asterisk application for data retrieval from LDAP -directories (e.g. OpenLDAP or ActiveDirectory). - -WWW: http://www.mezzo.net/asterisk/app_ldap.html diff --git a/net/asterisk12-app-ldap/pkg-plist b/net/asterisk12-app-ldap/pkg-plist deleted file mode 100644 index c352a00f73cf..000000000000 --- a/net/asterisk12-app-ldap/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/asterisk/modules/app_ldap.so -etc/asterisk/ldap.conf.sample diff --git a/net/asterisk12/Makefile b/net/asterisk12/Makefile deleted file mode 100644 index db1c466204c6..000000000000 --- a/net/asterisk12/Makefile +++ /dev/null @@ -1,107 +0,0 @@ -# New ports collection makefile for: asterisk -# Date created: 17 October 2003 -# Whom: Maxim Sobolev -# -# $FreeBSD$ -# - -PORTNAME= asterisk -PORTVERSION= 1.2.32 -PKGNAMESUFFIX= 12 -PORTREVISION= 3 -CATEGORIES= net -MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ - http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ - -PATCHFILES= asterisk-1.2.26.1-codec-negotiation-20080118.diff.gz -PATCH_SITES= http://b2bua.org/chrome/site/ - -# ${PORTNAME}-1.2.4-${BRIVER}.patch.gz:bristuff -# ${MASTER_SITE_LOCAL:S,$,:bristuff,} -#PATCH_SITE_SUBDIR= fjoe/:bristuff -#BRIVER= bristuff-0.3.0-PRE-1l - -MAINTAINER= sobomax@FreeBSD.org -COMMENT= An Open Source PBX and telephony toolkit - -BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \ - newt.52:${PORTSDIR}/devel/newt \ - curl.6:${PORTSDIR}/ftp/curl -RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 - -ONLY_FOR_ARCHS= i386 sparc64 amd64 - -GNU_CONFIGURE= yes -CONFIGURE_WRKSRC= ${WRKSRC}/editline -USE_GMAKE= yes -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} -PLIST_SUB= BRISTUFF="@comment " -MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8 -WITHOUT_FAX= yes # Doesn't build with spandsp-0.0.3. - -.include - -.if ${ARCH} != "i386" -WITHOUT_ZAPTEL= 1 -.endif - -.if defined(WITHOUT_H323) -PLIST_SUB+= WITH_H323="@comment " -.else -LIB_DEPENDS+= pt_r.1:${PORTSDIR}/devel/pwlib\ - h323_r.1:${PORTSDIR}/net/openh323 -PLIST_SUB+= WITH_H323="" -MAKE_ENV+= WITH_H323=1 -.endif - -.if defined(WITHOUT_ZAPTEL) -PLIST_SUB+= WITH_ZAPTEL="@comment " -MAKE_ENV+= WITHOUT_ZAPTEL=1 -.else -BUILD_DEPENDS+= libpri>=1.2.0:${PORTSDIR}/misc/libpri \ - ${LOCALBASE}/include/zaptel/zaptel.h:${PORTSDIR}/misc/zaptel -LIB_DEPENDS+= pri.1:${PORTSDIR}/misc/libpri -RUN_DEPENDS+= ${LOCALBASE}/include/zaptel/zaptel.h:${PORTSDIR}/misc/zaptel -PLIST_SUB+= WITH_ZAPTEL="" -MAKE_ENV+= WITH_ZAPTEL=1 -.endif - -# -# WITH_FREETDS, WITH_PGSQL and WITH_SQLITE can also be added to MAKE_ENV -# similarly -.if defined(WITHOUT_ODBC) -PLIST_SUB+= WITH_ODBC="@comment " -.else -LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC -PLIST_SUB+= WITH_ODBC="" -MAKE_ENV+= WITH_ODBC=1 -.endif - -.if defined(WITHOUT_FREETDS) -PLIST_SUB+= WITH_FREETDS="@comment " -.else -LIB_DEPENDS+= tds.5:${PORTSDIR}/databases/freetds -PLIST_SUB+= WITH_FREETDS="" -MAKE_ENV+= WITH_FREETDS=1 -.endif - -.if defined(WITHOUT_FAX) -PLIST_SUB+= WITH_FAX="@comment " -.else -MAKE_ENV+= WITH_FAX=1 -LIB_DEPENDS+= spandsp.1:${PORTSDIR}/comms/spandsp -PLIST_SUB+= WITH_FAX="" -.endif - -post-patch: - ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample - -.include diff --git a/net/asterisk12/distinfo b/net/asterisk12/distinfo deleted file mode 100644 index 998e574015fe..000000000000 --- a/net/asterisk12/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (asterisk-1.2.32.tar.gz) = 1ba351401c911402cfcda48230fb8480 -SHA256 (asterisk-1.2.32.tar.gz) = 0019c23bb888a7c8d5a034174f1700a1608883770ec48d6cb69dfae9aee12652 -SIZE (asterisk-1.2.32.tar.gz) = 10636564 -MD5 (asterisk-1.2.26.1-codec-negotiation-20080118.diff.gz) = 2ae6d6cc44fdd89dab804bcf6ac79579 -SHA256 (asterisk-1.2.26.1-codec-negotiation-20080118.diff.gz) = d489cf3921d0ff11571afd273b4cbd02b0e8ba5f225ac4c6fd6fc85a0de54f6b -SIZE (asterisk-1.2.26.1-codec-negotiation-20080118.diff.gz) = 33572 diff --git a/net/asterisk12/files/asterisk.sh.in b/net/asterisk12/files/asterisk.sh.in deleted file mode 100644 index 5c7dd8026c54..000000000000 --- a/net/asterisk12/files/asterisk.sh.in +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# PROVIDE: asterisk -# REQUIRE: DAEMON -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf to enable asterisk: -# -# asterisk_enable="YES" -# - -. /etc/rc.subr - -name=asterisk -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/asterisk - -load_rc_config $name - -pidfile=${asterisk_pidfile:-"/var/run/asterisk.pid"} - -asterisk_enable=${asterisk_enable:-"NO"} - -run_rc_command "$1" diff --git a/net/asterisk12/files/patch-Makefile b/net/asterisk12/files/patch-Makefile deleted file mode 100644 index 779f7d635207..000000000000 --- a/net/asterisk12/files/patch-Makefile +++ /dev/null @@ -1,507 +0,0 @@ - -$FreeBSD$ - ---- Makefile.orig -+++ Makefile -@@ -19,8 +19,8 @@ - # CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be- - # CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/ - # CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target --CC=$(CROSS_COMPILE)gcc --HOST_CC=gcc -+CC?=$(CROSS_COMPILE)gcc -+HOST_CC=${CC} - # CROSS_ARCH=Linux - # CROSS_PROC=arm - # SUB_PROC=xscale # or maverick -@@ -47,14 +47,14 @@ - #K6OPT = -DK6OPT - - #Tell gcc to optimize the code --OPTIMIZE+=-O6 -+#OPTIMIZE+=-O6 - endif - - #Overwite config files on "make samples" --OVERWRITE=y -+OVERWRITE=n - - #Include debug and macro symbols in the executables (-g) and profiling info (-pg) --DEBUG=-g3 #-pg -+#DEBUG=-g3 #-pg - - #Set NOCRYPTO to yes if you do not want to have crypto support or - #dependencies -@@ -88,7 +88,7 @@ - - # Where to install asterisk after compiling - # Default -> leave empty --INSTALL_PREFIX?= -+INSTALL_PREFIX=$(PREFIX) - - # Staging directory - # Files are copied here temporarily during the install process -@@ -111,17 +111,17 @@ - BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE - - ifneq ($(OSARCH),SunOS) -- ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk -- ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk -+ ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk -+ ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk - ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk -- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk -- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk -- ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk -+ ASTSPOOLDIR=/var/spool/asterisk -+ ASTLOGDIR=/var/log/asterisk -+ ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk - ASTCONFPATH=$(ASTETCDIR)/asterisk.conf -- ASTBINDIR=$(INSTALL_PREFIX)/usr/bin -- ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin -- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run -- ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man -+ ASTBINDIR=$(INSTALL_PREFIX)/bin -+ ASTSBINDIR=$(INSTALL_PREFIX)/sbin -+ ASTVARRUNDIR=/var/run -+ ASTMANDIR=$(INSTALL_PREFIX)/man - MODULES_DIR=$(ASTLIBDIR)/modules - AGI_DIR=$(ASTVARLIBDIR)/agi-bin - else -@@ -226,25 +226,25 @@ - endif - - INCLUDE+=-Iinclude -I../include --ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY --ASTCFLAGS+=$(OPTIMIZE) -+ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE -DMAKE_VALGRIND_HAPPY -+#ASTCFLAGS+=$(OPTIMIZE) - ASTOBJ=-o asterisk - - ifeq ($(findstring BSD,$(OSARCH)),BSD) - PROC=$(shell uname -m) -- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - ifneq ($(PROC),ultrasparc) -- ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) -+# ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) - endif - - ifeq ($(PROC),ppc) - ASTCFLAGS+=-fsigned-char - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h),) -- ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/local/include/osp -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp/osp.h),) -+ ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp - else - ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) - ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp -@@ -253,27 +253,24 @@ - - ifeq ($(OSARCH),FreeBSD) - BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk) -- ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) -- LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) -- ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),) -- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp -+ ASTCFLAGS+=$(PTHREAD_CFLAGS) -+ LIBS+=$(PTHREAD_LIBS) -+ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp),) -+ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp - endif - MPG123TARG=freebsd - -- # XXX FreeBSD paths -- PREFIX?=/usr/local -- ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk -- ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk -- ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk -- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk -- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk -- ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk -+ ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk -+ ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk -+ ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk -+ ASTSPOOLDIR=/var/spool/asterisk -+ ASTLOGDIR=/var/log/asterisk -+ ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk - ASTCONFPATH=$(ASTETCDIR)/asterisk.conf -- ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin -- ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin -- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run -- ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man -- # XXX end FreeBSD paths -+ ASTBINDIR=$(INSTALL_PREFIX)/bin -+ ASTSBINDIR=$(INSTALL_PREFIX)/sbin -+ ASTVARRUNDIR=/var/run -+ ASTMANDIR=$(INSTALL_PREFIX)/man - - endif # FreeBSD - -@@ -307,7 +304,7 @@ - - ifndef WITHOUT_ZAPTEL - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) - ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS - endif - -@@ -414,7 +411,7 @@ - endif - - # This is used when generating the doxygen documentation --ifneq ($(wildcard /usr/local/bin/dot)$(wildcard /usr/bin/dot),) -+ifneq ($(wildcard $(LOCALBASE)/bin/dot)$(wildcard /usr/bin/dot),) - HAVEDOT=yes - else - HAVEDOT=no -@@ -431,7 +428,7 @@ - @echo " + $(MAKE) install +" - @echo " +-------------------------------------------+" - --all: cleantest depend asterisk subdirs -+all: cleantest depend asterisk subdirs manpage - - #ifneq ($(wildcard tags),) - ctags: tags -@@ -450,13 +447,13 @@ - cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure - $(MAKE) -C editline libedit.a - --db1-ast/libdb1.a: FORCE -- @if [ -d db1-ast ]; then \ -- $(MAKE) -C db1-ast libdb1.a ; \ -- else \ -- echo "You need to do a cvs update -d not just cvs update"; \ -- exit 1; \ -- fi -+#db1-ast/libdb1.a: FORCE -+# @if [ -d db1-ast ]; then \ -+# $(MAKE) -C db1-ast libdb1.a ; \ -+# else \ -+# echo "You need to do a cvs update -d not just cvs update"; \ -+# exit 1; \ -+# fi - - ifneq ($(wildcard .depend),) - include .depend -@@ -480,10 +477,10 @@ - - manpage: asterisk.8 - --asterisk.8: asterisk.sgml -- rm -f asterisk.8 -- docbook2man asterisk.sgml -- mv ./*.8 asterisk.8 -+#asterisk.8: asterisk.sgml -+# rm -f asterisk.8 -+# docbook2man asterisk.sgml -+# mv ./*.8 asterisk.8 - - asterisk.pdf: asterisk.sgml - docbook2pdf asterisk.sgml -@@ -523,14 +520,14 @@ - cygwin_a: - $(MAKE) -C cygwin all - --asterisk: $(CYGLOADER) editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS) -+asterisk: $(CYGLOADER) editline/libedit.a stdtime/libtime.a $(OBJS) - build_tools/make_build_h > include/asterisk/build.h.tmp - if cmp -s include/asterisk/build.h.tmp include/asterisk/build.h ; then echo ; else \ - mv include/asterisk/build.h.tmp include/asterisk/build.h ; \ - fi - rm -f include/asterisk/build.h.tmp - $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c -- $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS) -+ $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) stdtime/libtime.a $(LIBS) - - muted: muted.o - $(CC) $(AUDIO_LIBS) -o muted muted.o -@@ -552,12 +549,12 @@ - - datafiles: all - if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros - for x in sounds/digits/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ -@@ -565,34 +562,34 @@ - done - for x in sounds/silence/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate - for x in sounds/dictate/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters - for x in sounds/letters/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic - for x in sounds/phonetic/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ -@@ -600,18 +597,18 @@ - done - for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-* sounds/hours* sounds/minute* sounds/second* ; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/images - for x in images/*.jpg; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \ - done -- mkdir -p $(DESTDIR)$(AGI_DIR) -+ $(MKDIR) $(DESTDIR)$(AGI_DIR) - - update: - @if [ -d .svn ]; then \ -@@ -640,47 +637,47 @@ - OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) - - bininstall: all -- mkdir -p $(DESTDIR)$(MODULES_DIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- mkdir -p $(DESTDIR)$(ASTBINDIR) -- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor -- if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi -- if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi -- if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi -+ $(MKDIR) $(DESTDIR)$(MODULES_DIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor -+ if [ -f asterisk ]; then $(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/; fi -+ if [ -f cygwin/asterisk.exe ]; then $(BSD_INSTALL_PROGRAM) cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi -+ if [ -f asterisk.dll ]; then $(BSD_INSTALL_PROGRAM) asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi - $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk -- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ - if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ - cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ - chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ - fi -- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) -- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) -+ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR) -+ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) - if [ -n "$(OLDHEADERS)" ]; then \ - rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\ - fi -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax -- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -- $(INSTALL) -m 644 asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax -+ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -+ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -+ $(BSD_INSTALL_DATA) asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 - if [ -d contrib/firmware/iax ]; then \ -- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \ -+ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \ - else \ - echo "You need to do cvs update -d not just cvs update" ; \ - fi -@@ -710,46 +707,28 @@ - echo " WARNING WARNING WARNING" ;\ - fi - --install: all datafiles bininstall install-subdirs -+install: all datafiles bininstall install-subdirs samples - @if [ -x /usr/sbin/asterisk-post-install ]; then \ - /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ - fi -- @echo " +---- Asterisk Installation Complete -------+" -- @echo " + +" -- @echo " + YOU MUST READ THE SECURITY DOCUMENT +" -- @echo " + +" -- @echo " + Asterisk has successfully been installed. +" -- @echo " + If you would like to install the sample +" -- @echo " + configuration files (overwriting any +" -- @echo " + existing config files), run: +" -- @echo " + +" -- @echo " + $(MAKE) samples +" -- @echo " + +" -- @echo " +----------------- or ---------------------+" -- @echo " + +" -- @echo " + You can go ahead and install the asterisk +" -- @echo " + program documentation now or later run: +" -- @echo " + +" -- @echo " + $(MAKE) progdocs +" -- @echo " + +" -- @echo " + **Note** This requires that you have +" -- @echo " + doxygen installed on your local system +" -- @echo " +-------------------------------------------+" - @$(MAKE) -s oldmodcheck - - upgrade: all bininstall - - adsi: -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.adsi; do \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x`-dist; \ - if [ ! -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \ - fi ; \ - done - - samples: adsi -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ echo ADSI INSTALL $(BSD_INSTALL_DATA) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.sample; do \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`-dist;\ - if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ - if [ "$(OVERWRITE)" = "y" ]; then \ - if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \ -@@ -762,7 +741,7 @@ - continue; \ - fi ;\ - fi ; \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ - done - if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ - ( \ -@@ -822,25 +801,25 @@ - echo "; Default: strict"; \ - echo ";"; \ - echo ";translation_algorithm = strict"; \ -- ) > $(DESTDIR)$(ASTCONFPATH) ; \ -+ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \ - else \ - echo "Skipping asterisk.conf creation"; \ - fi -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ - for x in sounds/demo-*; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ - for x in sounds/moh/*.mp3 sounds/moh/LICENSE; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ - done - rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3 -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX - :> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm - for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \ - cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \ -@@ -854,9 +833,9 @@ - @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 ) - @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 ) - $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi -- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk -+ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk - for x in images/*.gif; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ - done - @echo " +--------- Asterisk Web Voicemail ----------+" - @echo " + +" -@@ -883,10 +862,10 @@ - - __rpm: include/asterisk/version.h spec - rm -rf /tmp/asterisk ; \ -- mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \ -+ $(MKDIR) /tmp/asterisk/redhat/RPMS/i386 ; \ - $(MAKE) DESTDIR=/tmp/asterisk install ; \ - $(MAKE) DESTDIR=/tmp/asterisk samples ; \ -- mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \ -+ $(MKDIR) /tmp/asterisk/etc/rc.d/init.d ; \ - cp -f contrib/init.d/rc.redhat.asterisk /tmp/asterisk/etc/rc.d/init.d/asterisk ; \ - rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec - diff --git a/net/asterisk12/files/patch-agi::Makefile b/net/asterisk12/files/patch-agi::Makefile deleted file mode 100644 index 4615eef8ec94..000000000000 --- a/net/asterisk12/files/patch-agi::Makefile +++ /dev/null @@ -1,25 +0,0 @@ ---- agi/Makefile.orig Sun Jan 22 17:53:44 2006 -+++ agi/Makefile Sun Jan 22 17:55:53 2006 -@@ -11,7 +11,9 @@ - # the GNU General Public License - # - --AGIS=agi-test.agi eagi-test eagi-sphinx-test -+AGIS_BIN=eagi-test eagi-sphinx-test -+AGIS_SCR=agi-test.agi -+AGIS=$(AGIS_SCR) $(AGIS_BIN) - - CFLAGS+= - -@@ -27,8 +29,9 @@ - all: depend $(AGIS) - - install: all -- mkdir -p $(DESTDIR)$(AGI_DIR) -- for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done -+ $(MKDIR) -p $(DESTDIR)$(AGI_DIR) -+ for x in $(AGIS_BIN); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(AGI_DIR) ; done -+ for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done - - eagi-test: eagi-test.o - $(CC) $(CFLAGS) -o eagi-test eagi-test.o $(LIBS) diff --git a/net/asterisk12/files/patch-apps::Makefile b/net/asterisk12/files/patch-apps::Makefile deleted file mode 100644 index 2c930213bc47..000000000000 --- a/net/asterisk12/files/patch-apps::Makefile +++ /dev/null @@ -1,72 +0,0 @@ - -$FreeBSD$ - ---- apps/Makefile.orig -+++ apps/Makefile -@@ -45,25 +45,27 @@ - #APPS+=app_rpt.so - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel/zaptel.h),) - APPS+=app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so app_page.so - endif - endif # WITHOUT_ZAPTEL - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) -+ifdef WITH_FAX -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp.h),) -+APPS+=app_rxfax.so app_txfax.so -+endif -+endif -+ -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) - APPS+=app_osplookup.so - endif - - ifeq ($(findstring BSD,${OSARCH}),BSD) --CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - --CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs) --ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),) -- ifneq (${CURLLIBS},) -- APPS+=app_curl.so -- endif --endif -+CURLLIBS=$(shell $(CROSS_COMPILE_BIN)$(LOCALBASE)/bin/curl-config --libs) -+APPS+=app_curl.so - - ifeq (${OSARCH},CYGWIN) - CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols -@@ -95,18 +97,26 @@ - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -ltonezone - - install: all -- for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(APPS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so - rm -f $(DESTDIR)$(MODULES_DIR)/app_qcall.so - - app_curl.so: app_curl.o - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CURLLIBS) - -+ifdef WITH_FAX -+app_rxfax.so : app_rxfax.o -+ $(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lspandsp -ltiff -+ -+app_txfax.so : app_txfax.o -+ $(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lspandsp -ltiff -+endif -+ - app_sql_postgres.o: app_sql_postgres.c -- $(CC) -pipe -I$(CROSS_COMPILE_TARGET)/usr/local/pgsql/include -I$(CROSS_COMPILE_TARGET)/usr/include/postgresql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c -+ $(CC) -I$(LOCALBASE)/include/pgsql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c - - app_sql_postgres.so: app_sql_postgres.o -- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L/usr/local/pgsql/lib -lpq -+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L$(LOCALBASE)/lib -lpq - - app_sql_odbc.so: app_sql_odbc.o - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc diff --git a/net/asterisk12/files/patch-apps::app_flash.c b/net/asterisk12/files/patch-apps::app_flash.c deleted file mode 100644 index e17165340745..000000000000 --- a/net/asterisk12/files/patch-apps::app_flash.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- apps/app_flash.c -+++ apps/app_flash.c -@@ -31,7 +31,7 @@ - #ifdef __linux__ - #include - #else --#include -+#include - #endif /* __linux__ */ - - #include "asterisk.h" diff --git a/net/asterisk12/files/patch-apps::app_meetme.c b/net/asterisk12/files/patch-apps::app_meetme.c deleted file mode 100644 index fbb0a6bfd663..000000000000 --- a/net/asterisk12/files/patch-apps::app_meetme.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- apps/app_meetme.c -+++ apps/app_meetme.c -@@ -32,7 +32,7 @@ - #ifdef __linux__ - #include - #else --#include -+#include - #endif /* __linux__ */ - - #include "asterisk.h" diff --git a/net/asterisk12/files/patch-apps::app_rpt.c b/net/asterisk12/files/patch-apps::app_rpt.c deleted file mode 100644 index 074b94fa53c2..000000000000 --- a/net/asterisk12/files/patch-apps::app_rpt.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- apps/app_rpt.c -+++ apps/app_rpt.c -@@ -176,7 +176,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff --git a/net/asterisk12/files/patch-apps::app_rxfax.c b/net/asterisk12/files/patch-apps::app_rxfax.c deleted file mode 100644 index cabfb1a98604..000000000000 --- a/net/asterisk12/files/patch-apps::app_rxfax.c +++ /dev/null @@ -1,399 +0,0 @@ - -$FreeBSD$ - ---- apps/app_rxfax.c.orig -+++ apps/app_rxfax.c -@@ -0,0 +1,393 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Trivial application to receive a TIFF FAX file -+ * -+ * Copyright (C) 2003, Steve Underwood -+ * -+ * Steve Underwood -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include -+#include -+#include -+#if !defined(__FreeBSD__) || __FreeBSD_version < 500028 -+#include -+#else -+#include -+#endif -+#include -+#include -+#if !defined(__FreeBSD__) || __FreeBSD_version >= 503000 -+#include -+#endif -+#include -+ -+#include -+ -+#include "asterisk.h" -+ -+ASTERISK_FILE_VERSION(__FILE__, "$Revision:$") -+ -+#include "asterisk/lock.h" -+#include "asterisk/file.h" -+#include "asterisk/logger.h" -+#include "asterisk/channel.h" -+#include "asterisk/pbx.h" -+#include "asterisk/module.h" -+#include "asterisk/translate.h" -+#include "asterisk/dsp.h" -+#include "asterisk/manager.h" -+ -+static char *tdesc = "Trivial FAX Receive Application"; -+ -+static char *app = "RxFAX"; -+ -+static char *synopsis = "Receive a FAX to a file"; -+ -+static char *descrip = -+" RxFAX(filename[|caller][|debug]): Receives a FAX from the channel into the\n" -+"given filename. If the file exists it will be overwritten. The file\n" -+"should be in TIFF/F format.\n" -+"The \"caller\" option makes the application behave as a calling machine,\n" -+"rather than the answering machine. The default behaviour is to behave as\n" -+"an answering machine.\n" -+"Uses LOCALSTATIONID to identify itself to the remote end.\n" -+" LOCALHEADERINFO to generate a header line on each page.\n" -+"Sets REMOTESTATIONID to the sender CSID.\n" -+" FAXPAGES to the number of pages received.\n" -+" FAXBITRATE to the transmition rate.\n" -+" FAXRESOLUTION to the resolution.\n" -+"Returns -1 when the user hangs up.\n" -+"Returns 0 otherwise.\n"; -+ -+STANDARD_LOCAL_USER; -+ -+LOCAL_USER_DECL; -+ -+#define MAX_BLOCK_SIZE 240 -+ -+static void span_message(int level, const char *msg) -+{ -+ int ast_level; -+ -+ if (level == SPAN_LOG_WARNING) -+ ast_level = __LOG_WARNING; -+ else if (level == SPAN_LOG_WARNING) -+ ast_level = __LOG_WARNING; -+ else -+ ast_level = __LOG_DEBUG; -+ ast_log(ast_level, __FILE__, __LINE__, __PRETTY_FUNCTION__, msg); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void t30_flush(t30_state_t *s, int which) -+{ -+ //TODO: -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void phase_e_handler(t30_state_t *s, void *user_data, int result) -+{ -+ struct ast_channel *chan; -+ t30_stats_t t; -+ char local_ident[21]; -+ char far_ident[21]; -+ char buf[11]; -+ -+ chan = (struct ast_channel *) user_data; -+ if (result == T30_ERR_OK) -+ { -+ t30_get_transfer_statistics(s, &t); -+ t30_get_far_ident(s, far_ident); -+ t30_get_local_ident(s, local_ident); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Fax successfully received.\n"); -+ ast_log(LOG_DEBUG, "Remote station id: %s\n", far_ident); -+ ast_log(LOG_DEBUG, "Local station id: %s\n", local_ident); -+ ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); -+ ast_log(LOG_DEBUG, "Image resolution: %i x %i\n", t.column_resolution, t.row_resolution); -+ ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ manager_event(EVENT_FLAG_CALL, -+ "FaxReceived", "Channel: %s\nExten: %s\nCallerID: %s\nRemoteStationID: %s\nLocalStationID: %s\nPagesTransferred: %i\nResolution: %i\nTransferRate: %i\nFileName: %s\n", -+ chan->name, -+ chan->exten, -+ (chan->cid.cid_num) ? chan->cid.cid_num : "", -+ far_ident, -+ local_ident, -+ t.pages_transferred, -+ t.row_resolution, -+ t.bit_rate, -+ s->rx_file); -+ pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident); -+ snprintf(buf, sizeof(buf), "%i", t.pages_transferred); -+ pbx_builtin_setvar_helper(chan, "FAXPAGES", buf); -+ snprintf(buf, sizeof(buf), "%i", t.row_resolution); -+ pbx_builtin_setvar_helper(chan, "FAXRESOLUTION", buf); -+ snprintf(buf, sizeof(buf), "%i", t.bit_rate); -+ pbx_builtin_setvar_helper(chan, "FAXBITRATE", buf); -+ } -+ else -+ { -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Fax receive not successful - result (%d) %s.\n", result, t30_completion_code_to_str(result)); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ } -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void phase_d_handler(t30_state_t *s, void *user_data, int result) -+{ -+ struct ast_channel *chan; -+ t30_stats_t t; -+ -+ chan = (struct ast_channel *) user_data; -+ if (result) -+ { -+ t30_get_transfer_statistics(s, &t); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); -+ ast_log(LOG_DEBUG, "Image size: %i x %i\n", t.columns, t.rows); -+ ast_log(LOG_DEBUG, "Image resolution %i x %i\n", t.column_resolution, t.row_resolution); -+ ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); -+ ast_log(LOG_DEBUG, "Bad rows %i\n", t.bad_rows); -+ ast_log(LOG_DEBUG, "Longest bad row run %i\n", t.longest_bad_row_run); -+ ast_log(LOG_DEBUG, "Compression type %i\n", t.encoding); -+ ast_log(LOG_DEBUG, "Image size (bytes) %i\n", t.image_size); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ } -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static int rxfax_exec(struct ast_channel *chan, void *data) -+{ -+ int res = 0; -+ char template_file[256]; -+ char target_file[256]; -+ char *s; -+ char *t; -+ char *v; -+ char *x; -+ int option; -+ int len; -+ int i; -+ t30_state_t fax; -+ int calling_party; -+ int verbose; -+ int samples; -+ -+ struct localuser *u; -+ struct ast_frame *inf = NULL; -+ struct ast_frame outf; -+ -+ int original_read_fmt; -+ int original_write_fmt; -+ -+ uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET]; -+ uint8_t *buf = __buf + AST_FRIENDLY_OFFSET; -+ -+ if (chan == NULL) -+ { -+ ast_log(LOG_WARNING, "Fax receive channel is NULL. Giving up.\n"); -+ return -1; -+ } -+ -+ span_set_message_handler(span_message); -+ -+ /* The next few lines of code parse out the filename and header from the input string */ -+ if (data == NULL) -+ { -+ /* No data implies no filename or anything is present */ -+ ast_log(LOG_WARNING, "Rxfax requires an argument (filename)\n"); -+ return -1; -+ } -+ -+ calling_party = FALSE; -+ verbose = FALSE; -+ target_file[0] = '\0'; -+ -+ for (option = 0, v = s = data; v; option++, s++) -+ { -+ t = s; -+ v = strchr(s, '|'); -+ s = (v) ? v : s + strlen(s); -+ strncpy((char *) buf, t, s - t); -+ buf[s - t] = '\0'; -+ if (option == 0) -+ { -+ /* The first option is always the file name */ -+ len = s - t; -+ if (len > 255) -+ len = 255; -+ strncpy(target_file, t, len); -+ target_file[len] = '\0'; -+ /* Allow the use of %d in the file name for a wild card of sorts, to -+ create a new file with the specified name scheme */ -+ if ((x = strchr(target_file, '%')) && x[1] == 'd') -+ { -+ strcpy(template_file, target_file); -+ i = 0; -+ do -+ { -+ snprintf(target_file, 256, template_file, 1); -+ i++; -+ } -+ while (ast_fileexists(target_file, "", chan->language) != -1); -+ } -+ } -+ else if (strncmp("caller", t, s - t) == 0) -+ { -+ calling_party = TRUE; -+ } -+ else if (strncmp("debug", t, s - t) == 0) -+ { -+ verbose = TRUE; -+ } -+ } -+ -+ /* Done parsing */ -+ -+ LOCAL_USER_ADD(u); -+ -+ if (chan->_state != AST_STATE_UP) -+ { -+ /* Shouldn't need this, but checking to see if channel is already answered -+ * Theoretically asterisk should already have answered before running the app */ -+ res = ast_answer(chan); -+ } -+ -+ if (!res) -+ { -+ original_read_fmt = chan->readformat; -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n"); -+ return -1; -+ } -+ } -+ original_write_fmt = chan->writeformat; -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n"); -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ return -1; -+ } -+ } -+ fax_init(&fax, calling_party, NULL); -+ if (verbose) -+ fax.logging.level = SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW; -+ x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"); -+ if (x && x[0]) -+ t30_set_local_ident(&fax, x); -+ x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO"); -+ if (x && x[0]) -+ t30_set_header_info(&fax, x); -+ t30_set_rx_file(&fax, target_file, -1); -+ //t30_set_phase_b_handler(&fax, phase_b_handler, chan); -+ t30_set_phase_d_handler(&fax, phase_d_handler, chan); -+ t30_set_phase_e_handler(&fax, phase_e_handler, chan); -+ while (ast_waitfor(chan, -1) > -1) -+ { -+ inf = ast_read(chan); -+ if (inf == NULL) -+ { -+ res = -1; -+ break; -+ } -+ if (inf->frametype == AST_FRAME_VOICE) -+ { -+ if (fax_rx(&fax, inf->data, inf->samples)) -+ break; -+ samples = (inf->samples <= MAX_BLOCK_SIZE) ? inf->samples : MAX_BLOCK_SIZE; -+ len = fax_tx(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples); -+ if (len) -+ { -+ memset(&outf, 0, sizeof(outf)); -+ outf.frametype = AST_FRAME_VOICE; -+ outf.subclass = AST_FORMAT_SLINEAR; -+ outf.datalen = len*sizeof(int16_t); -+ outf.samples = len; -+ outf.data = &buf[AST_FRIENDLY_OFFSET]; -+ outf.offset = AST_FRIENDLY_OFFSET; -+ outf.src = "RxFAX"; -+ if (ast_write(chan, &outf) < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno)); -+ break; -+ } -+ } -+ } -+ ast_frfree(inf); -+ } -+ if (inf == NULL) -+ { -+ ast_log(LOG_DEBUG, "Got hangup\n"); -+ res = -1; -+ } -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ } -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, original_write_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name); -+ } -+ fax_release(&fax); -+ } -+ else -+ { -+ ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name); -+ } -+ LOCAL_USER_REMOVE(u); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int unload_module(void) -+{ -+ STANDARD_HANGUP_LOCALUSERS; -+ return ast_unregister_application(app); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int load_module(void) -+{ -+ return ast_register_application(app, rxfax_exec, synopsis, descrip); -+} -+ -+char *description(void) -+{ -+ return tdesc; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int usecount(void) -+{ -+ int res; -+ STANDARD_USECOUNT(res); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+char *key(void) -+{ -+ return ASTERISK_GPL_KEY; -+} -+/*- End of function --------------------------------------------------------*/ -+/*- End of file ------------------------------------------------------------*/ diff --git a/net/asterisk12/files/patch-apps::app_txfax.c b/net/asterisk12/files/patch-apps::app_txfax.c deleted file mode 100644 index 8d81a55ae13c..000000000000 --- a/net/asterisk12/files/patch-apps::app_txfax.c +++ /dev/null @@ -1,326 +0,0 @@ - -$FreeBSD$ - ---- apps/app_txfax.c.orig -+++ apps/app_txfax.c -@@ -0,0 +1,320 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Trivial application to send a TIFF file as a FAX -+ * -+ * Copyright (C) 2003, Steve Underwood -+ * -+ * Steve Underwood -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include -+#include -+#include -+#if !defined(__FreeBSD__) || __FreeBSD_version < 500028 -+#include -+#else -+#include -+#endif -+#include -+#include -+#if !defined(__FreeBSD__) || __FreeBSD_version >= 503000 -+#include -+#endif -+#include -+ -+#include -+ -+#include "asterisk.h" -+ -+ASTERISK_FILE_VERSION(__FILE__, "$Revision:$") -+ -+#include "asterisk/lock.h" -+#include "asterisk/file.h" -+#include "asterisk/logger.h" -+#include "asterisk/channel.h" -+#include "asterisk/pbx.h" -+#include "asterisk/module.h" -+#include "asterisk/translate.h" -+ -+static char *tdesc = "Trivial FAX Transmit Application"; -+ -+static char *app = "TxFAX"; -+ -+static char *synopsis = "Send a FAX file"; -+ -+static char *descrip = -+" TxFAX(filename[|caller][|debug]): Send a given TIFF file to the channel as a FAX.\n" -+"The \"caller\" option makes the application behave as a calling machine,\n" -+"rather than the answering machine. The default behaviour is to behave as\n" -+"an answering machine.\n" -+"Uses LOCALSTATIONID to identify itself to the remote end.\n" -+" LOCALHEADERINFO to generate a header line on each page.\n" -+"Sets REMOTESTATIONID to the receiver CSID.\n" -+"Returns -1 when the user hangs up, or if the file does not exist.\n" -+"Returns 0 otherwise.\n"; -+ -+STANDARD_LOCAL_USER; -+ -+LOCAL_USER_DECL; -+ -+#define MAX_BLOCK_SIZE 240 -+ -+static void span_message(int level, const char *msg) -+{ -+ int ast_level; -+ -+ if (level == SPAN_LOG_WARNING) -+ ast_level = __LOG_WARNING; -+ else if (level == SPAN_LOG_WARNING) -+ ast_level = __LOG_WARNING; -+ else -+ ast_level = __LOG_DEBUG; -+ ast_log(ast_level, __FILE__, __LINE__, __PRETTY_FUNCTION__, msg); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void t30_flush(t30_state_t *s, int which) -+{ -+ //TODO: -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void phase_e_handler(t30_state_t *s, void *user_data, int result) -+{ -+ struct ast_channel *chan; -+ char far_ident[21]; -+ -+ chan = (struct ast_channel *) user_data; -+ if (result == T30_ERR_OK) -+ { -+ t30_get_far_ident(s, far_ident); -+ pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident); -+ } -+ else -+ { -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Fax send not successful - result (%d) %s.\n", result, t30_completion_code_to_str(result)); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ } -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static int txfax_exec(struct ast_channel *chan, void *data) -+{ -+ int res = 0; -+ char source_file[256]; -+ char *x; -+ char *s; -+ char *t; -+ char *v; -+ int option; -+ int len; -+ t30_state_t fax; -+ int calling_party; -+ int verbose; -+ int samples; -+ -+ struct localuser *u; -+ struct ast_frame *inf = NULL; -+ struct ast_frame outf; -+ -+ int original_read_fmt; -+ int original_write_fmt; -+ -+ uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET]; -+ uint8_t *buf = __buf + AST_FRIENDLY_OFFSET; -+ -+ if (chan == NULL) -+ { -+ ast_log(LOG_WARNING, "Fax transmit channel is NULL. Giving up.\n"); -+ return -1; -+ } -+ -+ span_set_message_handler(span_message); -+ -+ /* The next few lines of code parse out the filename and header from the input string */ -+ if (data == NULL) -+ { -+ /* No data implies no filename or anything is present */ -+ ast_log(LOG_WARNING, "Txfax requires an argument (filename)\n"); -+ return -1; -+ } -+ -+ calling_party = FALSE; -+ verbose = FALSE; -+ source_file[0] = '\0'; -+ -+ for (option = 0, v = s = data; v; option++, s++) -+ { -+ t = s; -+ v = strchr(s, '|'); -+ s = (v) ? v : s + strlen(s); -+ strncpy((char *) buf, t, s - t); -+ buf[s - t] = '\0'; -+ if (option == 0) -+ { -+ /* The first option is always the file name */ -+ len = s - t; -+ if (len > 255) -+ len = 255; -+ strncpy(source_file, t, len); -+ source_file[len] = '\0'; -+ } -+ else if (strncmp("caller", t, s - t) == 0) -+ { -+ calling_party = TRUE; -+ } -+ else if (strncmp("debug", t, s - t) == 0) -+ { -+ verbose = TRUE; -+ } -+ } -+ -+ /* Done parsing */ -+ -+ LOCAL_USER_ADD(u); -+ -+ if (chan->_state != AST_STATE_UP) -+ { -+ /* Shouldn't need this, but checking to see if channel is already answered -+ * Theoretically asterisk should already have answered before running the app */ -+ res = ast_answer(chan); -+ } -+ -+ if (!res) -+ { -+ original_read_fmt = chan->readformat; -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n"); -+ return -1; -+ } -+ } -+ original_write_fmt = chan->writeformat; -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n"); -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ return -1; -+ } -+ } -+ fax_init(&fax, calling_party, NULL); -+ if (verbose) -+ fax.logging.level = SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW; -+ -+ x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"); -+ if (x && x[0]) -+ t30_set_local_ident(&fax, x); -+ x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO"); -+ if (x && x[0]) -+ t30_set_header_info(&fax, x); -+ t30_set_tx_file(&fax, source_file, -1, -1); -+ //t30_set_phase_b_handler(&fax, phase_b_handler, chan); -+ //t30_set_phase_d_handler(&fax, phase_d_handler, chan); -+ t30_set_phase_e_handler(&fax, phase_e_handler, chan); -+ while (ast_waitfor(chan, -1) > -1) -+ { -+ inf = ast_read(chan); -+ if (inf == NULL) -+ { -+ res = -1; -+ break; -+ } -+ if (inf->frametype == AST_FRAME_VOICE) -+ { -+ if (fax_rx(&fax, inf->data, inf->samples)) -+ break; -+ samples = (inf->samples <= MAX_BLOCK_SIZE) ? inf->samples : MAX_BLOCK_SIZE; -+ len = fax_tx(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples); -+ if (len) -+ { -+ memset(&outf, 0, sizeof(outf)); -+ outf.frametype = AST_FRAME_VOICE; -+ outf.subclass = AST_FORMAT_SLINEAR; -+ outf.datalen = len*sizeof(int16_t); -+ outf.samples = len; -+ outf.data = &buf[AST_FRIENDLY_OFFSET]; -+ outf.offset = AST_FRIENDLY_OFFSET; -+ if (ast_write(chan, &outf) < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno)); -+ break; -+ } -+ } -+ } -+ ast_frfree(inf); -+ } -+ if (inf == NULL) -+ { -+ ast_log(LOG_DEBUG, "Got hangup\n"); -+ res = -1; -+ } -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ } -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, original_write_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name); -+ } -+ fax_release(&fax); -+ } -+ else -+ { -+ ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name); -+ } -+ LOCAL_USER_REMOVE(u); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int unload_module(void) -+{ -+ STANDARD_HANGUP_LOCALUSERS; -+ return ast_unregister_application(app); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int load_module(void) -+{ -+ return ast_register_application(app, txfax_exec, synopsis, descrip); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+char *description(void) -+{ -+ return tdesc; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int usecount(void) -+{ -+ int res; -+ -+ STANDARD_USECOUNT(res); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+char *key(void) -+{ -+ return ASTERISK_GPL_KEY; -+} -+/*- End of function --------------------------------------------------------*/ -+/*- End of file ------------------------------------------------------------*/ diff --git a/net/asterisk12/files/patch-apps::app_zapbarge.c b/net/asterisk12/files/patch-apps::app_zapbarge.c deleted file mode 100644 index eb3f757b17dd..000000000000 --- a/net/asterisk12/files/patch-apps::app_zapbarge.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- apps/app_zapbarge.c -+++ apps/app_zapbarge.c -@@ -36,7 +36,7 @@ - #ifdef __linux__ - #include - #else --#include -+#include - #endif /* __linux__ */ - - #include "asterisk.h" diff --git a/net/asterisk12/files/patch-apps::app_zapras.c b/net/asterisk12/files/patch-apps::app_zapras.c deleted file mode 100644 index 5d32407347d7..000000000000 --- a/net/asterisk12/files/patch-apps::app_zapras.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- apps/app_zapras.c -+++ apps/app_zapras.c -@@ -43,7 +43,7 @@ - #ifdef __linux__ - #include - #else --#include -+#include - #endif /* __linux__ */ - - #include "asterisk.h" diff --git a/net/asterisk12/files/patch-apps::app_zapscan.c b/net/asterisk12/files/patch-apps::app_zapscan.c deleted file mode 100644 index 081bad2a8ef1..000000000000 --- a/net/asterisk12/files/patch-apps::app_zapscan.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- apps/app_zapscan.c -+++ apps/app_zapscan.c -@@ -38,7 +38,7 @@ - #ifdef __linux__ - #include - #else --#include -+#include - #endif /* __linux__ */ - - #include "asterisk.h" diff --git a/net/asterisk12/files/patch-cdr::Makefile b/net/asterisk12/files/patch-cdr::Makefile deleted file mode 100644 index 5b905c7778ef..000000000000 --- a/net/asterisk12/files/patch-cdr::Makefile +++ /dev/null @@ -1,89 +0,0 @@ - -$FreeBSD$ - ---- cdr/Makefile.orig -+++ cdr/Makefile -@@ -21,8 +21,8 @@ - endif - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -+ SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. -@@ -38,21 +38,23 @@ - # - # unixODBC stuff... - # --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),) -+ifdef WITH_ODBC -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/odbcinst.h),) - MODS+=cdr_odbc.so - endif -+endif - - # - # FreeTDS stuff... - # --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),) -- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.64),1) -+ifdef WITH_FREETDS -+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.64),1) - CFLAGS += -DFREETDS_0_64 - else -- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1) -+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1) - CFLAGS += -DFREETDS_0_63 - else -- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.62),1) -+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.62),1) - CFLAGS += -DFREETDS_0_62 - else - CFLAGS += -DFREETDS_PRE_0_62 -@@ -65,7 +67,7 @@ - # - # PGSQL stuff... Autoconf anyone?? - # --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/pgsql/include/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) - MODS+=cdr_pgsql.so - endif - -@@ -76,9 +78,9 @@ - MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib/postgresql - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include),) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/pgsql/include -- MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/local/pgsql/lib -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/pgsql/include),) -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/pgsql/include -+ MLFLAGS+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/pgsql/lib - endif - - ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql),) -@@ -86,9 +88,9 @@ - MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib/pgsql - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql),) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/pgsql -- MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib/pgsql -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql),) -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql -+ MLFLAGS+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/pgsql - endif - - ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include),) -@@ -114,7 +116,7 @@ - all: depend $(MODS) - - install: all -- for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - clean: - rm -f *.so *.o .depend diff --git a/net/asterisk12/files/patch-channel.c b/net/asterisk12/files/patch-channel.c deleted file mode 100644 index 1c2e60452e2a..000000000000 --- a/net/asterisk12/files/patch-channel.c +++ /dev/null @@ -1,27 +0,0 @@ - -$FreeBSD$ - ---- channel.c.orig -+++ channel.c -@@ -36,7 +36,7 @@ - #ifdef __linux__ - #include - #else --#include -+#include - #endif /* __linux__ */ - #ifndef ZT_TIMERPING - #error "You need newer zaptel! Please svn update zaptel" -@@ -1564,6 +1564,12 @@ - if (!havewhen) - time(&now); - diff = c[x]->whentohangup - now; -+ if (diff < 1) { -+ /* Should already be hungup */ -+ c[x]->_softhangup |= AST_SOFTHANGUP_TIMEOUT; -+ ast_mutex_unlock(&c[x]->lock); -+ return c[x]; -+ } - if (!havewhen || (diff < whentohangup)) { - havewhen++; - whentohangup = diff; diff --git a/net/asterisk12/files/patch-channels::Makefile b/net/asterisk12/files/patch-channels::Makefile deleted file mode 100644 index 56539d83d6b9..000000000000 --- a/net/asterisk12/files/patch-channels::Makefile +++ /dev/null @@ -1,87 +0,0 @@ - -$FreeBSD$ - ---- channels/Makefile.orig -+++ channels/Makefile -@@ -50,8 +50,8 @@ - endif - - ifeq (${OSARCH},FreeBSD) -- PTLIB=-lpt_FreeBSD_x86_r -- H323LIB=-lh323_FreeBSD_x86_r -+ PTLIB=-lpt_r -+ H323LIB=-lh323_r - CHANH323LIB=-pthread - endif - -@@ -75,7 +75,7 @@ - SOLINK+=-lrt - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/ixjuser.h),) - CHANNEL_LIBS+=chan_phone.so - endif - -@@ -83,7 +83,7 @@ - CFLAGS+=-DHAVE_LINUX_COMPILER_H - endif - --ifneq ($(wildcard h323/libchanh323.a),) -+ifdef WITH_H323 - CHANNEL_LIBS+=chan_h323.so - endif - -@@ -102,12 +102,12 @@ - CHANNEL_LIBS+=chan_alsa.so - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/libpri.so.1),) - CFLAGS+=-DZAPATA_PRI - ZAPPRI=-lpri - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/libmfcr2.so.1),) - CFLAGS+=-DZAPATA_R2 - ZAPR2=-lmfcr2 - endif -@@ -120,12 +120,12 @@ - endif - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) - ifeq (${OSARCH},NetBSD) - SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib - endif - ifeq (${OSARCH},FreeBSD) -- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - CFLAGS+=-DIAX_TRUNKING - CHANNEL_LIBS+=chan_zap.so -@@ -241,8 +241,10 @@ - chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast - $(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) -lstdc++ - else --chan_h323.so: chan_h323.o h323/libchanh323.a -- $(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat -+chan_h323.so: chan_h323.o h323/ast_h323.o -+ $(CXX) $(SOLINK) -o $@ $< h323/ast_h323.o $(CHANH323LIB) -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L/usr/lib -lcrypto -lssl -lexpat -L$(LOCALBASE)/lib -llber -lldap -lldap_r -+h323/ast_h323.o: -+ $(MAKE) -C h323 ast_h323.o - endif - - misdn/chan_misdn_lib.a: -@@ -261,8 +263,7 @@ - # $(CC) -rdynamic -shared -Xlinker -x -o $@ $< - - install: all -- for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -- if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi -+ for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk12/files/patch-channels::chan_h323.c b/net/asterisk12/files/patch-channels::chan_h323.c deleted file mode 100644 index 4ca048812ecd..000000000000 --- a/net/asterisk12/files/patch-channels::chan_h323.c +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_h323.c.orig -+++ channels/chan_h323.c -@@ -31,6 +31,7 @@ - * \ingroup channel_drivers - */ - -+#include - #include - #include - #include diff --git a/net/asterisk12/files/patch-channels::chan_iax2.c b/net/asterisk12/files/patch-channels::chan_iax2.c deleted file mode 100644 index 5057e3e8304b..000000000000 --- a/net/asterisk12/files/patch-channels::chan_iax2.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_iax2.c -+++ channels/chan_iax2.c -@@ -52,7 +52,7 @@ - #ifdef __linux__ - #include - #else --#include -+#include - #endif /* __linux__ */ - #endif - diff --git a/net/asterisk12/files/patch-channels::chan_sip.c b/net/asterisk12/files/patch-channels::chan_sip.c deleted file mode 100644 index c06789847723..000000000000 --- a/net/asterisk12/files/patch-channels::chan_sip.c +++ /dev/null @@ -1,154 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_sip.c.orig -+++ channels/chan_sip.c -@@ -339,7 +339,7 @@ - - static char default_language[MAX_LANGUAGE] = ""; - --#define DEFAULT_CALLERID "asterisk" -+#define DEFAULT_CALLERID "Unknown" - static char default_callerid[AST_MAX_EXTENSION] = DEFAULT_CALLERID; - - static char default_fromdomain[AST_MAX_EXTENSION] = ""; -@@ -483,6 +483,7 @@ - - struct sip_route { - struct sip_route *next; -+ int lr; - char hop[0]; - }; - -@@ -2835,6 +2836,8 @@ - ast_codec_pref_remove2(&tmp->nativeformats, ~i->usercapability); - fmt = ast_codec_pref_index_audio(&tmp->nativeformats, 0); - -+ pbx_builtin_setvar_helper(tmp, "SIP_CODEC_USED", ast_getformatname(fmt)); -+ - if (title) - snprintf(tmp->name, sizeof(tmp->name), "SIP/%s-%08x", title, (int)(long) i); - else if (strchr(i->fromdomain,':')) -@@ -6312,6 +6315,7 @@ - /* Make a struct route */ - thishop = malloc(sizeof(*thishop) + len); - if (thishop) { -+ thishop->lr = (strnstr(rr, ";lr", len) != NULL ? 1 : 0); - ast_copy_string(thishop->hop, rr, len); - ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop); - /* Link in */ -@@ -6337,31 +6341,41 @@ - - /* Only append the contact if we are dealing with a strict router */ - if (!head || (!ast_strlen_zero(head->hop) && strstr(head->hop,";lr") == NULL) ) { -- /* 2nd append the Contact: if there is one */ -- /* Can be multiple Contact headers, comma separated values - we just take the first */ -- contact = get_header(req, "Contact"); -- if (!ast_strlen_zero(contact)) { -- ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact); -- /* Look for <: delimited address */ -- c = strchr(contact, '<'); -- if (c) { -- /* Take to > */ -- ++c; -- len = strcspn(c, ">") + 1; -- } else { -- /* No <> - just take the lot */ -- c = contact; -- len = strlen(contact) + 1; -- } -- thishop = malloc(sizeof(*thishop) + len); -+ /* Duplicate first route from the list */ -+ if (head && head->lr) { -+ thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+strlen(head->hop)+1); - if (thishop) { -- ast_copy_string(thishop->hop, c, len); -- thishop->next = NULL; -- /* Goes at the end */ -- if (tail) -- tail->next = thishop; -- else -- head = thishop; -+ memcpy(thishop, head, sizeof(struct sip_route)+strlen(head->hop)+1); -+ thishop->next = head; -+ head = thishop; -+ } -+ } else { -+ /* Append the Contact: if there is one and first route is w/o `lr' param */ -+ /* Can be multiple Contact headers, comma separated values - we just take the first */ -+ contact = get_header(req, "Contact"); -+ if (!ast_strlen_zero(contact)) { -+ ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact); -+ /* Look for <: delimited address */ -+ c = strchr(contact, '<'); -+ if (c) { -+ /* Take to > */ -+ ++c; -+ len = strcspn(c, ">") + 1; -+ } else { -+ /* No <> - just take the lot */ -+ c = contact; -+ len = strlen(contact) + 1; -+ } -+ thishop = malloc(sizeof(*thishop) + len); -+ if (thishop) { -+ ast_copy_string(thishop->hop, c, len); -+ thishop->next = NULL; -+ /* Goes at the end */ -+ if (tail) -+ tail->next = thishop; -+ else -+ head = thishop; -+ } - } - } - } -@@ -9356,6 +9370,13 @@ - secret = p->peersecret; - md5secret = p->peermd5secret; - } -+ /* No authentication. Try to get auth info from channel vars */ -+ if (ast_strlen_zero(username)) -+ { -+ username = pbx_builtin_getvar_helper(p->owner, "SIP_AUTH_NAME"); -+ secret = pbx_builtin_getvar_helper(p->owner, "SIP_AUTH_SECRET"); -+ md5secret = pbx_builtin_getvar_helper(p->owner, "SIP_AUTH_MD5SECRET"); -+ } - if (ast_strlen_zero(username)) /* We have no authentication */ - return -1; - -@@ -10759,7 +10780,11 @@ - gotdest = get_destination(p, NULL); - - get_rdnis(p, NULL); -- extract_uri(p, req); -+ build_route(p, req, 0); -+ if (!p->route->lr) -+ strncpy(p->uri, p->route->hop, sizeof(p->uri) - 1); -+ else -+ extract_uri(p, req); - build_contact(p); - - if (gotdest) { -@@ -10780,7 +10805,6 @@ - c = sip_new(p, AST_STATE_DOWN, ast_strlen_zero(p->username) ? NULL : p->username ); - *recount = 1; - /* Save Record-Route for any later requests we make on this dialogue */ -- build_route(p, req, 0); - if (c) { - /* Pre-lock the call */ - ast_mutex_lock(&c->lock); -@@ -10867,7 +10891,12 @@ - transmit_response(p, "180 Ringing", req); - break; - case AST_STATE_UP: -- /* If this is not a re-invite or something to ignore - it's critical */ -+ /* Assuming this to be reinvite, process new SDP portion */ -+ if (!ast_strlen_zero(get_header(req, "Content-Type"))) { -+ process_sdp(p, req); -+ } else { -+ ast_log(LOG_DEBUG, "Hm.... No sdp for the moment\n"); -+ } - transmit_response_with_sdp(p, "200 OK", req, (ignore || reinvite) ? 1 : 2); - break; - default: diff --git a/net/asterisk12/files/patch-channels::chan_skinny.c b/net/asterisk12/files/patch-channels::chan_skinny.c deleted file mode 100644 index acefb8f7222c..000000000000 --- a/net/asterisk12/files/patch-channels::chan_skinny.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_skinny.c.orig -+++ channels/chan_skinny.c -@@ -99,7 +99,7 @@ - #define htolel(x) (x) - #define htoles(x) (x) - #else --#if defined(SOLARIS) || defined(__Darwin__) || defined(__NetBSD__) -+#if defined(SOLARIS) || defined(__Darwin__) || defined(__NetBSD__) || defined(__FreeBSD__) - #define __bswap_16(x) \ - ((((x) & 0xff00) >> 8) | \ - (((x) & 0x00ff) << 8)) diff --git a/net/asterisk12/files/patch-channels::chan_zap.c b/net/asterisk12/files/patch-channels::chan_zap.c deleted file mode 100644 index aee5be4ece57..000000000000 --- a/net/asterisk12/files/patch-channels::chan_zap.c +++ /dev/null @@ -1,93 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_zap.c.orig -+++ channels/chan_zap.c -@@ -51,10 +51,10 @@ - #ifdef __linux__ - #include - #else --#include -+#include - #endif /* __linux__ */ - #include --#include -+#include - #include - #ifdef ZAPATA_PRI - #include -@@ -792,6 +792,7 @@ - int cidlen; - int ringt; - int ringt_base; -+ int waitnorings; - int stripmsd; - int callwaitcas; - int callwaitrings; -@@ -2464,6 +2465,19 @@ - } - - ast_mutex_lock(&p->lock); -+ switch (p->sig) { -+ case SIG_FXSGS: -+ case SIG_FXSKS: -+ case SIG_FXSLS: -+ if((ast->_state == AST_STATE_RING) && (p->ringt > 1)) -+ { -+ p->waitnorings = 1; -+ } -+ break; -+ default: -+ break; -+ }; -+ - - index = zt_get_index(ast, p, 1); - -@@ -6323,7 +6337,37 @@ - ast_setstate(chan, AST_STATE_RING); - chan->rings = 1; - p->ringt = p->ringt_base; -+ p->waitnorings = 0; - res = ast_pbx_run(chan); -+ -+ if(p->waitnorings) -+ { -+ p->ringt = p->ringt_base; -+ for(;;) -+ { -+ int i,j=0; -+ i = ZT_IOMUX_SIGEVENT | ZT_IOMUX_NOWAIT; -+ if (ioctl(p->subs[index].zfd, ZT_IOMUX, &i) == -1) -+ break; -+ -+ if (ioctl(p->subs[index].zfd, ZT_GETEVENT, &j) == -1) -+ break; -+ -+ if(j == ZT_EVENT_RINGOFFHOOK) -+ p->ringt = p->ringt_base; -+ -+ usleep(20000); -+ -+ if (p->ringt <= 0) -+ break; -+ -+ else if (p->ringt > 0) -+ p->ringt--; -+ } -+ p->ringt = 0; -+ p->waitnorings = 0; -+ } -+ - if (res) { - ast_hangup(chan); - ast_log(LOG_WARNING, "PBX exited non-zero\n"); -@@ -6628,7 +6672,7 @@ - i = iflist; - while(i) { - if ((i->subs[SUB_REAL].zfd > -1) && i->sig && (!i->radio)) { -- if (!i->owner && !i->subs[SUB_REAL].owner) { -+ if (!i->owner && !i->subs[SUB_REAL].owner && !i->waitnorings) { - /* This needs to be watched, as it lacks an owner */ - pfds[count].fd = i->subs[SUB_REAL].zfd; - pfds[count].events = POLLPRI; diff --git a/net/asterisk12/files/patch-channels::h323::Makefile b/net/asterisk12/files/patch-channels::h323::Makefile deleted file mode 100644 index 3081dd98cf36..000000000000 --- a/net/asterisk12/files/patch-channels::h323::Makefile +++ /dev/null @@ -1,20 +0,0 @@ ---- channels/h323/Makefile.orig Mon Apr 16 17:28:08 2007 -+++ channels/h323/Makefile Mon Apr 16 17:28:21 2007 -@@ -21,8 +21,7 @@ - OPENH323DIR=$(HOME)/openh323 - endif - --clean: -- rm -f *.so *.o .depend -+include $(OPENH323DIR)/openh323u.mak - - $(SOURCES):: $(SOURCES:.cxx=.cpp) - ln -f $< $@ -@@ -31,7 +30,6 @@ - touch $(SOURCES) - - libchanh323.a: $(OBJS) -- include $(OPENH323DIR)/openh323u.mak - ar crv $@ $(OBJS) - - Makefile.ast: FORCE diff --git a/net/asterisk12/files/patch-codecs::Makefile b/net/asterisk12/files/patch-codecs::Makefile deleted file mode 100644 index 74435e63a935..000000000000 --- a/net/asterisk12/files/patch-codecs::Makefile +++ /dev/null @@ -1,71 +0,0 @@ - -$FreeBSD$ - ---- codecs/Makefile.orig -+++ codecs/Makefile -@@ -29,7 +29,7 @@ - endif - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) - ifeq (${OSARCH},NetBSD) - SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib - endif -@@ -43,28 +43,28 @@ - - UI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex.h) - UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h) --ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex.h) --ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex/speex.h) -+ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex.h) -+ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex/speex.h) - ifneq (${UI_SPEEX},) - MODSPEEX=codec_speex.so -- LIBSPEEX+=-lspeex -lm -+ LIBSPEEX+=-lspeex -lspeexdsp -lm - endif - ifneq (${UIS_SPEEX},) - MODSPEEX=codec_speex.so - CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/include/speex -- LIBSPEEX+=-lspeex -lm -+ LIBSPEEX+=-lspeex -lspeexdsp -lm - endif - ifneq (${ULI_SPEEX},) - MODSPEEX=codec_speex.so -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -- LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -- LIBSPEEX+=-lspeex -lm -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -+ LIBSPEEX=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib -+ LIBSPEEX+=-lspeex -lspeexdsp -lm - endif - ifneq (${ULIS_SPEEX},) - MODSPEEX=codec_speex.so -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/speex -- LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -- LIBSPEEX+=-lspeex -lm -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex -+ LIBSPEEX=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib -+ LIBSPEEX+=-lspeex -lspeexdsp -lm - endif - - ifneq ($(wildcard ilbc/iLBC_decode.h),) -@@ -78,7 +78,7 @@ - LIBLPC10=lpc10/liblpc10.a - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \ -@@ -139,7 +139,7 @@ - endif - - install: all -- for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(CODECS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk12/files/patch-codecs::codec_zap.c b/net/asterisk12/files/patch-codecs::codec_zap.c deleted file mode 100644 index 3aab7443d8df..000000000000 --- a/net/asterisk12/files/patch-codecs::codec_zap.c +++ /dev/null @@ -1,17 +0,0 @@ - -$FreeBSD$ - ---- codecs/codec_zap.c -+++ codecs/codec_zap.c -@@ -39,7 +39,11 @@ - #include - #include - #include -+#if defined(__linux__) - #include -+#else -+#include -+#endif - - #include "asterisk/lock.h" - #include "asterisk/translate.h" diff --git a/net/asterisk12/files/patch-codecs::gsm::Makefile b/net/asterisk12/files/patch-codecs::gsm::Makefile deleted file mode 100644 index 756d43ca6fcd..000000000000 --- a/net/asterisk12/files/patch-codecs::gsm::Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- codecs/gsm/Makefile.orig Tue May 30 22:18:30 2006 -+++ codecs/gsm/Makefile Wed Jun 14 14:07:42 2006 -@@ -51,7 +51,7 @@ - ifneq (${PROC},ppc) - ifneq (${PROC},ppc64) - ifneq (${PROC},s390) --OPTIMIZE+=-march=$(PROC) -+#OPTIMIZE+=-march=$(PROC) - endif - endif - endif diff --git a/net/asterisk12/files/patch-codecs::ilbc::Makefile b/net/asterisk12/files/patch-codecs::ilbc::Makefile deleted file mode 100644 index 26a2f20e5529..000000000000 --- a/net/asterisk12/files/patch-codecs::ilbc::Makefile +++ /dev/null @@ -1,12 +0,0 @@ - -$FreeBSD$ - ---- codecs/ilbc/Makefile.orig Fri Jan 13 11:01:07 2006 -+++ codecs/ilbc/Makefile Fri Jan 13 11:01:51 2006 -@@ -1,5 +1,5 @@ - ARCH=$(PROC) --CFLAGS+=-Wall -O3 -funroll-loops -+CFLAGS+=-Wall -funroll-loops - ifneq (${OSARCH},CYGWIN) - CFLAGS += -fPIC - endif diff --git a/net/asterisk12/files/patch-codecs_ilbc b/net/asterisk12/files/patch-codecs_ilbc deleted file mode 100644 index 167707cd510d..000000000000 --- a/net/asterisk12/files/patch-codecs_ilbc +++ /dev/null @@ -1,7194 +0,0 @@ -diff -druN codecs/ilbc/FrameClassify.c codecs/ilbc/FrameClassify.c ---- codecs/ilbc/FrameClassify.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/FrameClassify.c 2005-11-29 10:24:39.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; lnsub-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; lnsub-1; -+ pp=residual+n*SUBL; -+ for (l=0; lmode==20) l=1; -+ else l=0; -+ -+ max_ssqEn=(fssqEn[0]+bssqEn[1])*ssqEn_win[l]; -+ max_ssqEn_n=1; -+ for (n=2; nnsub; 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/FrameClassify.h codecs/ilbc/FrameClassify.h ---- codecs/ilbc/FrameClassify.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/FrameClassify.h 2005-11-29 10:24:39.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/LPCdecode.c codecs/ilbc/LPCdecode.c ---- codecs/ilbc/LPCdecode.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/LPCdecode.c 2005-11-29 10:24:39.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 -+#include -+ -+#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/LPCdecode.h codecs/ilbc/LPCdecode.h ---- codecs/ilbc/LPCdecode.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/LPCdecode.h 2005-11-29 10:24:39.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/LPCencode.c codecs/ilbc/LPCencode.c ---- codecs/ilbc/LPCencode.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/LPCencode.c 2005-11-29 10:24:39.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 -+ -+ -+ -+#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/LPCencode.h codecs/ilbc/LPCencode.h ---- codecs/ilbc/LPCencode.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/LPCencode.h 2005-11-29 10:24:39.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/StateConstructW.c codecs/ilbc/StateConstructW.c ---- codecs/ilbc/StateConstructW.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/StateConstructW.c 2005-11-29 10:24:39.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 -+#include -+ -+#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 -+#include -+ -+#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; nstate_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 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 -+#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 -+#include -+ -+/*----------------------------------------------------------------* -+ * 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; k0.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) -+#include -+#include -+ -+#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 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; iblockl; 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; iblockl; 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/doCPLC.h codecs/ilbc/doCPLC.h ---- codecs/ilbc/doCPLC.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/doCPLC.h 2005-11-29 10:24:39.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/enhancer.c codecs/ilbc/enhancer.c ---- codecs/ilbc/enhancer.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/enhancer.c 2005-11-29 10:24:39.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 -+#include -+#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 dim1 ) { -+ hfl2=(int) (dim1/2); -+ for (j=0; j= 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; imaxv) { -+ 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 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=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 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 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;iblockl-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;iblockl]; -+ for (i=0; imode==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/enhancer.h codecs/ilbc/enhancer.h ---- codecs/ilbc/enhancer.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/enhancer.h 2005-11-29 10:24:39.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/filter.c codecs/ilbc/filter.c ---- codecs/ilbc/filter.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/filter.c 2005-11-29 10:24:39.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 -+#include -+#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 -+ -+/*----------------------------------------------------------------* -+ * 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 -+ -+#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; nmaxlsf) { -+ lsf[pos]=maxlsf; -+ change=1; -+ } -+ } -+ } -+ } -+ -+ return change; -+} -+ -+ -diff -druN codecs/ilbc/helpfun.h codecs/ilbc/helpfun.h ---- codecs/ilbc/helpfun.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/helpfun.h 2005-11-29 10:24:39.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/hpInput.c codecs/ilbc/hpInput.c ---- codecs/ilbc/hpInput.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/hpInput.c 2005-11-29 10:24:39.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 -+ -+#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=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=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 1) { -+ for (k=1; k -+#include -+ -+#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; i0.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)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) 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; j0.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) { -+ 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] -+#include -+ -+#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; iold_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;ienh_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; kstate_short_len)]; -+ } -+ -+ /* setup memory */ -+ -+ meml_gotten = iLBCdec_inst->state_short_len; -+ for (k=0; knsub-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 0 ) { -+ -+ /* setup memory */ -+ -+ meml_gotten = SUBL*(iLBCdec_inst->nsub+1-start); -+ -+ if ( meml_gotten > CB_MEML ) { -+ meml_gotten=CB_MEML; -+ } -+ for (k=0; k0) { /* the data are good */ -+ -+ /* decode data */ -+ -+ pbytes=bytes; -+ pos=0; -+ -+ /* Set everything to zero before decoding */ -+ -+ for (k=0; kstate_short_len; k++) { -+ idxVec[k]=0; -+ } -+ for (k=0; knasub; i++) { -+ for (k=0; knasub; i++) { -+ for (k=0; klpc_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; kstate_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; kULP_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; kULP_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; inasub; i++) { -+ for (k=0; kULP_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; inasub; i++) { -+ -+ -+ for (k=0; kULP_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/iLBC_decode.h codecs/ilbc/iLBC_decode.h ---- codecs/ilbc/iLBC_decode.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/iLBC_decode.h 2005-11-29 10:24:39.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/iLBC_define.h codecs/ilbc/iLBC_define.h ---- codecs/ilbc/iLBC_define.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/iLBC_define.h 2005-11-29 10:24:39.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 -+ -+#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/iLBC_encode.c codecs/ilbc/iLBC_encode.c ---- codecs/ilbc/iLBC_encode.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/iLBC_encode.c 2005-11-29 10:24:39.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 -+#include -+#include -+ -+#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; nnsub; 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; kstate_short_len)]; -+ } -+ -+ /* setup memory */ -+ -+ meml_gotten = iLBCenc_inst->state_short_len; -+ for (k=0; knsub-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 0 ) { -+ -+ /* create reverse order vectors */ -+ -+ for (n=0; nnsub+1-start); -+ -+ -+ if ( meml_gotten > CB_MEML ) { -+ meml_gotten=CB_MEML; -+ } -+ for (k=0; klpc_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; kstate_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;kULP_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;kULP_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; inasub; i++) { -+ for (k=0; kULP_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; inasub; i++) { -+ for (k=0; kULP_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/iLBC_encode.h codecs/ilbc/iLBC_encode.h ---- codecs/ilbc/iLBC_encode.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/iLBC_encode.h 2005-11-29 10:24:39.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 -+ -+ -+ -diff -druN codecs/ilbc/lsf.c codecs/ilbc/lsf.c ---- codecs/ilbc/lsf.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/lsf.c 2005-11-29 10:24:39.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 -+#include -+ -+#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= 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= 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 -+#include -+ -+#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<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/packing.h codecs/ilbc/packing.h ---- codecs/ilbc/packing.h 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/packing.h 2005-11-29 10:24:39.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/syntFilter.c codecs/ilbc/syntFilter.c ---- codecs/ilbc/syntFilter.c 1969-12-31 16:00:00.000000000 -0800 -+++ codecs/ilbc/syntFilter.c 2005-11-29 10:24:39.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 - #include - #include -+#include - - #include "asterisk.h" - -@@ -51,7 +52,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi - #include "asterisk/utils.h" - #include "asterisk/lock.h" - #include "asterisk/manager.h" --#include "db1-ast/include/db.h" - - #ifdef __CYGWIN__ - #define dbopen __dbopen diff --git a/net/asterisk12/files/patch-formats::Makefile b/net/asterisk12/files/patch-formats::Makefile deleted file mode 100644 index b2b1db5a37bd..000000000000 --- a/net/asterisk12/files/patch-formats::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- formats/Makefile.orig Fri Jan 13 11:16:07 2006 -+++ formats/Makefile Fri Jan 13 11:47:25 2006 -@@ -20,7 +20,7 @@ - # - # G723 simple frame is deprecated - # --FORMAT_LIBS+=format_g723.so -+FORMAT_LIBS+=format_g723_1.so - - # - # OGG/Vorbis format -@@ -60,7 +60,7 @@ - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm - - install: all -- for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(FORMAT_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk12/files/patch-formats::format_g723_1.c b/net/asterisk12/files/patch-formats::format_g723_1.c deleted file mode 100644 index ae814f197a1e..000000000000 --- a/net/asterisk12/files/patch-formats::format_g723_1.c +++ /dev/null @@ -1,354 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Fri Jan 13 12:18:51 2006 -+++ formats/format_g723_1.c Fri Jan 13 12:18:41 2006 -@@ -0,0 +1,348 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Save and read raw, headerless G723.1 Annex A data. -+ * -+ * Copyright (C) 1999, Mark Spencer -+ * Copyright (C) 2003, Maxim Sobolev -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#ifdef __linux__ -+#include -+#else -+#include -+#endif -+ -+/* Based on format_g729.c */ -+ -+#define TYPE_HIGH 0x0 -+#define TYPE_LOW 0x1 -+#define TYPE_SILENCE 0x2 -+#define TYPE_DONTSEND 0x3 -+#define TYPE_MASK 0x3 -+ -+struct ast_filestream { -+ void *reserved[AST_RESERVED_POINTERS]; -+ /* This is what a filestream means to us */ -+ FILE *f; /* Descriptor */ -+ struct ast_frame fr; /* Frame information */ -+ char waste[AST_FRIENDLY_OFFSET]; /* Buffer for sending frames, etc */ -+ char empty; /* Empty character */ -+ unsigned char g723[24]; /* One Real G723.1 Frame */ -+}; -+ -+static long g723_tell(struct ast_filestream *); -+ -+AST_MUTEX_DEFINE_STATIC(g723_lock); -+static int glistcnt = 0; -+ -+static char *name = "g723"; -+static char *desc = "Raw G723.1 Annex A data"; -+static char *exts = "g723"; -+ -+static int g723_len(unsigned char buf) -+{ -+ switch(buf & TYPE_MASK) { -+ case TYPE_DONTSEND: -+ return 2; -+ break; -+ case TYPE_SILENCE: -+ return 4; -+ break; -+ case TYPE_HIGH: -+ return 24; -+ break; -+ case TYPE_LOW: -+ return 20; -+ break; -+ default: -+ ast_log(LOG_WARNING, "Badly encoded G723.1 frame (%d)\n", buf & TYPE_MASK); -+ } -+ return -1; -+} -+ -+static struct ast_filestream *g723_open(FILE *f) -+{ -+ /* We don't have any header to read or anything really, but -+ if we did, it would go here. We also might want to check -+ and be sure it's a valid file. */ -+ struct ast_filestream *tmp; -+ if ((tmp = malloc(sizeof(struct ast_filestream)))) { -+ memset(tmp, 0, sizeof(struct ast_filestream)); -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ free(tmp); -+ return NULL; -+ } -+ tmp->f = f; -+ tmp->fr.data = tmp->g723; -+ tmp->fr.frametype = AST_FRAME_VOICE; -+ tmp->fr.subclass = AST_FORMAT_G723_1; -+ /* datalen will vary for each frame */ -+ tmp->fr.src = name; -+ tmp->fr.mallocd = 0; -+ glistcnt++; -+ ast_mutex_unlock(&g723_lock); -+ ast_update_use_count(); -+ } -+ return tmp; -+} -+ -+static struct ast_filestream *g723_rewrite(FILE *f, const char *comment) -+{ -+ /* We don't have any header to read or anything really, but -+ if we did, it would go here. We also might want to check -+ and be sure it's a valid file. */ -+ struct ast_filestream *tmp; -+ if ((tmp = malloc(sizeof(struct ast_filestream)))) { -+ memset(tmp, 0, sizeof(struct ast_filestream)); -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ free(tmp); -+ return NULL; -+ } -+ tmp->f = f; -+ glistcnt++; -+ ast_mutex_unlock(&g723_lock); -+ ast_update_use_count(); -+ } else -+ ast_log(LOG_WARNING, "Out of memory\n"); -+ return tmp; -+} -+ -+static void g723_close(struct ast_filestream *s) -+{ -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ return; -+ } -+ glistcnt--; -+ ast_mutex_unlock(&g723_lock); -+ ast_update_use_count(); -+ fclose(s->f); -+ free(s); -+ s = NULL; -+} -+ -+static struct ast_frame *g723_read(struct ast_filestream *s, int *whennext) -+{ -+ int res; -+ /* Send a frame from the file to the appropriate channel */ -+ s->fr.frametype = AST_FRAME_VOICE; -+ s->fr.subclass = AST_FORMAT_G723_1; -+ s->fr.offset = AST_FRIENDLY_OFFSET; -+ s->fr.samples = 240; -+ s->fr.mallocd = 0; -+ s->fr.data = s->g723; -+ if ((res = fread(s->g723, 1, 1, s->f)) != 1) { -+ if (res) -+ ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); -+ return NULL; -+ } -+ s->fr.datalen = g723_len(s->g723[0]); -+ if (s->fr.datalen < 0) { -+ ast_log(LOG_WARNING, "Invalid G723.1 frame!\n"); -+ return NULL; -+ } -+ if (s->fr.datalen > 1 && (res = fread(s->g723 + 1, 1, s->fr.datalen - 1, s->f)) != s->fr.datalen - 1) { -+ if (res) -+ ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); -+ return NULL; -+ } -+ *whennext = s->fr.samples; -+ return &s->fr; -+} -+ -+static int g723_write(struct ast_filestream *fs, struct ast_frame *f) -+{ -+ int res; -+ unsigned char *cp; -+ if (f->frametype != AST_FRAME_VOICE) { -+ ast_log(LOG_WARNING, "Asked to write non-voice frame!\n"); -+ return -1; -+ } -+ if (f->subclass != AST_FORMAT_G723_1) { -+ ast_log(LOG_WARNING, "Asked to write non-G723.1 frame (%d)!\n", f->subclass); -+ return -1; -+ } -+ for (cp = f->data; cp < (unsigned char *)f->data + f->datalen; cp += res) { -+ res = g723_len(cp[0]); -+ if (res < 0) { -+ ast_log(LOG_WARNING, "Asked to write invalid G723.1 frame!\n"); -+ return -1; -+ } -+ } -+ if (cp != (unsigned char *)f->data + f->datalen) { -+ ast_log(LOG_WARNING, "Invalid G723.1 data length, %d\n", f->datalen); -+ return -1; -+ } -+ if ((res = fwrite(f->data, 1, f->datalen, fs->f)) != f->datalen) { -+ ast_log(LOG_WARNING, "Bad write %d: %s\n", res, strerror(errno)); -+ return -1; -+ } -+ return 0; -+} -+ -+static char *g723_getcomment(struct ast_filestream *s) -+{ -+ return NULL; -+} -+ -+static int g723_seek(struct ast_filestream *fs, long sample_offset, int whence) -+{ -+ long cur, offset, max; -+ off_t coffset, moffset, soffset; -+ int res; -+ unsigned char c; -+ -+ offset = 0; /* Shut up gcc warning */ -+ if (whence == SEEK_SET) { -+ offset = sample_offset; -+ } else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) { -+ if ((cur = g723_tell(fs)) == -1) { -+ ast_log(LOG_WARNING, "Can't get current position!\n"); -+ return -1; -+ } -+ offset = cur + sample_offset; -+ } -+ if (fseeko(fs->f, 0, SEEK_END) == -1) { -+ ast_log(LOG_WARNING, "Can't seek stream to an end!\n"); -+ return -1; -+ } -+ else { -+ moffset = ftello(fs->f); -+ } -+ if (whence == SEEK_END) { -+ if ((max = g723_tell(fs)) == -1) { -+ ast_log(LOG_WARNING, "Can't get maximum position!\n"); -+ return -1; -+ } -+ offset = max - sample_offset; -+ } -+ if (offset < 0) -+ offset = 0; -+ soffset = -1; -+ for (coffset = 0; coffset < moffset && offset > 0; coffset += res) { -+ if (fseeko(fs->f, coffset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", coffset); -+ return -1; -+ } -+ if (fread(&c, 1, 1, fs->f) != 1) { -+ ast_log(LOG_WARNING, "Can't read from offset %lli!\n", coffset); -+ return -1; -+ } -+ soffset = coffset; -+ if ((res = g723_len(c)) < 0) { -+ ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %lli!\n", coffset); -+ return -1; -+ } -+ if (res > 1) -+ offset -= 240; -+ } -+ if (soffset != -1 && fseeko(fs->f, soffset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", soffset); -+ return -1; -+ } -+ -+ return 0; -+} -+ -+static int g723_trunc(struct ast_filestream *fs) -+{ -+ /* Truncate file to current length */ -+ if (ftruncate(fileno(fs->f), ftello(fs->f)) < 0) -+ return -1; -+ return 0; -+} -+ -+static long g723_tell(struct ast_filestream *fs) -+{ -+ off_t offset, coffset; -+ int res; -+ long rval; -+ unsigned char c; -+ -+ offset = ftello(fs->f); -+ rval = 0; -+ for (coffset = 0; coffset < offset; coffset += res) { -+ if (fseeko(fs->f, coffset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", coffset); -+ return -1; -+ } -+ if (fread(&c, 1, 1, fs->f) != 1) { -+ ast_log(LOG_WARNING, "Can't read from offset %llu!\n", coffset); -+ return -1; -+ } -+ if ((res = g723_len(c)) < 0) { -+ ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %llu!\n", coffset); -+ return -1; -+ } -+ if (res > 1) -+ rval += 240; -+ } -+ if (fseeko(fs->f, offset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", offset); -+ return -1; -+ } -+ return rval; -+} -+ -+int load_module() -+{ -+ return ast_format_register(name, exts, AST_FORMAT_G723_1, -+ g723_open, -+ g723_rewrite, -+ g723_write, -+ g723_seek, -+ g723_trunc, -+ g723_tell, -+ g723_read, -+ g723_close, -+ g723_getcomment); -+} -+ -+int unload_module() -+{ -+ return ast_format_unregister(name); -+} -+ -+int usecount() -+{ -+ int res; -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ return -1; -+ } -+ res = glistcnt; -+ ast_mutex_unlock(&g723_lock); -+ return res; -+} -+ -+char *description() -+{ -+ return desc; -+} -+ -+ -+char *key() -+{ -+ return ASTERISK_GPL_KEY; -+} diff --git a/net/asterisk12/files/patch-formats::format_g729.c b/net/asterisk12/files/patch-formats::format_g729.c deleted file mode 100644 index 11be5281608f..000000000000 --- a/net/asterisk12/files/patch-formats::format_g729.c +++ /dev/null @@ -1,47 +0,0 @@ - -$FreeBSD$ - ---- formats/format_g729.c.orig Fri Jan 13 12:20:53 2006 -+++ formats/format_g729.c Fri Jan 13 12:23:33 2006 -@@ -60,7 +60,7 @@ struct ast_filestream { - struct ast_frame fr; /* Frame information */ - char waste[AST_FRIENDLY_OFFSET]; /* Buffer for sending frames, etc */ - char empty; /* Empty character */ -- unsigned char g729[20]; /* Two Real G729 Frames */ -+ unsigned char g729[10]; /* One Real G729 Frame */ - }; - - -@@ -141,11 +141,11 @@ static struct ast_frame *g729_read(struc - s->fr.frametype = AST_FRAME_VOICE; - s->fr.subclass = AST_FORMAT_G729A; - s->fr.offset = AST_FRIENDLY_OFFSET; -- s->fr.samples = 160; -- s->fr.datalen = 20; -+ s->fr.samples = 80; -+ s->fr.datalen = 10; - s->fr.mallocd = 0; - s->fr.data = s->g729; -- if ((res = fread(s->g729, 1, 20, s->f)) != 20) { -+ if ((res = fread(s->g729, 1, 10, s->f)) != 10) { - if (res && (res != 10)) - ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); - return NULL; -@@ -190,7 +190,7 @@ static int g729_seek(struct ast_filestre - fseek(fs->f, 0, SEEK_END); - max = ftell(fs->f); - -- bytes = 20 * (sample_offset / 160); -+ bytes = 10 * (sample_offset / 80); - if (whence == SEEK_SET) - offset = bytes; - else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) -@@ -219,7 +219,7 @@ static long g729_tell(struct ast_filestr - { - off_t offset; - offset = ftell(fs->f); -- return (offset/20)*160; -+ return (offset/10)*80; - } - - int load_module() diff --git a/net/asterisk12/files/patch-frame.c b/net/asterisk12/files/patch-frame.c deleted file mode 100644 index 753253c7af0d..000000000000 --- a/net/asterisk12/files/patch-frame.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- frame.c.orig Wed Jan 25 13:22:43 2006 -+++ frame.c Wed Jan 25 13:21:25 2006 -@@ -1170,7 +1170,7 @@ static int g723_len(unsigned char buf) - { - switch(buf & TYPE_MASK) { - case TYPE_DONTSEND: -- return 0; -+ return 2; - break; - case TYPE_SILENCE: - return 4; diff --git a/net/asterisk12/files/patch-funcs::Makefile b/net/asterisk12/files/patch-funcs::Makefile deleted file mode 100644 index a14daeed285c..000000000000 --- a/net/asterisk12/files/patch-funcs::Makefile +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- funcs/Makefile.orig Tue Nov 29 20:24:39 2005 -+++ funcs/Makefile Fri Jan 13 12:36:57 2006 -@@ -67,7 +67,7 @@ - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} - - install: all -- for x in $(FUNCS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(FUNCS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - ifneq ($(wildcard .depend),) - include .depend diff --git a/net/asterisk12/files/patch-include::asterisk::utils.h b/net/asterisk12/files/patch-include::asterisk::utils.h deleted file mode 100644 index a06f7d065c84..000000000000 --- a/net/asterisk12/files/patch-include::asterisk::utils.h +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- include/asterisk/utils.h 2004/10/10 12:55:50 1.1 -+++ include/asterisk/utils.h 2004/10/10 12:56:43 -@@ -37,7 +37,6 @@ - #ifdef inet_ntoa - #undef inet_ntoa - #endif --#define inet_ntoa __dont__use__inet_ntoa__use__ast_inet_ntoa__instead__ - - #ifdef LINUX - #define ast_pthread_create pthread_create diff --git a/net/asterisk12/files/patch-include_asterisk_astobj2.h b/net/asterisk12/files/patch-include_asterisk_astobj2.h deleted file mode 100644 index fa4e629ce950..000000000000 --- a/net/asterisk12/files/patch-include_asterisk_astobj2.h +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- include/asterisk/astobj2.h -+++ include/asterisk/astobj2.h -@@ -17,6 +17,8 @@ - #ifndef _ASTERISK_ASTOBJ2_H - #define _ASTERISK_ASTOBJ2_H - -+typedef unsigned int uint; -+ - #include "asterisk/compat.h" - - /*! \file diff --git a/net/asterisk12/files/patch-pbx::Makefile b/net/asterisk12/files/patch-pbx::Makefile deleted file mode 100644 index 97d03e10f871..000000000000 --- a/net/asterisk12/files/patch-pbx::Makefile +++ /dev/null @@ -1,25 +0,0 @@ - -$FreeBSD$ - ---- pbx/Makefile.orig -+++ pbx/Makefile -@@ -23,8 +23,8 @@ - # Add KDE Console if appropriate - #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so") - --GTK_FLAGS=`${CROSS_COMPILE_BIN}gtk-config --cflags gthread` --GTK_LIBS=`${CROSS_COMPILE_BIN}gtk-config --libs gthread` -+#GTK_FLAGS=`${CROSS_COMPILE_BIN}gtk-config --cflags gthread` -+#GTK_LIBS=`${CROSS_COMPILE_BIN}gtk-config --libs gthread` - MOC=$(QTDIR)/bin/moc - KDE_FLAGS=-I$(KDEDIR)/include -I$(KDEDIR)/include/kde -I$(QTDIR)/include - KDE_LIBS=-L$(KDEDIR)/lib -L$(QTDIR)/lib -lqt -lkdecore -lkdeui -@@ -72,7 +72,7 @@ - endif - - install: all -- for x in $(PBX_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(PBX_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk12/files/patch-res::Makefile b/net/asterisk12/files/patch-res::Makefile deleted file mode 100644 index 2930b1cb3e32..000000000000 --- a/net/asterisk12/files/patch-res::Makefile +++ /dev/null @@ -1,53 +0,0 @@ - -$FreeBSD$ - ---- res/Makefile.orig -+++ res/Makefile -@@ -13,7 +13,8 @@ - - MODS=res_indications.so res_monitor.so res_adsi.so res_agi.so res_features.so - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),) -+ifdef WITH_ODBC -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)${LOCALBASE}/include/odbcinst.h),) - ifneq (${OSARCH},FreeBSD) - MODS+=res_config_odbc.so - else -@@ -21,6 +22,7 @@ - endif - MODS+=res_odbc.so - endif -+endif - - ifneq ($(NOCRYPTO),yes) - MODS+=res_crypto.so -@@ -37,8 +39,8 @@ - endif - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -+ SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - ifeq (${OSARCH},CYGWIN) -@@ -55,9 +57,7 @@ - CFLAGS+= - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),) - CFLAGS+=-DZAPATA_MOH --endif - endif # WITHOUT_ZAPTEL - - # -@@ -75,7 +75,7 @@ - rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h - rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so - rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so -- for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - @if [ x`which mpg123 2>/dev/null | grep -v '^no'` != x ] ; then \ - if mpg123 --longhelp 2>&1 | grep -q .59r 2>&1 >/dev/null ; then echo ; else \ - echo "*************************************************************";\ diff --git a/net/asterisk12/files/patch-res::res_musiconhold.c b/net/asterisk12/files/patch-res::res_musiconhold.c deleted file mode 100644 index 352fb814def9..000000000000 --- a/net/asterisk12/files/patch-res::res_musiconhold.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- res/res_musiconhold.c -+++ res/res_musiconhold.c -@@ -40,7 +40,7 @@ - #ifdef __linux__ - #include - #else --#include -+#include - #endif /* __linux__ */ - #endif - #include diff --git a/net/asterisk12/files/patch-utils.c b/net/asterisk12/files/patch-utils.c deleted file mode 100644 index f6adec453f06..000000000000 --- a/net/asterisk12/files/patch-utils.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- utils.c -+++ utils.c -@@ -58,7 +58,7 @@ - static char base64[64]; - static char b2a[256]; - --#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__CYGWIN__) -+#if (defined(__FreeBSD__) && __FreeBSD_version < 601103) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__CYGWIN__) - - /* duh? ERANGE value copied from web... */ - #define ERANGE 34 diff --git a/net/asterisk12/files/patch-utils::Makefile b/net/asterisk12/files/patch-utils::Makefile deleted file mode 100644 index d2c61cc0664b..000000000000 --- a/net/asterisk12/files/patch-utils::Makefile +++ /dev/null @@ -1,32 +0,0 @@ ---- utils/Makefile.orig Wed Jan 24 19:43:50 2007 -+++ utils/Makefile Mon Apr 16 16:37:31 2007 -@@ -17,17 +17,17 @@ - CFLAGS+=-DNO_AST_MM - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - # to get check_expr, add it to the TARGET list - TARGET=stereorize streamplayer - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/popt.h),) - TARGET+=smsq - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/newt.h),) - TARGET+=astman - endif - -@@ -41,7 +41,7 @@ - install: - for x in $(TARGET); do \ - if [ "$$x" != "none" ]; then \ -- $(INSTALL) -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/$$x; \ -+ $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(ASTSBINDIR)/$$x; \ - fi; \ - done - diff --git a/net/asterisk12/pkg-descr b/net/asterisk12/pkg-descr deleted file mode 100644 index 28b7a1deb011..000000000000 --- a/net/asterisk12/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/asterisk12/pkg-plist b/net/asterisk12/pkg-plist deleted file mode 100644 index 5712461fdaaf..000000000000 --- a/net/asterisk12/pkg-plist +++ /dev/null @@ -1,793 +0,0 @@ -@unexec if cmp -s %D/etc/asterisk/adsi.conf %D/etc/asterisk/adsi.conf-dist; then rm -f %D/etc/asterisk/adsi.conf; fi -etc/asterisk/adsi.conf-dist -@exec [ -f %B/adsi.conf ] || cp %B/%f %B/adsi.conf -@unexec if cmp -s %D/etc/asterisk/adtranvofr.conf %D/etc/asterisk/adtranvofr.conf-dist; then rm -f %D/etc/asterisk/adtranvofr.conf; fi -etc/asterisk/adtranvofr.conf-dist -@exec [ -f %B/adtranvofr.conf ] || cp %B/%f %B/adtranvofr.conf -@unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi -etc/asterisk/agents.conf-dist -@exec [ -f %B/agents.conf ] || cp %B/%f %B/agents.conf -@unexec if cmp -s %D/etc/asterisk/alarmreceiver.conf %D/etc/asterisk/alarmreceiver.conf-dist; then rm -f %D/etc/asterisk/alarmreceiver.conf; fi -etc/asterisk/alarmreceiver.conf-dist -@exec [ -f %B/alarmreceiver.conf ] || cp %B/%f %B/alarmreceiver.conf -@unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi -etc/asterisk/alsa.conf-dist -@exec [ -f %B/alsa.conf ] || cp %B/%f %B/alsa.conf -@unexec if cmp -s %D/etc/asterisk/asterisk.adsi %D/etc/asterisk/asterisk.adsi-dist; then rm -f %D/etc/asterisk/asterisk.adsi; fi -etc/asterisk/asterisk.adsi-dist -@exec [ -f %B/asterisk.adsi ] || cp %B/%f %B/asterisk.adsi -@unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi -etc/asterisk/asterisk.conf-dist -@exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf -%%BRISTUFF%%@unexec if cmp -s %D/etc/asterisk/capi.conf %D/etc/asterisk/capi.conf-dist; then rm -f %D/etc/asterisk/capi.conf; fi -%%BRISTUFF%%etc/asterisk/capi.conf-dist -%%BRISTUFF%%@exec [ -f %B/capi.conf ] || cp %B/%f %B/capi.conf -@unexec if cmp -s %D/etc/asterisk/cdr.conf %D/etc/asterisk/cdr.conf-dist; then rm -f %D/etc/asterisk/cdr.conf; fi -etc/asterisk/cdr.conf-dist -@exec [ -f %B/cdr.conf ] || cp %B/%f %B/cdr.conf -@unexec if cmp -s %D/etc/asterisk/cdr_custom.conf %D/etc/asterisk/cdr_custom.conf-dist; then rm -f %D/etc/asterisk/cdr_custom.conf; fi -etc/asterisk/cdr_custom.conf-dist -@exec [ -f %B/cdr_custom.conf ] || cp %B/%f %B/cdr_custom.conf -@unexec if cmp -s %D/etc/asterisk/cdr_manager.conf %D/etc/asterisk/cdr_manager.conf-dist; then rm -f %D/etc/asterisk/cdr_manager.conf; fi -etc/asterisk/cdr_manager.conf-dist -@exec [ -f %B/cdr_manager.conf ] || cp %B/%f %B/cdr_manager.conf -@unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi -etc/asterisk/cdr_odbc.conf-dist -@exec [ -f %B/cdr_odbc.conf ] || cp %B/%f %B/cdr_odbc.conf -@unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi -etc/asterisk/cdr_pgsql.conf-dist -@exec [ -f %B/cdr_pgsql.conf ] || cp %B/%f %B/cdr_pgsql.conf -@unexec if cmp -s %D/etc/asterisk/cdr_tds.conf %D/etc/asterisk/cdr_tds.conf-dist; then rm -f %D/etc/asterisk/cdr_tds.conf; fi -etc/asterisk/cdr_tds.conf-dist -@exec [ -f %B/cdr_tds.conf ] || cp %B/%f %B/cdr_tds.conf -@unexec if cmp -s %D/etc/asterisk/codecs.conf %D/etc/asterisk/codecs.conf-dist; then rm -f %D/etc/asterisk/codecs.conf; fi -etc/asterisk/codecs.conf-dist -@exec [ -f %B/codecs.conf ] || cp %B/%f %B/codecs.conf -@unexec if cmp -s %D/etc/asterisk/dnsmgr.conf %D/etc/asterisk/dnsmgr.conf-dist; then rm -f %D/etc/asterisk/dnsmgr.conf; fi -etc/asterisk/dnsmgr.conf-dist -@exec [ -f %B/dnsmgr.conf ] || cp %B/%f %B/dnsmgr.conf -@unexec if cmp -s %D/etc/asterisk/dundi.conf %D/etc/asterisk/dundi.conf-dist; then rm -f %D/etc/asterisk/dundi.conf; fi -etc/asterisk/dundi.conf-dist -@exec [ -f %B/dundi.conf ] || cp %B/%f %B/dundi.conf -@unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi -etc/asterisk/enum.conf-dist -@exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf -@unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi -etc/asterisk/extconfig.conf-dist -@exec [ -f %B/extconfig.conf ] || cp %B/%f %B/extconfig.conf -@unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi -etc/asterisk/extensions.ael-dist -@exec [ -f %B/extensions.ael ] || cp %B/%f %B/extensions.ael -@unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi -etc/asterisk/extensions.conf-dist -@exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf -@unexec if cmp -s %D/etc/asterisk/features.conf %D/etc/asterisk/features.conf-dist; then rm -f %D/etc/asterisk/features.conf; fi -etc/asterisk/features.conf-dist -@exec [ -f %B/features.conf ] || cp %B/%f %B/features.conf -@unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi -etc/asterisk/festival.conf-dist -@exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf -@unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi -etc/asterisk/iax.conf-dist -@exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf -@unexec if cmp -s %D/etc/asterisk/iaxprov.conf %D/etc/asterisk/iaxprov.conf-dist; then rm -f %D/etc/asterisk/iaxprov.conf; fi -etc/asterisk/iaxprov.conf-dist -@exec [ -f %B/iaxprov.conf ] || cp %B/%f %B/iaxprov.conf -@unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi -etc/asterisk/indications.conf-dist -@exec [ -f %B/indications.conf ] || cp %B/%f %B/indications.conf -@unexec if cmp -s %D/etc/asterisk/logger.conf %D/etc/asterisk/logger.conf-dist; then rm -f %D/etc/asterisk/logger.conf; fi -etc/asterisk/logger.conf-dist -@exec [ -f %B/logger.conf ] || cp %B/%f %B/logger.conf -@unexec if cmp -s %D/etc/asterisk/manager.conf %D/etc/asterisk/manager.conf-dist; then rm -f %D/etc/asterisk/manager.conf; fi -etc/asterisk/manager.conf-dist -@exec [ -f %B/manager.conf ] || cp %B/%f %B/manager.conf -@unexec if cmp -s %D/etc/asterisk/meetme.conf %D/etc/asterisk/meetme.conf-dist; then rm -f %D/etc/asterisk/meetme.conf; fi -etc/asterisk/meetme.conf-dist -@exec [ -f %B/meetme.conf ] || cp %B/%f %B/meetme.conf -@unexec if cmp -s %D/etc/asterisk/mgcp.conf %D/etc/asterisk/mgcp.conf-dist; then rm -f %D/etc/asterisk/mgcp.conf; fi -etc/asterisk/mgcp.conf-dist -@exec [ -f %B/mgcp.conf ] || cp %B/%f %B/mgcp.conf -@unexec if cmp -s %D/etc/asterisk/misdn.conf %D/etc/asterisk/misdn.conf-dist; then rm -f %D/etc/asterisk/misdn.conf; fi -etc/asterisk/misdn.conf-dist -@exec [ -f %B/misdn.conf ] || cp %B/%f %B/misdn.conf -@unexec if cmp -s %D/etc/asterisk/modem.conf %D/etc/asterisk/modem.conf-dist; then rm -f %D/etc/asterisk/modem.conf; fi -etc/asterisk/modem.conf-dist -@exec [ -f %B/modem.conf ] || cp %B/%f %B/modem.conf -@unexec if cmp -s %D/etc/asterisk/modules.conf %D/etc/asterisk/modules.conf-dist; then rm -f %D/etc/asterisk/modules.conf; fi -etc/asterisk/modules.conf-dist -@exec [ -f %B/modules.conf ] || cp %B/%f %B/modules.conf -@unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi -etc/asterisk/musiconhold.conf-dist -@exec [ -f %B/musiconhold.conf ] || cp %B/%f %B/musiconhold.conf -@unexec if cmp -s %D/etc/asterisk/osp.conf %D/etc/asterisk/osp.conf-dist; then rm -f %D/etc/asterisk/osp.conf; fi -etc/asterisk/osp.conf-dist -@exec [ -f %B/osp.conf ] || cp %B/%f %B/osp.conf -@unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi -etc/asterisk/oss.conf-dist -@exec [ -f %B/oss.conf ] || cp %B/%f %B/oss.conf -@unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi -etc/asterisk/phone.conf-dist -@exec [ -f %B/phone.conf ] || cp %B/%f %B/phone.conf -@unexec if cmp -s %D/etc/asterisk/privacy.conf %D/etc/asterisk/privacy.conf-dist; then rm -f %D/etc/asterisk/privacy.conf; fi -etc/asterisk/privacy.conf-dist -@exec [ -f %B/privacy.conf ] || cp %B/%f %B/privacy.conf -@unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi -etc/asterisk/queues.conf-dist -@exec [ -f %B/queues.conf ] || cp %B/%f %B/queues.conf -@unexec if cmp -s %D/etc/asterisk/res_odbc.conf %D/etc/asterisk/res_odbc.conf-dist; then rm -f %D/etc/asterisk/res_odbc.conf; fi -etc/asterisk/res_odbc.conf-dist -@exec [ -f %B/res_odbc.conf ] || cp %B/%f %B/res_odbc.conf -@unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi -etc/asterisk/rpt.conf-dist -@exec [ -f %B/rpt.conf ] || cp %B/%f %B/rpt.conf -@unexec if cmp -s %D/etc/asterisk/rtp.conf %D/etc/asterisk/rtp.conf-dist; then rm -f %D/etc/asterisk/rtp.conf; fi -etc/asterisk/rtp.conf-dist -@exec [ -f %B/rtp.conf ] || cp %B/%f %B/rtp.conf -@unexec if cmp -s %D/etc/asterisk/sip.conf %D/etc/asterisk/sip.conf-dist; then rm -f %D/etc/asterisk/sip.conf; fi -etc/asterisk/sip.conf-dist -@exec [ -f %B/sip.conf ] || cp %B/%f %B/sip.conf -@unexec if cmp -s %D/etc/asterisk/sip_notify.conf %D/etc/asterisk/sip_notify.conf-dist; then rm -f %D/etc/asterisk/sip_notify.conf; fi -etc/asterisk/sip_notify.conf-dist -@exec [ -f %B/sip_notify.conf ] || cp %B/%f %B/sip_notify.conf -@unexec if cmp -s %D/etc/asterisk/skinny.conf %D/etc/asterisk/skinny.conf-dist; then rm -f %D/etc/asterisk/skinny.conf; fi -etc/asterisk/skinny.conf-dist -@exec [ -f %B/skinny.conf ] || cp %B/%f %B/skinny.conf -@unexec if cmp -s %D/etc/asterisk/telcordia-1.adsi %D/etc/asterisk/telcordia-1.adsi-dist; then rm -f %D/etc/asterisk/telcordia-1.adsi; fi -etc/asterisk/telcordia-1.adsi-dist -@exec [ -f %B/telcordia-1.adsi ] || cp %B/%f %B/telcordia-1.adsi -@unexec if cmp -s %D/etc/asterisk/voicemail.conf %D/etc/asterisk/voicemail.conf-dist; then rm -f %D/etc/asterisk/voicemail.conf; fi -etc/asterisk/voicemail.conf-dist -@exec [ -f %B/voicemail.conf ] || cp %B/%f %B/voicemail.conf -@unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi -etc/asterisk/vpb.conf-dist -@exec [ -f %B/vpb.conf ] || cp %B/%f %B/vpb.conf -%%BRISTUFF%%@unexec if cmp -s %D/etc/asterisk/watchdog.conf %D/etc/asterisk/watchdog.conf-dist; then rm -f %D/etc/asterisk/watchdog.conf; fi -%%BRISTUFF%%etc/asterisk/watchdog.conf-dist -%%BRISTUFF%%@exec [ -f %B/watchdog.conf ] || cp %B/%f %B/watchdog.conf -@unexec if cmp -s %D/etc/asterisk/zapata.conf %D/etc/asterisk/zapata.conf-dist; then rm -f %D/etc/asterisk/zapata.conf; fi -etc/asterisk/zapata.conf-dist -@exec [ -f %B/zapata.conf ] || cp %B/%f %B/zapata.conf -include/asterisk/acl.h -include/asterisk/adsi.h -include/asterisk/aes.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/build.h -include/asterisk/callerid.h -include/asterisk/causes.h -include/asterisk/cdr.h -%%BRISTUFF%%include/asterisk/chan_capi.h -%%BRISTUFF%%include/asterisk/chan_capi_app.h -include/asterisk/channel.h -include/asterisk/chanspy.h -include/asterisk/chanvars.h -include/asterisk/cli.h -include/asterisk/compat.h -include/asterisk/compiler.h -include/asterisk/config.h -include/asterisk/crypto.h -include/asterisk/devicestate.h -include/asterisk/dlfcn-compat.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/image.h -include/asterisk/indications.h -include/asterisk/inline_api.h -include/asterisk/io.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/pbx.h -include/asterisk/plc.h -include/asterisk/poll-compat.h -include/asterisk/privacy.h -include/asterisk/res_odbc.h -include/asterisk/rtp.h -include/asterisk/say.h -include/asterisk/sched.h -include/asterisk/slinfactory.h -include/asterisk/srv.h -include/asterisk/strings.h -include/asterisk/tdd.h -include/asterisk/term.h -include/asterisk/time.h -include/asterisk/transcap.h -include/asterisk/translate.h -include/asterisk/ulaw.h -include/asterisk/unaligned.h -include/asterisk/utils.h -include/asterisk/version.h -include/asterisk/vmodem.h -%%BRISTUFF%%include/asterisk/xlaw.h -lib/asterisk/modules/app_adsiprog.so -lib/asterisk/modules/app_alarmreceiver.so -lib/asterisk/modules/app_authenticate.so -%%BRISTUFF%%lib/asterisk/modules/app_callingpres.so -lib/asterisk/modules/app_cdr.so -lib/asterisk/modules/app_chanisavail.so -lib/asterisk/modules/app_chanspy.so -lib/asterisk/modules/app_controlplayback.so -lib/asterisk/modules/app_curl.so -lib/asterisk/modules/app_cut.so -lib/asterisk/modules/app_db.so -%%BRISTUFF%%lib/asterisk/modules/app_devstate.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_enumlookup.so -lib/asterisk/modules/app_eval.so -lib/asterisk/modules/app_exec.so -lib/asterisk/modules/app_externalivr.so -lib/asterisk/modules/app_festival.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_flash.so -lib/asterisk/modules/app_forkcdr.so -lib/asterisk/modules/app_getcpeid.so -lib/asterisk/modules/app_groupcount.so -lib/asterisk/modules/app_hasnewvoicemail.so -lib/asterisk/modules/app_ices.so -lib/asterisk/modules/app_image.so -lib/asterisk/modules/app_lookupblacklist.so -lib/asterisk/modules/app_lookupcidname.so -lib/asterisk/modules/app_macro.so -lib/asterisk/modules/app_math.so -lib/asterisk/modules/app_md5.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_meetme.so -lib/asterisk/modules/app_milliwatt.so -lib/asterisk/modules/app_mixmonitor.so -lib/asterisk/modules/app_mp3.so -lib/asterisk/modules/app_nbscat.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_page.so -lib/asterisk/modules/app_parkandannounce.so -%%BRISTUFF%%lib/asterisk/modules/app_pickup.so -lib/asterisk/modules/app_playback.so -lib/asterisk/modules/app_privacy.so -lib/asterisk/modules/app_queue.so -lib/asterisk/modules/app_random.so -lib/asterisk/modules/app_read.so -lib/asterisk/modules/app_readfile.so -lib/asterisk/modules/app_realtime.so -lib/asterisk/modules/app_record.so -%%WITH_FAX%%lib/asterisk/modules/app_rxfax.so -lib/asterisk/modules/app_sayunixtime.so -%%BRISTUFF%%lib/asterisk/modules/app_segfault.so -lib/asterisk/modules/app_senddtmf.so -lib/asterisk/modules/app_sendtext.so -lib/asterisk/modules/app_setcallerid.so -lib/asterisk/modules/app_setcdruserfield.so -lib/asterisk/modules/app_setcidname.so -lib/asterisk/modules/app_setcidnum.so -lib/asterisk/modules/app_setrdnis.so -lib/asterisk/modules/app_settransfercapability.so -lib/asterisk/modules/app_sms.so -lib/asterisk/modules/app_softhangup.so -lib/asterisk/modules/app_stack.so -lib/asterisk/modules/app_system.so -lib/asterisk/modules/app_talkdetect.so -lib/asterisk/modules/app_test.so -lib/asterisk/modules/app_transfer.so -%%WITH_FAX%%lib/asterisk/modules/app_txfax.so -lib/asterisk/modules/app_txtcidname.so -lib/asterisk/modules/app_url.so -lib/asterisk/modules/app_userevent.so -lib/asterisk/modules/app_verbose.so -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 -%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapbarge.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapras.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapscan.so -lib/asterisk/modules/cdr_csv.so -lib/asterisk/modules/cdr_custom.so -lib/asterisk/modules/cdr_manager.so -%%WITH_ODBC%%lib/asterisk/modules/cdr_odbc.so -%%WITH_FREETDS%%lib/asterisk/modules/cdr_tds.so -lib/asterisk/modules/chan_agent.so -lib/asterisk/modules/chan_features.so -%%WITH_H323%%lib/asterisk/modules/chan_h323.so -lib/asterisk/modules/chan_iax2.so -lib/asterisk/modules/chan_local.so -lib/asterisk/modules/chan_mgcp.so -lib/asterisk/modules/chan_oss.so -lib/asterisk/modules/chan_sip.so -lib/asterisk/modules/chan_skinny.so -%%WITH_ZAPTEL%%lib/asterisk/modules/chan_zap.so -lib/asterisk/modules/codec_a_mu.so -lib/asterisk/modules/codec_adpcm.so -lib/asterisk/modules/codec_alaw.so -lib/asterisk/modules/codec_g726.so -lib/asterisk/modules/codec_gsm.so -lib/asterisk/modules/codec_ilbc.so -lib/asterisk/modules/codec_lpc10.so -lib/asterisk/modules/codec_speex.so -lib/asterisk/modules/codec_ulaw.so -%%WITH_ZAPTEL%%lib/asterisk/modules/codec_zap.so -lib/asterisk/modules/format_au.so -lib/asterisk/modules/format_g723_1.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_ilbc.so -lib/asterisk/modules/format_jpeg.so -lib/asterisk/modules/format_pcm.so -lib/asterisk/modules/format_pcm_alaw.so -lib/asterisk/modules/format_sln.so -lib/asterisk/modules/format_vox.so -lib/asterisk/modules/format_wav.so -lib/asterisk/modules/format_wav_gsm.so -lib/asterisk/modules/func_callerid.so -lib/asterisk/modules/func_enum.so -lib/asterisk/modules/func_uri.so -lib/asterisk/modules/pbx_ael.so -lib/asterisk/modules/pbx_config.so -lib/asterisk/modules/pbx_dundi.so -lib/asterisk/modules/pbx_functions.so -lib/asterisk/modules/pbx_loopback.so -lib/asterisk/modules/pbx_realtime.so -lib/asterisk/modules/pbx_spool.so -lib/asterisk/modules/res_adsi.so -lib/asterisk/modules/res_agi.so -%%WITH_ODBC%%lib/asterisk/modules/res_config_odbc.so -lib/asterisk/modules/res_crypto.so -lib/asterisk/modules/res_features.so -lib/asterisk/modules/res_indications.so -lib/asterisk/modules/res_monitor.so -lib/asterisk/modules/res_musiconhold.so -%%WITH_ODBC%%lib/asterisk/modules/res_odbc.so -%%BRISTUFF%%lib/asterisk/modules/res_watchdog.so -sbin/asterisk -sbin/astgenkey -sbin/astman -sbin/autosupport -sbin/rasterisk -sbin/safe_asterisk -sbin/smsq -sbin/stereorize -sbin/streamplayer -%%DATADIR%%/agi-bin/agi-test.agi -%%DATADIR%%/agi-bin/eagi-sphinx-test -%%DATADIR%%/agi-bin/eagi-test -%%BRISTUFF%%%%DATADIR%%/agi-bin/xagi-test -%%DATADIR%%/firmware/iax/iaxy.bin -%%DATADIR%%/images/asterisk-intro.jpg -%%DATADIR%%/keys/freeworlddialup.pub -%%DATADIR%%/keys/iaxtel.pub -%%DATADIR%%/mohmp3/LICENSE -%%DATADIR%%/mohmp3/fpm-calm-river.mp3 -%%DATADIR%%/mohmp3/fpm-sunshine.mp3 -%%DATADIR%%/mohmp3/fpm-world-mix.mp3 -%%DATADIR%%/sounds/agent-alreadyon.gsm -%%DATADIR%%/sounds/agent-incorrect.gsm -%%DATADIR%%/sounds/agent-loggedoff.gsm -%%DATADIR%%/sounds/agent-loginok.gsm -%%DATADIR%%/sounds/agent-newlocation.gsm -%%DATADIR%%/sounds/agent-pass.gsm -%%DATADIR%%/sounds/agent-user.gsm -%%DATADIR%%/sounds/auth-incorrect.gsm -%%DATADIR%%/sounds/auth-thankyou.gsm -%%DATADIR%%/sounds/beep.gsm -%%DATADIR%%/sounds/beeperr.gsm -%%DATADIR%%/sounds/conf-adminmenu.gsm -%%DATADIR%%/sounds/conf-enteringno.gsm -%%DATADIR%%/sounds/conf-errormenu.gsm -%%DATADIR%%/sounds/conf-getchannel.gsm -%%DATADIR%%/sounds/conf-getconfno.gsm -%%DATADIR%%/sounds/conf-getpin.gsm -%%DATADIR%%/sounds/conf-hasjoin.gsm -%%DATADIR%%/sounds/conf-hasleft.gsm -%%DATADIR%%/sounds/conf-invalid.gsm -%%DATADIR%%/sounds/conf-invalidpin.gsm -%%DATADIR%%/sounds/conf-kicked.gsm -%%DATADIR%%/sounds/conf-leaderhasleft.gsm -%%DATADIR%%/sounds/conf-locked.gsm -%%DATADIR%%/sounds/conf-lockednow.gsm -%%DATADIR%%/sounds/conf-muted.gsm -%%DATADIR%%/sounds/conf-noempty.gsm -%%DATADIR%%/sounds/conf-onlyone.gsm -%%DATADIR%%/sounds/conf-onlyperson.gsm -%%DATADIR%%/sounds/conf-otherinparty.gsm -%%DATADIR%%/sounds/conf-placeintoconf.gsm -%%DATADIR%%/sounds/conf-thereare.gsm -%%DATADIR%%/sounds/conf-unlockednow.gsm -%%DATADIR%%/sounds/conf-unmuted.gsm -%%DATADIR%%/sounds/conf-usermenu.gsm -%%DATADIR%%/sounds/conf-userswilljoin.gsm -%%DATADIR%%/sounds/conf-userwilljoin.gsm -%%DATADIR%%/sounds/conf-waitforleader.gsm -%%DATADIR%%/sounds/demo-abouttotry.gsm -%%DATADIR%%/sounds/demo-congrats.gsm -%%DATADIR%%/sounds/demo-echodone.gsm -%%DATADIR%%/sounds/demo-echotest.gsm -%%DATADIR%%/sounds/demo-enterkeywords.gsm -%%DATADIR%%/sounds/demo-instruct.gsm -%%DATADIR%%/sounds/demo-moreinfo.gsm -%%DATADIR%%/sounds/demo-nogo.gsm -%%DATADIR%%/sounds/demo-nomatch.gsm -%%DATADIR%%/sounds/demo-thanks.gsm -%%DATADIR%%/sounds/dictate/both_help.gsm -%%DATADIR%%/sounds/dictate/enter_filename.gsm -%%DATADIR%%/sounds/dictate/forhelp.gsm -%%DATADIR%%/sounds/dictate/pause.gsm -%%DATADIR%%/sounds/dictate/paused.gsm -%%DATADIR%%/sounds/dictate/play_help.gsm -%%DATADIR%%/sounds/dictate/playback.gsm -%%DATADIR%%/sounds/dictate/playback_mode.gsm -%%DATADIR%%/sounds/dictate/record.gsm -%%DATADIR%%/sounds/dictate/record_help.gsm -%%DATADIR%%/sounds/dictate/record_mode.gsm -%%DATADIR%%/sounds/dictate/truncating_audio.gsm -%%DATADIR%%/sounds/digits/0.gsm -%%DATADIR%%/sounds/digits/1.gsm -%%DATADIR%%/sounds/digits/10.gsm -%%DATADIR%%/sounds/digits/11.gsm -%%DATADIR%%/sounds/digits/12.gsm -%%DATADIR%%/sounds/digits/13.gsm -%%DATADIR%%/sounds/digits/14.gsm -%%DATADIR%%/sounds/digits/15.gsm -%%DATADIR%%/sounds/digits/16.gsm -%%DATADIR%%/sounds/digits/17.gsm -%%DATADIR%%/sounds/digits/18.gsm -%%DATADIR%%/sounds/digits/19.gsm -%%DATADIR%%/sounds/digits/2.gsm -%%DATADIR%%/sounds/digits/20.gsm -%%DATADIR%%/sounds/digits/3.gsm -%%DATADIR%%/sounds/digits/30.gsm -%%DATADIR%%/sounds/digits/4.gsm -%%DATADIR%%/sounds/digits/40.gsm -%%DATADIR%%/sounds/digits/5.gsm -%%DATADIR%%/sounds/digits/50.gsm -%%DATADIR%%/sounds/digits/6.gsm -%%DATADIR%%/sounds/digits/60.gsm -%%DATADIR%%/sounds/digits/7.gsm -%%DATADIR%%/sounds/digits/70.gsm -%%DATADIR%%/sounds/digits/8.gsm -%%DATADIR%%/sounds/digits/80.gsm -%%DATADIR%%/sounds/digits/9.gsm -%%DATADIR%%/sounds/digits/90.gsm -%%DATADIR%%/sounds/digits/a-m.gsm -%%DATADIR%%/sounds/digits/at.gsm -%%DATADIR%%/sounds/digits/day-0.gsm -%%DATADIR%%/sounds/digits/day-1.gsm -%%DATADIR%%/sounds/digits/day-2.gsm -%%DATADIR%%/sounds/digits/day-3.gsm -%%DATADIR%%/sounds/digits/day-4.gsm -%%DATADIR%%/sounds/digits/day-5.gsm -%%DATADIR%%/sounds/digits/day-6.gsm -%%DATADIR%%/sounds/digits/dollars.gsm -%%DATADIR%%/sounds/digits/h-1.gsm -%%DATADIR%%/sounds/digits/h-10.gsm -%%DATADIR%%/sounds/digits/h-11.gsm -%%DATADIR%%/sounds/digits/h-12.gsm -%%DATADIR%%/sounds/digits/h-13.gsm -%%DATADIR%%/sounds/digits/h-14.gsm -%%DATADIR%%/sounds/digits/h-15.gsm -%%DATADIR%%/sounds/digits/h-16.gsm -%%DATADIR%%/sounds/digits/h-17.gsm -%%DATADIR%%/sounds/digits/h-18.gsm -%%DATADIR%%/sounds/digits/h-19.gsm -%%DATADIR%%/sounds/digits/h-2.gsm -%%DATADIR%%/sounds/digits/h-20.gsm -%%DATADIR%%/sounds/digits/h-3.gsm -%%DATADIR%%/sounds/digits/h-30.gsm -%%DATADIR%%/sounds/digits/h-4.gsm -%%DATADIR%%/sounds/digits/h-5.gsm -%%DATADIR%%/sounds/digits/h-6.gsm -%%DATADIR%%/sounds/digits/h-7.gsm -%%DATADIR%%/sounds/digits/h-8.gsm -%%DATADIR%%/sounds/digits/h-9.gsm -%%DATADIR%%/sounds/digits/hundred.gsm -%%DATADIR%%/sounds/digits/million.gsm -%%DATADIR%%/sounds/digits/minus.gsm -%%DATADIR%%/sounds/digits/mon-0.gsm -%%DATADIR%%/sounds/digits/mon-1.gsm -%%DATADIR%%/sounds/digits/mon-10.gsm -%%DATADIR%%/sounds/digits/mon-11.gsm -%%DATADIR%%/sounds/digits/mon-2.gsm -%%DATADIR%%/sounds/digits/mon-3.gsm -%%DATADIR%%/sounds/digits/mon-4.gsm -%%DATADIR%%/sounds/digits/mon-5.gsm -%%DATADIR%%/sounds/digits/mon-6.gsm -%%DATADIR%%/sounds/digits/mon-7.gsm -%%DATADIR%%/sounds/digits/mon-8.gsm -%%DATADIR%%/sounds/digits/mon-9.gsm -%%DATADIR%%/sounds/digits/oclock.gsm -%%DATADIR%%/sounds/digits/oh.gsm -%%DATADIR%%/sounds/digits/p-m.gsm -%%DATADIR%%/sounds/digits/pound.gsm -%%DATADIR%%/sounds/digits/star.gsm -%%DATADIR%%/sounds/digits/thousand.gsm -%%DATADIR%%/sounds/digits/today.gsm -%%DATADIR%%/sounds/digits/tomorrow.gsm -%%DATADIR%%/sounds/digits/yesterday.gsm -%%DATADIR%%/sounds/dir-instr.gsm -%%DATADIR%%/sounds/dir-intro-fn.gsm -%%DATADIR%%/sounds/dir-intro.gsm -%%DATADIR%%/sounds/dir-nomatch.gsm -%%DATADIR%%/sounds/dir-nomore.gsm -%%DATADIR%%/sounds/hello-world.gsm -%%DATADIR%%/sounds/hours.gsm -%%DATADIR%%/sounds/invalid.gsm -%%DATADIR%%/sounds/letters/a.gsm -%%DATADIR%%/sounds/letters/at.gsm -%%DATADIR%%/sounds/letters/b.gsm -%%DATADIR%%/sounds/letters/c.gsm -%%DATADIR%%/sounds/letters/d.gsm -%%DATADIR%%/sounds/letters/dash.gsm -%%DATADIR%%/sounds/letters/dollar.gsm -%%DATADIR%%/sounds/letters/dot.gsm -%%DATADIR%%/sounds/letters/e.gsm -%%DATADIR%%/sounds/letters/equals.gsm -%%DATADIR%%/sounds/letters/exclaimation-point.gsm -%%DATADIR%%/sounds/letters/f.gsm -%%DATADIR%%/sounds/letters/g.gsm -%%DATADIR%%/sounds/letters/h.gsm -%%DATADIR%%/sounds/letters/i.gsm -%%DATADIR%%/sounds/letters/j.gsm -%%DATADIR%%/sounds/letters/k.gsm -%%DATADIR%%/sounds/letters/l.gsm -%%DATADIR%%/sounds/letters/m.gsm -%%DATADIR%%/sounds/letters/n.gsm -%%DATADIR%%/sounds/letters/o.gsm -%%DATADIR%%/sounds/letters/p.gsm -%%DATADIR%%/sounds/letters/plus.gsm -%%DATADIR%%/sounds/letters/q.gsm -%%DATADIR%%/sounds/letters/r.gsm -%%DATADIR%%/sounds/letters/s.gsm -%%DATADIR%%/sounds/letters/slash.gsm -%%DATADIR%%/sounds/letters/space.gsm -%%DATADIR%%/sounds/letters/t.gsm -%%DATADIR%%/sounds/letters/u.gsm -%%DATADIR%%/sounds/letters/v.gsm -%%DATADIR%%/sounds/letters/w.gsm -%%DATADIR%%/sounds/letters/x.gsm -%%DATADIR%%/sounds/letters/y.gsm -%%DATADIR%%/sounds/letters/z.gsm -%%DATADIR%%/sounds/letters/zed.gsm -%%DATADIR%%/sounds/minutes.gsm -%%DATADIR%%/sounds/pbx-invalid.gsm -%%DATADIR%%/sounds/pbx-invalidpark.gsm -%%DATADIR%%/sounds/pbx-transfer.gsm -%%DATADIR%%/sounds/phonetic/9_p.gsm -%%DATADIR%%/sounds/phonetic/a_p.gsm -%%DATADIR%%/sounds/phonetic/b_p.gsm -%%DATADIR%%/sounds/phonetic/c_p.gsm -%%DATADIR%%/sounds/phonetic/d_p.gsm -%%DATADIR%%/sounds/phonetic/e_p.gsm -%%DATADIR%%/sounds/phonetic/f_p.gsm -%%DATADIR%%/sounds/phonetic/g_p.gsm -%%DATADIR%%/sounds/phonetic/h_p.gsm -%%DATADIR%%/sounds/phonetic/i_p.gsm -%%DATADIR%%/sounds/phonetic/j_p.gsm -%%DATADIR%%/sounds/phonetic/k_p.gsm -%%DATADIR%%/sounds/phonetic/l_p.gsm -%%DATADIR%%/sounds/phonetic/m_p.gsm -%%DATADIR%%/sounds/phonetic/n_p.gsm -%%DATADIR%%/sounds/phonetic/o_p.gsm -%%DATADIR%%/sounds/phonetic/p_p.gsm -%%DATADIR%%/sounds/phonetic/q_p.gsm -%%DATADIR%%/sounds/phonetic/r_p.gsm -%%DATADIR%%/sounds/phonetic/s_p.gsm -%%DATADIR%%/sounds/phonetic/t_p.gsm -%%DATADIR%%/sounds/phonetic/u_p.gsm -%%DATADIR%%/sounds/phonetic/v_p.gsm -%%DATADIR%%/sounds/phonetic/w_p.gsm -%%DATADIR%%/sounds/phonetic/x_p.gsm -%%DATADIR%%/sounds/phonetic/y_p.gsm -%%DATADIR%%/sounds/phonetic/z_p.gsm -%%DATADIR%%/sounds/priv-callee-options.gsm -%%DATADIR%%/sounds/priv-callpending.gsm -%%DATADIR%%/sounds/priv-introsaved.gsm -%%DATADIR%%/sounds/priv-recordintro.gsm -%%DATADIR%%/sounds/privacy-incorrect.gsm -%%DATADIR%%/sounds/privacy-prompt.gsm -%%DATADIR%%/sounds/privacy-thankyou.gsm -%%DATADIR%%/sounds/privacy-unident.gsm -%%DATADIR%%/sounds/queue-callswaiting.gsm -%%DATADIR%%/sounds/queue-holdtime.gsm -%%DATADIR%%/sounds/queue-less-than.gsm -%%DATADIR%%/sounds/queue-minutes.gsm -%%DATADIR%%/sounds/queue-periodic-announce.gsm -%%DATADIR%%/sounds/queue-reporthold.gsm -%%DATADIR%%/sounds/queue-seconds.gsm -%%DATADIR%%/sounds/queue-thankyou.gsm -%%DATADIR%%/sounds/queue-thereare.gsm -%%DATADIR%%/sounds/queue-youarenext.gsm -%%DATADIR%%/sounds/screen-callee-options.gsm -%%DATADIR%%/sounds/seconds.gsm -%%DATADIR%%/sounds/silence/1.gsm -%%DATADIR%%/sounds/silence/10.gsm -%%DATADIR%%/sounds/silence/2.gsm -%%DATADIR%%/sounds/silence/3.gsm -%%DATADIR%%/sounds/silence/4.gsm -%%DATADIR%%/sounds/silence/5.gsm -%%DATADIR%%/sounds/silence/6.gsm -%%DATADIR%%/sounds/silence/7.gsm -%%DATADIR%%/sounds/silence/8.gsm -%%DATADIR%%/sounds/silence/9.gsm -%%DATADIR%%/sounds/spy-agent.gsm -%%DATADIR%%/sounds/spy-h323.gsm -%%DATADIR%%/sounds/spy-iax.gsm -%%DATADIR%%/sounds/spy-iax2.gsm -%%DATADIR%%/sounds/spy-mgcp.gsm -%%DATADIR%%/sounds/spy-sip.gsm -%%DATADIR%%/sounds/spy-skinny.gsm -%%DATADIR%%/sounds/spy-zap.gsm -%%DATADIR%%/sounds/ss-noservice.gsm -%%DATADIR%%/sounds/transfer.gsm -%%DATADIR%%/sounds/tt-allbusy.gsm -%%DATADIR%%/sounds/tt-monkeys.gsm -%%DATADIR%%/sounds/tt-monkeysintro.gsm -%%DATADIR%%/sounds/tt-somethingwrong.gsm -%%DATADIR%%/sounds/tt-weasels.gsm -%%DATADIR%%/sounds/vm-Cust1.gsm -%%DATADIR%%/sounds/vm-Cust2.gsm -%%DATADIR%%/sounds/vm-Cust3.gsm -%%DATADIR%%/sounds/vm-Cust4.gsm -%%DATADIR%%/sounds/vm-Cust5.gsm -%%DATADIR%%/sounds/vm-Family.gsm -%%DATADIR%%/sounds/vm-Friends.gsm -%%DATADIR%%/sounds/vm-INBOX.gsm -%%DATADIR%%/sounds/vm-Old.gsm -%%DATADIR%%/sounds/vm-Work.gsm -%%DATADIR%%/sounds/vm-advopts.gsm -%%DATADIR%%/sounds/vm-and.gsm -%%DATADIR%%/sounds/vm-calldiffnum.gsm -%%DATADIR%%/sounds/vm-changeto.gsm -%%DATADIR%%/sounds/vm-delete.gsm -%%DATADIR%%/sounds/vm-deleted.gsm -%%DATADIR%%/sounds/vm-dialout.gsm -%%DATADIR%%/sounds/vm-enter-num-to-call.gsm -%%DATADIR%%/sounds/vm-extension.gsm -%%DATADIR%%/sounds/vm-first.gsm -%%DATADIR%%/sounds/vm-for.gsm -%%DATADIR%%/sounds/vm-forward.gsm -%%DATADIR%%/sounds/vm-forwardoptions.gsm -%%DATADIR%%/sounds/vm-from-extension.gsm -%%DATADIR%%/sounds/vm-from-phonenumber.gsm -%%DATADIR%%/sounds/vm-from.gsm -%%DATADIR%%/sounds/vm-goodbye.gsm -%%DATADIR%%/sounds/vm-helpexit.gsm -%%DATADIR%%/sounds/vm-incorrect-mailbox.gsm -%%DATADIR%%/sounds/vm-incorrect.gsm -%%DATADIR%%/sounds/vm-instructions.gsm -%%DATADIR%%/sounds/vm-intro.gsm -%%DATADIR%%/sounds/vm-isonphone.gsm -%%DATADIR%%/sounds/vm-isunavail.gsm -%%DATADIR%%/sounds/vm-last.gsm -%%DATADIR%%/sounds/vm-leavemsg.gsm -%%DATADIR%%/sounds/vm-login.gsm -%%DATADIR%%/sounds/vm-mailboxfull.gsm -%%DATADIR%%/sounds/vm-message.gsm -%%DATADIR%%/sounds/vm-messages.gsm -%%DATADIR%%/sounds/vm-minutes.gsm -%%DATADIR%%/sounds/vm-mismatch.gsm -%%DATADIR%%/sounds/vm-msginstruct.gsm -%%DATADIR%%/sounds/vm-msgsaved.gsm -%%DATADIR%%/sounds/vm-newpassword.gsm -%%DATADIR%%/sounds/vm-newuser.gsm -%%DATADIR%%/sounds/vm-next.gsm -%%DATADIR%%/sounds/vm-no.gsm -%%DATADIR%%/sounds/vm-nobodyavail.gsm -%%DATADIR%%/sounds/vm-nobox.gsm -%%DATADIR%%/sounds/vm-nomore.gsm -%%DATADIR%%/sounds/vm-nonumber.gsm -%%DATADIR%%/sounds/vm-num-i-have.gsm -%%DATADIR%%/sounds/vm-onefor.gsm -%%DATADIR%%/sounds/vm-options.gsm -%%DATADIR%%/sounds/vm-opts.gsm -%%DATADIR%%/sounds/vm-passchanged.gsm -%%DATADIR%%/sounds/vm-password.gsm -%%DATADIR%%/sounds/vm-press.gsm -%%DATADIR%%/sounds/vm-prev.gsm -%%DATADIR%%/sounds/vm-reachoper.gsm -%%DATADIR%%/sounds/vm-rec-busy.gsm -%%DATADIR%%/sounds/vm-rec-name.gsm -%%DATADIR%%/sounds/vm-rec-temp.gsm -%%DATADIR%%/sounds/vm-rec-unv.gsm -%%DATADIR%%/sounds/vm-received.gsm -%%DATADIR%%/sounds/vm-reenterpassword.gsm -%%DATADIR%%/sounds/vm-repeat.gsm -%%DATADIR%%/sounds/vm-review.gsm -%%DATADIR%%/sounds/vm-saved.gsm -%%DATADIR%%/sounds/vm-savedto.gsm -%%DATADIR%%/sounds/vm-savefolder.gsm -%%DATADIR%%/sounds/vm-savemessage.gsm -%%DATADIR%%/sounds/vm-saveoper.gsm -%%DATADIR%%/sounds/vm-sorry.gsm -%%DATADIR%%/sounds/vm-star-cancel.gsm -%%DATADIR%%/sounds/vm-starmain.gsm -%%DATADIR%%/sounds/vm-tempgreeting.gsm -%%DATADIR%%/sounds/vm-tempgreeting2.gsm -%%DATADIR%%/sounds/vm-tempremoved.gsm -%%DATADIR%%/sounds/vm-then-pound.gsm -%%DATADIR%%/sounds/vm-theperson.gsm -%%DATADIR%%/sounds/vm-tocallback.gsm -%%DATADIR%%/sounds/vm-tocallnum.gsm -%%DATADIR%%/sounds/vm-tocancel.gsm -%%DATADIR%%/sounds/vm-tocancelmsg.gsm -%%DATADIR%%/sounds/vm-toenternumber.gsm -%%DATADIR%%/sounds/vm-toforward.gsm -%%DATADIR%%/sounds/vm-tohearenv.gsm -%%DATADIR%%/sounds/vm-tomakecall.gsm -%%DATADIR%%/sounds/vm-tooshort.gsm -%%DATADIR%%/sounds/vm-toreply.gsm -%%DATADIR%%/sounds/vm-torerecord.gsm -%%DATADIR%%/sounds/vm-undelete.gsm -%%DATADIR%%/sounds/vm-undeleted.gsm -%%DATADIR%%/sounds/vm-unknown-caller.gsm -%%DATADIR%%/sounds/vm-whichbox.gsm -%%DATADIR%%/sounds/vm-youhave.gsm -@exec mkdir -p %%DATADIR%%/sounds/priv-callerintros -@dirrm %%DATADIR%%/sounds/silence -@dirrm %%DATADIR%%/sounds/priv-callerintros -@dirrm %%DATADIR%%/sounds/phonetic -@dirrm %%DATADIR%%/sounds/letters -@dirrm %%DATADIR%%/sounds/digits -@dirrm %%DATADIR%%/sounds/dictate -@dirrm %%DATADIR%%/sounds -@dirrm %%DATADIR%%/mohmp3 -@dirrm %%DATADIR%%/keys -@dirrm %%DATADIR%%/images -@dirrm %%DATADIR%%/firmware/iax -@dirrm %%DATADIR%%/firmware -@dirrm %%DATADIR%%/agi-bin -@dirrm %%DATADIR%% -@dirrm lib/asterisk/modules -@dirrm lib/asterisk -@dirrm include/asterisk -@dirrm etc/asterisk -@cwd /var -spool/asterisk/voicemail/default/1234/busy.gsm -spool/asterisk/voicemail/default/1234/unavail.gsm -@exec mkdir -p %D/log/asterisk/cdr-csv -@exec mkdir -p %D/log/asterisk/cdr-custom -@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX -@exec mkdir -p %D/spool/asterisk/dictate -@exec mkdir -p %D/spool/asterisk/meetme -@exec mkdir -p %D/spool/asterisk/monitor -@exec mkdir -p %D/spool/asterisk/system -@exec mkdir -p %D/spool/asterisk/tmp -@dirrm spool/asterisk/dictate -@dirrm spool/asterisk/meetme -@dirrm spool/asterisk/monitor -@dirrm spool/asterisk/system -@dirrm spool/asterisk/voicemail/default/1234/INBOX -@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/cdr-custom -@dirrm log/asterisk -- cgit v1.2.3