[asterisk-commits] branch russell/autoconf_and_menuselect - r8399 in /team/russell/autoconf_and_...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Sat Jan 21 13:11:28 MST 2006


Author: russell
Date: Sat Jan 21 14:11:18 2006
New Revision: 8399

URL: http://svn.digium.com/view/asterisk?rev=8399&view=rev
Log:
Merged revisions 8336,8338,8345-8346,8348,8356-8357,8359-8362,8368,8370-8372,8378-8381,8387,8393 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r8336 | oej | 2006-01-20 09:32:30 -0500 (Fri, 20 Jan 2006) | 4 lines

- Add DOC file about caller ID presentation values
- Add callingpres to sip.conf
- Add reference to README.callingpres from zapata.conf

................
r8338 | kpfleming | 2006-01-20 12:27:51 -0500 (Fri, 20 Jan 2006) | 2 lines

eliminate compiler warnings from recent const-ification

................
r8345 | mattf | 2006-01-20 13:17:46 -0500 (Fri, 20 Jan 2006) | 2 lines

Update config.  Apprently default doesn't always work now.

................
r8346 | mattf | 2006-01-20 13:18:40 -0500 (Fri, 20 Jan 2006) | 2 lines

Change chan_alsa to default open the first sound card device

................
r8348 | russell | 2006-01-20 13:40:24 -0500 (Fri, 20 Jan 2006) | 10 lines

Merged revisions 8347 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r8347 | russell | 2006-01-20 13:34:42 -0500 (Fri, 20 Jan 2006) | 2 lines

fix invalid value of prev_q (issue #6302)

........

................
r8356 | russell | 2006-01-20 14:24:42 -0500 (Fri, 20 Jan 2006) | 11 lines

- move ast_strdupa from channel.h to utils.h
- attempt to log an error message if the __builtin_alloca inside of ast_strdupa
  fails.
- document the fact that it is known and intended behavior for ast_strdupa to
  cause Asterisk to crash if the alloca fails
- use __builtin_expect when checking for allocation failure in all of the
  allocation wrappers

New Janitor Project!  Anywhere that we check for a successful allocation after
a call to ast_strdupa is unnecessary and should be removed.

................
r8357 | mattf | 2006-01-20 16:36:33 -0500 (Fri, 20 Jan 2006) | 2 lines

Fix for formats so they give better output on failure conditions. (#6141)

................
r8359 | mattf | 2006-01-20 18:19:49 -0500 (Fri, 20 Jan 2006) | 2 lines

Fix comments in sip.conf (#6134)

................
r8360 | russell | 2006-01-20 18:23:00 -0500 (Fri, 20 Jan 2006) | 2 lines

formatting and doxygen fixes (issue #6300)

................
r8361 | mattf | 2006-01-20 18:28:37 -0500 (Fri, 20 Jan 2006) | 2 lines

fix for codec_gsm on ia64 (#6294)

................
r8362 | russell | 2006-01-20 19:42:25 -0500 (Fri, 20 Jan 2006) | 2 lines

remove some useless checks after calls to ast_strdupa

................
r8368 | russell | 2006-01-20 22:09:01 -0500 (Fri, 20 Jan 2006) | 2 lines

remove optimization where its benefits are negligible

................
r8370 | tilghman | 2006-01-21 00:05:45 -0500 (Sat, 21 Jan 2006) | 2 lines

Bug 6096 - callerid_parse cleanup

................
r8371 | tilghman | 2006-01-21 00:15:56 -0500 (Sat, 21 Jan 2006) | 2 lines

Bug 5515 - Devicestate and API documentation update

................
r8372 | tilghman | 2006-01-21 00:22:18 -0500 (Sat, 21 Jan 2006) | 2 lines

Bug 4872 - Make Asterisk paths available to AGIs via environmental variables

................
r8378 | russell | 2006-01-21 03:01:24 -0500 (Sat, 21 Jan 2006) | 2 lines

remove some useless checks of the result of ast_strdupa

................
r8379 | russell | 2006-01-21 03:13:12 -0500 (Sat, 21 Jan 2006) | 2 lines

remove lots of useless checks of the result of ast_strdupa

................
r8380 | russell | 2006-01-21 03:23:57 -0500 (Sat, 21 Jan 2006) | 2 lines

remove useless checks of the result of ast_strdupa

................
r8381 | russell | 2006-01-21 03:45:39 -0500 (Sat, 21 Jan 2006) | 2 lines

conversions to use allocation wrappers (issue #6277)

................
r8387 | russell | 2006-01-21 12:50:04 -0500 (Sat, 21 Jan 2006) | 3 lines

revert my pass through the tree to remove checks of the result of ast_strdupa
(revisions 8378 through 8381)

................
r8393 | russell | 2006-01-21 13:11:40 -0500 (Sat, 21 Jan 2006) | 3 lines

don't do the memcpy inside of ast_strdupa if we know that __builtin_alloca 
was not successful

................

Added:
    team/russell/autoconf_and_menuselect/doc/README.callingpres
      - copied unchanged from r8393, trunk/doc/README.callingpres
Modified:
    team/russell/autoconf_and_menuselect/   (props changed)
    team/russell/autoconf_and_menuselect/apps/app_queue.c
    team/russell/autoconf_and_menuselect/callerid.c
    team/russell/autoconf_and_menuselect/codecs/codec_a_mu.c
    team/russell/autoconf_and_menuselect/codecs/codec_adpcm.c
    team/russell/autoconf_and_menuselect/codecs/codec_alaw.c
    team/russell/autoconf_and_menuselect/codecs/codec_g723_1.c
    team/russell/autoconf_and_menuselect/codecs/codec_g726.c
    team/russell/autoconf_and_menuselect/codecs/codec_gsm.c
    team/russell/autoconf_and_menuselect/codecs/codec_ilbc.c
    team/russell/autoconf_and_menuselect/codecs/codec_lpc10.c
    team/russell/autoconf_and_menuselect/codecs/codec_speex.c
    team/russell/autoconf_and_menuselect/codecs/codec_ulaw.c
    team/russell/autoconf_and_menuselect/codecs/gsm/Makefile
    team/russell/autoconf_and_menuselect/configs/alsa.conf.sample
    team/russell/autoconf_and_menuselect/configs/sip.conf.sample
    team/russell/autoconf_and_menuselect/configs/zapata.conf.sample
    team/russell/autoconf_and_menuselect/formats/format_pcm.c
    team/russell/autoconf_and_menuselect/formats/format_pcm_alaw.c
    team/russell/autoconf_and_menuselect/include/asterisk/channel.h
    team/russell/autoconf_and_menuselect/include/asterisk/utils.h
    team/russell/autoconf_and_menuselect/pbx.c
    team/russell/autoconf_and_menuselect/res/res_agi.c

Propchange: team/russell/autoconf_and_menuselect/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Jan 21 14:11:18 2006
@@ -1,1 +1,1 @@
-/trunk:1-8327
+/trunk:1-8398

Modified: team/russell/autoconf_and_menuselect/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/russell/autoconf_and_menuselect/apps/app_queue.c?rev=8399&r1=8398&r2=8399&view=diff
==============================================================================
--- team/russell/autoconf_and_menuselect/apps/app_queue.c (original)
+++ team/russell/autoconf_and_menuselect/apps/app_queue.c Sat Jan 21 14:11:18 2006
@@ -2697,7 +2697,11 @@
 
 	LOCAL_USER_ADD(u);
 
-	parse = ast_strdupa(data);
+	if (!(parse = ast_strdupa(data))) {
+		ast_log(LOG_WARNING, "Memory Error!\n");
+		LOCAL_USER_REMOVE(u);
+		return -1;	
+	}
 
 	AST_STANDARD_APP_ARGS(args, parse);
 
@@ -2815,11 +2819,7 @@
 
 	LOCAL_USER_ADD(u);
 
-	if (!(parse = ast_strdupa(data))) {
-		ast_log(LOG_WARNING, "Memory Error!\n");
-		LOCAL_USER_REMOVE(u);
-		return -1;
-	}
+	parse = ast_strdupa(data);
 
 	AST_STANDARD_APP_ARGS(args, parse);
 

Modified: team/russell/autoconf_and_menuselect/callerid.c
URL: http://svn.digium.com/view/asterisk/team/russell/autoconf_and_menuselect/callerid.c?rev=8399&r1=8398&r2=8399&view=diff
==============================================================================
--- team/russell/autoconf_and_menuselect/callerid.c (original)
+++ team/russell/autoconf_and_menuselect/callerid.c Sat Jan 21 14:11:18 2006
@@ -862,6 +862,10 @@
 	return bytes;
 }
 
+/*
+ * remove '(', ' ', ')', non-trailing '.', and '-' not in square brackets.
+ * Basically, remove anything that could be invalid in a pattern.
+ */
 void ast_shrink_phone_number(char *n)
 {
 	int x,y=0;
@@ -908,53 +912,50 @@
 }
 
 /*! \brief parse string for caller id information 
-	\return returns -1 on failure, otherwise 0
+	\return always returns 0, as the code always returns something.
+  XXX note that 'name' is not parsed consistently e.g. we have
+
+	input			location	name
+	" foo bar " <123>	123		' foo bar ' (with spaces around)
+	" foo bar "		NULL		'foo bar' (without spaces around)
+	" foo bar  <123>"	123		'" foo bar'
+  The parsing of leading and trailing space/quotes should be more consistent.
 */
 int ast_callerid_parse(char *instr, char **name, char **location)
 {
-	char *ns, *ne;
-	char *ls, *le;
-	char tmp[256];
-	/* Try for "name" <location> format or 
-	   name <location> format */
+	char *ns, *ne, *ls, *le;
+
+	/* Try "name" <location> format or name <location> format */
 	if ((ls = strchr(instr, '<')) && (le = strchr(ls, '>'))) {
-		/* Found the location */
-		*le = '\0';
-		*ls = '\0';
-		*location = ls + 1;
-		if ((ns = strchr(instr, '\"')) && (ne = strchr(ns + 1, '\"'))) {
-			/* Get name out of quotes */
-			*ns = '\0';
-			*ne = '\0';
-			*name = ns + 1;
-			return 0;
-		} else {
-			/* Just trim off any trailing spaces */
-			*name = instr;
-			while(!ast_strlen_zero(instr) && (instr[strlen(instr) - 1] < 33))
-				instr[strlen(instr) - 1] = '\0';
-			/* And leading spaces */
-			*name = ast_skip_blanks(*name);
-			return 0;
-		}
-	} else {
+		*ls = *le = '\0';	/* location found, trim off the brackets */
+		*location = ls + 1;	/* and this is the result */
+		if ((ns = strchr(instr, '"')) && (ne = strchr(ns + 1, '"'))) {
+			*ns = *ne = '\0';	/* trim off the quotes */
+			*name = ns + 1;		/* and this is the name */
+		} else { /* no quotes, trim off leading and trailing spaces */
+			*name = ast_skip_blanks(instr);
+			ast_trim_blanks(*name);
+		}
+	} else {	/* no valid brackets */
+		char tmp[256];
 		ast_copy_string(tmp, instr, sizeof(tmp));
 		ast_shrink_phone_number(tmp);
-		if (ast_isphonenumber(tmp)) {
-			/* Assume it's just a location */
+		if (ast_isphonenumber(tmp)) {	/* Assume it's just a location */
 			*name = NULL;
+			strcpy(instr, tmp); /* safe, because tmp will always be the same size or smaller than instr */
 			*location = instr;
-		} else {
-			/* Assume it's just a name.  Make sure it's not quoted though */
-			*name = instr;
-			while(*(*name) && ((*(*name) < 33) || (*(*name) == '\"'))) (*name)++;
-			ne = *name + strlen(*name) - 1;
-			while((ne > *name) && ((*ne < 33) || (*ne == '\"'))) { *ne = '\0'; ne--; }
+		} else { /* Assume it's just a name. */
 			*location = NULL;
-		}
-		return 0;
-	}
-	return -1;
+			if ((ns = strchr(instr, '"')) && (ne = strchr(ns + 1, '"'))) {
+				*ns = *ne = '\0';	/* trim off the quotes */
+				*name = ns + 1;		/* and this is the name */
+			} else { /* no quotes, trim off leading and trailing spaces */
+				*name = ast_skip_blanks(instr);
+				ast_trim_blanks(*name);
+			}
+		}
+	}
+	return 0;
 }
 
 static int __ast_callerid_generate(unsigned char *buf, char *name, char *number, int callwaiting, int codec)
@@ -995,12 +996,8 @@
 {
 	char *tmp;
 	char *l = NULL, *n = NULL;
+	
 	tmp = ast_strdupa(buf);
-	if (!tmp) {
-		name[0] = '\0';
-		num[0] = '\0';
-		return -1;
-	}
 	ast_callerid_parse(tmp, &n, &l);
 	if (n)
 		ast_copy_string(name, n, namelen);

Modified: team/russell/autoconf_and_menuselect/codecs/codec_a_mu.c
URL: http://svn.digium.com/view/asterisk/team/russell/autoconf_and_menuselect/codecs/codec_a_mu.c?rev=8399&r1=8398&r2=8399&view=diff
==============================================================================
--- team/russell/autoconf_and_menuselect/codecs/codec_a_mu.c (original)
+++ team/russell/autoconf_and_menuselect/codecs/codec_a_mu.c Sat Jan 21 14:11:18 2006
@@ -41,6 +41,7 @@
 #include "asterisk/channel.h"
 #include "asterisk/alaw.h"
 #include "asterisk/ulaw.h"
+#include "asterisk/utils.h"
 
 #define BUFFER_SIZE   8096	/* size for the translation buffers */
 
@@ -62,10 +63,10 @@
 
 struct alaw_encoder_pvt
 {
-  struct ast_frame f;
-  char offset[AST_FRIENDLY_OFFSET];   /* Space to build offset */
-  unsigned char outbuf[BUFFER_SIZE];  /* Encoded alaw, two nibbles to a word */
-  int tail;
+	struct ast_frame f;
+	char offset[AST_FRIENDLY_OFFSET];	/* Space to build offset */
+	unsigned char outbuf[BUFFER_SIZE];	/* Encoded alaw, two nibbles to a word */
+	int tail;
 };
 
 /*
@@ -74,99 +75,91 @@
 
 struct ulaw_encoder_pvt
 {
-  struct ast_frame f;
-  char offset[AST_FRIENDLY_OFFSET];	/* Space to build offset */
-  unsigned char outbuf[BUFFER_SIZE];	/* Encoded ulaw values */
-  int tail;
+	struct ast_frame f;
+	char offset[AST_FRIENDLY_OFFSET];	/* Space to build offset */
+	unsigned char outbuf[BUFFER_SIZE];	/* Encoded ulaw values */
+	int tail;
 };
 
-static struct ast_translator_pvt *
-alawtoulaw_new (void)
-{
-  struct ulaw_encoder_pvt *tmp;
-  tmp = malloc (sizeof (struct ulaw_encoder_pvt));
-  if (tmp)
-    {
-	  memset(tmp, 0, sizeof(*tmp));
-      tmp->tail = 0;
-      localusecnt++;
-      ast_update_use_count ();
-    }
-  return (struct ast_translator_pvt *) tmp;
-}
-
-static struct ast_translator_pvt *
-ulawtoalaw_new (void)
-{
-  struct alaw_encoder_pvt *tmp;
-  tmp = malloc (sizeof (struct alaw_encoder_pvt));
-  if (tmp)
-    {
-	  memset(tmp, 0, sizeof(*tmp));
-      localusecnt++;
-      ast_update_use_count ();
-      tmp->tail = 0;
-    }
-  return (struct ast_translator_pvt *) tmp;
-}
-
-static int
-alawtoulaw_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
-{
-  struct ulaw_encoder_pvt *tmp = (struct ulaw_encoder_pvt *) pvt;
-  int x;
-  unsigned char *b;
-
-  if ((tmp->tail + f->datalen)> sizeof(tmp->outbuf)) {
-  	ast_log(LOG_WARNING, "Out of buffer space\n");
-	return -1;
-  }
-
-  /* Reset ssindex and signal to frame's specified values */
-  b = f->data;
-  for (x=0;x<f->datalen;x++)
-  	tmp->outbuf[tmp->tail + x] = a2mu[b[x]];
-
-  tmp->tail += f->datalen;
-  return 0;
-}
-
-static struct ast_frame *
-alawtoulaw_frameout (struct ast_translator_pvt *pvt)
-{
-  struct ulaw_encoder_pvt *tmp = (struct ulaw_encoder_pvt *) pvt;
-
-  if (!tmp->tail)
-    return NULL;
-
-  tmp->f.frametype = AST_FRAME_VOICE;
-  tmp->f.subclass = AST_FORMAT_ULAW;
-  tmp->f.datalen = tmp->tail;
-  tmp->f.samples = tmp->tail;
-  tmp->f.mallocd = 0;
-  tmp->f.offset = AST_FRIENDLY_OFFSET;
-  tmp->f.src = __PRETTY_FUNCTION__;
-  tmp->f.data = tmp->outbuf;
-  tmp->tail = 0;
-  return &tmp->f;
-}
-
-static int
-ulawtoalaw_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
-{
-  struct alaw_encoder_pvt *tmp = (struct alaw_encoder_pvt *) pvt;
-  int x;
-  unsigned char *s;
-  if (tmp->tail + f->datalen >= sizeof(tmp->outbuf))
-    {
-      ast_log (LOG_WARNING, "Out of buffer space\n");
-      return -1;
-    }
-  s = f->data;
-  for (x=0;x<f->datalen;x++) 
-  	tmp->outbuf[x+tmp->tail] = mu2a[s[x]];
-  tmp->tail += f->datalen;
-  return 0;
+static struct ast_translator_pvt *alawtoulaw_new(void)
+{
+	struct ulaw_encoder_pvt *tmp;
+	
+	if ((tmp = ast_calloc(1, sizeof(*tmp)))) {
+		tmp->tail = 0;
+		localusecnt++;
+		ast_update_use_count();
+	}
+
+	return (struct ast_translator_pvt *)tmp;
+}
+
+static struct ast_translator_pvt *ulawtoalaw_new(void)
+{
+	struct alaw_encoder_pvt *tmp;
+	
+	if ((tmp = ast_calloc(1, sizeof(*tmp)))) {
+		localusecnt++;
+		ast_update_use_count();
+		tmp->tail = 0;
+	}
+
+	return (struct ast_translator_pvt *)tmp;
+}
+
+static int alawtoulaw_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
+{
+	struct ulaw_encoder_pvt *tmp = (struct ulaw_encoder_pvt *)pvt;
+	int x;
+	unsigned char *b;
+
+	if ((tmp->tail + f->datalen) > sizeof(tmp->outbuf)) {
+		ast_log(LOG_WARNING, "Out of buffer space\n");
+		return -1;
+	}
+
+	/* Reset ssindex and signal to frame's specified values */
+	b = f->data;
+	for (x=0;x<f->datalen;x++)
+		tmp->outbuf[tmp->tail + x] = a2mu[b[x]];
+
+	tmp->tail += f->datalen;
+	return 0;
+}
+
+static struct ast_frame *alawtoulaw_frameout(struct ast_translator_pvt *pvt)
+{
+	struct ulaw_encoder_pvt *tmp = (struct ulaw_encoder_pvt *)pvt;
+
+	if (!tmp->tail)
+		return NULL;
+
+	tmp->f.frametype = AST_FRAME_VOICE;
+	tmp->f.subclass = AST_FORMAT_ULAW;
+	tmp->f.datalen = tmp->tail;
+	tmp->f.samples = tmp->tail;
+	tmp->f.mallocd = 0;
+	tmp->f.offset = AST_FRIENDLY_OFFSET;
+	tmp->f.src = __PRETTY_FUNCTION__;
+	tmp->f.data = tmp->outbuf;
+	tmp->tail = 0;
+	return &tmp->f;
+}
+
+static int ulawtoalaw_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
+{
+	struct alaw_encoder_pvt *tmp = (struct alaw_encoder_pvt *)pvt;
+	int x;
+	unsigned char *s;
+	if (tmp->tail + f->datalen >= sizeof(tmp->outbuf)) {
+		ast_log(LOG_WARNING, "Out of buffer space\n");
+		return -1;
+	}
+	s = f->data;
+	for (x=0;x<f->datalen;x++) 
+		tmp->outbuf[x+tmp->tail] = mu2a[s[x]];
+	tmp->tail += f->datalen;
+	return 0;
 }
 
 /*
@@ -181,60 +174,56 @@
  *  Leftover inbuf data gets packed, tail gets updated.
  */
 
-static struct ast_frame *
-ulawtoalaw_frameout (struct ast_translator_pvt *pvt)
-{
-  struct alaw_encoder_pvt *tmp = (struct alaw_encoder_pvt *) pvt;
+static struct ast_frame *ulawtoalaw_frameout(struct ast_translator_pvt *pvt)
+{
+	struct alaw_encoder_pvt *tmp = (struct alaw_encoder_pvt *)pvt;
   
-  if (tmp->tail) {
-	  tmp->f.frametype = AST_FRAME_VOICE;
-	  tmp->f.subclass = AST_FORMAT_ALAW;
-	  tmp->f.samples = tmp->tail;
-	  tmp->f.mallocd = 0;
-	  tmp->f.offset = AST_FRIENDLY_OFFSET;
-	  tmp->f.src = __PRETTY_FUNCTION__;
-	  tmp->f.data = tmp->outbuf;
-	  tmp->f.datalen = tmp->tail;
-	  tmp->tail = 0;
-	  return &tmp->f;
-   } else return NULL;
-}
-
+	if (tmp->tail) {
+		tmp->f.frametype = AST_FRAME_VOICE;
+		tmp->f.subclass = AST_FORMAT_ALAW;
+		tmp->f.samples = tmp->tail;
+		tmp->f.mallocd = 0;
+		tmp->f.offset = AST_FRIENDLY_OFFSET;
+		tmp->f.src = __PRETTY_FUNCTION__;
+		tmp->f.data = tmp->outbuf;
+		tmp->f.datalen = tmp->tail;
+		tmp->tail = 0;
+		return &tmp->f;
+	} else
+		return NULL;
+}
 
 /*
  * alawToLin_Sample
  */
 
-static struct ast_frame *
-alawtoulaw_sample (void)
-{
-  static struct ast_frame f;
-  f.frametype = AST_FRAME_VOICE;
-  f.subclass = AST_FORMAT_ALAW;
-  f.datalen = sizeof (ulaw_slin_ex);
-  f.samples = sizeof(ulaw_slin_ex);
-  f.mallocd = 0;
-  f.offset = 0;
-  f.src = __PRETTY_FUNCTION__;
-  f.data = ulaw_slin_ex;
-  return &f;
-}
-
-static struct ast_frame *
-ulawtoalaw_sample (void)
-{
-  static struct ast_frame f;
-  f.frametype = AST_FRAME_VOICE;
-  f.subclass = AST_FORMAT_ULAW;
-  f.datalen = sizeof (ulaw_slin_ex);
-  f.samples = sizeof(ulaw_slin_ex);
-  f.mallocd = 0;
-  f.offset = 0;
-  f.src = __PRETTY_FUNCTION__;
-  f.data = ulaw_slin_ex;
-  return &f;
-}
-
+static struct ast_frame *alawtoulaw_sample(void)
+{
+	static struct ast_frame f;
+	f.frametype = AST_FRAME_VOICE;
+	f.subclass = AST_FORMAT_ALAW;
+	f.datalen = sizeof(ulaw_slin_ex);
+	f.samples = sizeof(ulaw_slin_ex);
+	f.mallocd = 0;
+	f.offset = 0;
+	f.src = __PRETTY_FUNCTION__;
+	f.data = ulaw_slin_ex;
+	return &f;
+}
+
+static struct ast_frame *ulawtoalaw_sample(void)
+{
+	static struct ast_frame f;
+	f.frametype = AST_FRAME_VOICE;
+	f.subclass = AST_FORMAT_ULAW;
+	f.datalen = sizeof(ulaw_slin_ex);
+	f.samples = sizeof(ulaw_slin_ex);
+	f.mallocd = 0;
+	f.offset = 0;
+	f.src = __PRETTY_FUNCTION__;
+	f.data = ulaw_slin_ex;
+	return &f;
+}
 
 /*
  * alaw_Destroy
@@ -247,12 +236,11 @@
  *  None.
  */
 
-static void
-alaw_destroy (struct ast_translator_pvt *pvt)
-{
-  free (pvt);
-  localusecnt--;
-  ast_update_use_count ();
+static void alaw_destroy(struct ast_translator_pvt *pvt)
+{
+	free(pvt);
+	localusecnt--;
+	ast_update_use_count();
 }
 
 /*
@@ -260,15 +248,15 @@
  */
 
 static struct ast_translator alawtoulaw = {
-  "alawtoulaw",
-  AST_FORMAT_ALAW,
-  AST_FORMAT_ULAW,
-  alawtoulaw_new,
-  alawtoulaw_framein,
-  alawtoulaw_frameout,
-  alaw_destroy,
-  /* NULL */
-  alawtoulaw_sample
+	"alawtoulaw",
+	AST_FORMAT_ALAW,
+	AST_FORMAT_ULAW,
+	alawtoulaw_new,
+	alawtoulaw_framein,
+	alawtoulaw_frameout,
+	alaw_destroy,
+	/* NULL */
+	alawtoulaw_sample
 };
 
 /*
@@ -276,68 +264,63 @@
  */
 
 static struct ast_translator ulawtoalaw = {
-  "ulawtoalaw",
-  AST_FORMAT_ULAW,
-  AST_FORMAT_ALAW,
-  ulawtoalaw_new,
-  ulawtoalaw_framein,
-  ulawtoalaw_frameout,
-  alaw_destroy,
-  /* NULL */
-  ulawtoalaw_sample
+	"ulawtoalaw",
+	AST_FORMAT_ULAW,
+	AST_FORMAT_ALAW,
+	ulawtoalaw_new,
+	ulawtoalaw_framein,
+	ulawtoalaw_frameout,
+	alaw_destroy,
+	/* NULL */
+	ulawtoalaw_sample
 };
 
-int
-unload_module (void)
-{
-  int res;
-  ast_mutex_lock (&localuser_lock);
-  res = ast_unregister_translator (&ulawtoalaw);
-  if (!res)
-    res = ast_unregister_translator (&alawtoulaw);
-  if (localusecnt)
-    res = -1;
-  ast_mutex_unlock (&localuser_lock);
-  return res;
-}
-
-int
-load_module (void)
-{
-  int res;
-  int x;
-  for (x=0;x<256;x++) {
-	mu2a[x] = AST_LIN2A(AST_MULAW(x));
-	a2mu[x] = AST_LIN2MU(AST_ALAW(x));
-  }
-  res = ast_register_translator (&alawtoulaw);
-  if (!res)
-    res = ast_register_translator (&ulawtoalaw);
-  else
-    ast_unregister_translator (&alawtoulaw);
-  return res;
+int unload_module(void)
+{
+	int res;
+	ast_mutex_lock(&localuser_lock);
+	res = ast_unregister_translator(&ulawtoalaw);
+	if (!res)
+		res = ast_unregister_translator(&alawtoulaw);
+	if (localusecnt)
+		res = -1;
+	ast_mutex_unlock(&localuser_lock);
+	return res;
+}
+
+int load_module(void)
+{
+	int res;
+	int x;
+	for (x=0;x<256;x++) {
+		mu2a[x] = AST_LIN2A(AST_MULAW(x));
+		a2mu[x] = AST_LIN2MU(AST_ALAW(x));
+	}
+	res = ast_register_translator(&alawtoulaw);
+	if (!res)
+		res = ast_register_translator(&ulawtoalaw);
+	else
+		ast_unregister_translator(&alawtoulaw);
+	return res;
 }
 
 /*
  * Return a description of this module.
  */
 
-char *
-description (void)
-{
-  return tdesc;
-}
-
-int
-usecount (void)
-{
-  int res;
-  STANDARD_USECOUNT (res);
-  return res;
-}
-
-char *
-key ()
-{
-  return ASTERISK_GPL_KEY;
-}
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}

Modified: team/russell/autoconf_and_menuselect/codecs/codec_adpcm.c
URL: http://svn.digium.com/view/asterisk/team/russell/autoconf_and_menuselect/codecs/codec_adpcm.c?rev=8399&r1=8398&r2=8399&view=diff
==============================================================================
--- team/russell/autoconf_and_menuselect/codecs/codec_adpcm.c (original)
+++ team/russell/autoconf_and_menuselect/codecs/codec_adpcm.c Sat Jan 21 14:11:18 2006
@@ -45,6 +45,7 @@
 #include "asterisk/options.h"
 #include "asterisk/translate.h"
 #include "asterisk/channel.h"
+#include "asterisk/utils.h"
 
 /* define NOT_BLI to use a faster but not bit-level identical version */
 /* #define NOT_BLI */
@@ -102,8 +103,7 @@
  *  Sets the index to the step size table for the next encode.
  */
 
-static inline short
-decode(int encoded, struct adpcm_state* state)
+static inline short decode(int encoded, struct adpcm_state *state)
 {
 	int diff;
 	int step;
@@ -117,9 +117,12 @@
 	diff = (((encoded << 1) + 1) * step) >> 3;
 #else /* BLI code */
 	diff = step >> 3;
-	if (encoded & 4) diff += step;
-	if (encoded & 2) diff += step >> 1;
-	if (encoded & 1) diff += step >> 2;
+	if (encoded & 4)
+		diff += step;
+	if (encoded & 2)
+		diff += step >> 1;
+	if (encoded & 1)
+		diff += step >> 2;
 	if ((encoded >> 1) & step & 0x1)
 		diff++;
 #endif
@@ -143,8 +146,7 @@
 #ifdef AUTO_RETURN
 	if (encoded)
 		state->zero_count = 0;
-	else if (++(state->zero_count) == 24)
-	{
+	else if (++(state->zero_count) == 24) {
 		state->zero_count = 0;
 		if (state->signal > 0)
 			state->next_flag = 0x1;
@@ -174,51 +176,43 @@
  *  signal gets updated with each pass.
  */
 
-static inline int
-adpcm(short csig, struct adpcm_state* state)
+static inline int adpcm(short csig, struct adpcm_state *state)
 {
 	int diff;
 	int step;
 	int encoded;
 
 	/* 
-	* Clip csig if too large or too small
-	*/
+	 * Clip csig if too large or too small
+	 */
 	csig >>= 4;
 
 	step = stpsz[state->ssindex];
 	diff = csig - state->signal;
 
 #ifdef NOT_BLI
-	if (diff < 0)
-	{
+	if (diff < 0) {
 		encoded = (-diff << 2) / step;
 		if (encoded > 7)
 			encoded = 7;
 		encoded |= 0x08;
-	}
-	else
-	{
+	} else {
 		encoded = (diff << 2) / step;
 		if (encoded > 7)
 			encoded = 7;
 	}
 #else /* BLI code */
-	if (diff < 0)
-	{
+	if (diff < 0) {
 		encoded = 8;
 		diff = -diff;
-	}
-	else
+	} else
 		encoded = 0;
-	if (diff >= step)
-	{
+	if (diff >= step) {
 		encoded |= 4;
 		diff -= step;
 	}
 	step >>= 1;
-	if (diff >= step)
-	{
+	if (diff >= step) {
 		encoded |= 2;
 		diff -= step;
 	}
@@ -239,12 +233,12 @@
 
 struct adpcm_encoder_pvt
 {
-  struct ast_frame f;
-  char offset[AST_FRIENDLY_OFFSET];   /* Space to build offset */
-  short inbuf[BUFFER_SIZE];           /* Unencoded signed linear values */
-  unsigned char outbuf[BUFFER_SIZE];  /* Encoded ADPCM, two nibbles to a word */
-  struct adpcm_state state;
-  int tail;
+	struct ast_frame f;
+	char offset[AST_FRIENDLY_OFFSET];	/* Space to build offset */
+	short inbuf[BUFFER_SIZE];		/* Unencoded signed linear values */
+	unsigned char outbuf[BUFFER_SIZE];	/* Encoded ADPCM, two nibbles to a word */
+	struct adpcm_state state;
+	int tail;
 };
 
 /*
@@ -253,12 +247,12 @@
 
 struct adpcm_decoder_pvt
 {
-  struct ast_frame f;
-  char offset[AST_FRIENDLY_OFFSET];	/* Space to build offset */
-  short outbuf[BUFFER_SIZE];	/* Decoded signed linear values */
-  struct adpcm_state state;
-  int tail;
-  plc_state_t plc;
+	struct ast_frame f;
+	char offset[AST_FRIENDLY_OFFSET];	/* Space to build offset */
+	short outbuf[BUFFER_SIZE];		/* Decoded signed linear values */
+	struct adpcm_state state;
+	int tail;
+	plc_state_t plc;
 };
 
 /*
@@ -272,20 +266,18 @@
  *  None.
  */
 
-static struct ast_translator_pvt *
-adpcmtolin_new (void)
-{
-  struct adpcm_decoder_pvt *tmp;
-  tmp = malloc (sizeof (struct adpcm_decoder_pvt));
-  if (tmp)
-    {
-	  memset(tmp, 0, sizeof(*tmp));
-      tmp->tail = 0;
-      plc_init(&tmp->plc);
-      localusecnt++;
-      ast_update_use_count ();
-    }
-  return (struct ast_translator_pvt *) tmp;
+static struct ast_translator_pvt *adpcmtolin_new(void)
+{
+	struct adpcm_decoder_pvt *tmp;
+	
+	if ((tmp = ast_calloc(1, sizeof(*tmp)))) {
+		tmp->tail = 0;
+		plc_init(&tmp->plc);
+		localusecnt++;
+		ast_update_use_count();
+	}
+
+	return (struct ast_translator_pvt *)tmp;
 }
 
 /*
@@ -299,19 +291,17 @@
  *  None.
  */
 
-static struct ast_translator_pvt *
-lintoadpcm_new (void)
-{
-  struct adpcm_encoder_pvt *tmp;
-  tmp = malloc (sizeof (struct adpcm_encoder_pvt));
-  if (tmp)
-    {
-	  memset(tmp, 0, sizeof(*tmp));
-      localusecnt++;
-      ast_update_use_count ();
-      tmp->tail = 0;
-    }
-  return (struct ast_translator_pvt *) tmp;
+static struct ast_translator_pvt *lintoadpcm_new(void)
+{
+	struct adpcm_encoder_pvt *tmp;
+	
+	if ((tmp = ast_calloc(1, sizeof(*tmp)))) {
+		localusecnt++;
+		ast_update_use_count();
+		tmp->tail = 0;
+	}
+
+	return (struct ast_translator_pvt *)tmp;
 }
 
 /*
@@ -326,40 +316,40 @@
  *  tmp->tail is the number of packed values in the buffer.
  */
 
-static int
-adpcmtolin_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
-{
-  struct adpcm_decoder_pvt *tmp = (struct adpcm_decoder_pvt *) pvt;
-  int x;
-  unsigned char *b;
-
-  if(f->datalen == 0) { /* perform PLC with nominal framesize of 20ms/160 samples */
-        if((tmp->tail + 160) > sizeof(tmp->outbuf) / 2) {
-            ast_log(LOG_WARNING, "Out of buffer space\n");
-            return -1;
-        }
-        if(useplc) {
-	  plc_fillin(&tmp->plc, tmp->outbuf+tmp->tail, 160);
-	  tmp->tail += 160;
-	}
-        return 0;
-  }
-
-  if (f->datalen * 4 + tmp->tail * 2 > sizeof(tmp->outbuf)) {
-  	ast_log(LOG_WARNING, "Out of buffer space\n");
-	return -1;
-  }
-
-  b = f->data;
-
-  for (x=0;x<f->datalen;x++) {
-	tmp->outbuf[tmp->tail++] = decode((b[x] >> 4) & 0xf, &tmp->state);
-	tmp->outbuf[tmp->tail++] = decode(b[x] & 0x0f, &tmp->state);
-  }
-
-  if(useplc) plc_rx(&tmp->plc, tmp->outbuf+tmp->tail-f->datalen*2, f->datalen*2);
-
-  return 0;
+static int adpcmtolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
+{
+	struct adpcm_decoder_pvt *tmp = (struct adpcm_decoder_pvt *)pvt;
+	int x;
+	unsigned char *b;
+
+	if(f->datalen == 0) { /* perform PLC with nominal framesize of 20ms/160 samples */
+		if((tmp->tail + 160) > sizeof(tmp->outbuf) / 2) {
+			ast_log(LOG_WARNING, "Out of buffer space\n");
+			return -1;
+		}
+		if(useplc) {
+			plc_fillin(&tmp->plc, tmp->outbuf+tmp->tail, 160);
+			tmp->tail += 160;
+		}
+		return 0;
+	}
+
+	if (f->datalen * 4 + tmp->tail * 2 > sizeof(tmp->outbuf)) {
+		ast_log(LOG_WARNING, "Out of buffer space\n");
+		return -1;
+	}
+
+	b = f->data;
+
+	for (x=0;x<f->datalen;x++) {
+		tmp->outbuf[tmp->tail++] = decode((b[x] >> 4) & 0xf, &tmp->state);
+		tmp->outbuf[tmp->tail++] = decode(b[x] & 0x0f, &tmp->state);
+	}
+
+	if(useplc)
+		plc_rx(&tmp->plc, tmp->outbuf+tmp->tail-f->datalen*2, f->datalen*2);
+
+	return 0;
 }
 
 /*
@@ -374,24 +364,23 @@
  *  None.
  */
 
-static struct ast_frame *
-adpcmtolin_frameout (struct ast_translator_pvt *pvt)
-{
-  struct adpcm_decoder_pvt *tmp = (struct adpcm_decoder_pvt *) pvt;
-
-  if (!tmp->tail)
-    return NULL;
-
-  tmp->f.frametype = AST_FRAME_VOICE;
-  tmp->f.subclass = AST_FORMAT_SLINEAR;
-  tmp->f.datalen = tmp->tail *2;
-  tmp->f.samples = tmp->tail;
-  tmp->f.mallocd = 0;
-  tmp->f.offset = AST_FRIENDLY_OFFSET;
-  tmp->f.src = __PRETTY_FUNCTION__;
-  tmp->f.data = tmp->outbuf;
-  tmp->tail = 0;
-  return &tmp->f;
+static struct ast_frame *adpcmtolin_frameout(struct ast_translator_pvt *pvt)
+{
+	struct adpcm_decoder_pvt *tmp = (struct adpcm_decoder_pvt *)pvt;
+
+	if (!tmp->tail)
+		return NULL;
+
+	tmp->f.frametype = AST_FRAME_VOICE;
+	tmp->f.subclass = AST_FORMAT_SLINEAR;
+	tmp->f.datalen = tmp->tail * 2;
+	tmp->f.samples = tmp->tail;
+	tmp->f.mallocd = 0;
+	tmp->f.offset = AST_FRIENDLY_OFFSET;
+	tmp->f.src = __PRETTY_FUNCTION__;
+	tmp->f.data = tmp->outbuf;
+	tmp->tail = 0;
+	return &tmp->f;
 }
 
 /*
@@ -405,22 +394,18 @@
  *  tmp->tail is number of signal values in the input buffer.
  */
 
-static int
-lintoadpcm_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
-{
-  struct adpcm_encoder_pvt *tmp = (struct adpcm_encoder_pvt *) pvt;
-
-  if ((tmp->tail + f->datalen / 2) < (sizeof (tmp->inbuf) / 2))
-    {
-      memcpy (&tmp->inbuf[tmp->tail], f->data, f->datalen);
-      tmp->tail += f->datalen / 2;
-    }
-  else
-    {
-      ast_log (LOG_WARNING, "Out of buffer space\n");
-      return -1;
-    }
-  return 0;
+static int lintoadpcm_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
+{
+	struct adpcm_encoder_pvt *tmp = (struct adpcm_encoder_pvt *)pvt;
+
+	if ((tmp->tail + f->datalen / 2) < (sizeof(tmp->inbuf) / 2)) {
+		memcpy(&tmp->inbuf[tmp->tail], f->data, f->datalen);
+		tmp->tail += f->datalen / 2;
+	} else {
+		ast_log(LOG_WARNING, "Out of buffer space\n");
+		return -1;
+	}
+	return 0;
 }
 
 /*
@@ -435,54 +420,50 @@
  *  Leftover inbuf data gets packed, tail gets updated.
  */
 
-static struct ast_frame *
-lintoadpcm_frameout (struct ast_translator_pvt *pvt)
-{
-  struct adpcm_encoder_pvt *tmp = (struct adpcm_encoder_pvt *) pvt;
-  int i_max, i;
+static struct ast_frame *lintoadpcm_frameout(struct ast_translator_pvt *pvt)
+{
+	struct adpcm_encoder_pvt *tmp = (struct adpcm_encoder_pvt *)pvt;
+	int i_max, i;
   
-  if (tmp->tail < 2) return NULL;
-
-
-  i_max = tmp->tail & ~1; /* atomic size is 2 samples */
-
-  /* What is this, state debugging? should be #ifdef'd then
-  tmp->outbuf[0] = tmp->ssindex & 0xff;
-  tmp->outbuf[1] = (tmp->signal >> 8) & 0xff;
-  tmp->outbuf[2] = (tmp->signal & 0xff);
-  tmp->outbuf[3] = tmp->zero_count;
-  tmp->outbuf[4] = tmp->next_flag;
-  */
-  for (i = 0; i < i_max; i+=2)
-  {
-    tmp->outbuf[i/2] =
-      (adpcm(tmp->inbuf[i  ], &tmp->state) << 4) |
-	  (adpcm(tmp->inbuf[i+1], &tmp->state)     );
-  };
-
-
-  tmp->f.frametype = AST_FRAME_VOICE;
-  tmp->f.subclass = AST_FORMAT_ADPCM;
-  tmp->f.samples = i_max;
-  tmp->f.mallocd = 0;
-  tmp->f.offset = AST_FRIENDLY_OFFSET;
-  tmp->f.src = __PRETTY_FUNCTION__;
-  tmp->f.data = tmp->outbuf;
-  tmp->f.datalen = i_max / 2;
-
-  /*
-   * If there is a signal left over (there should be no more than
-   * one) move it to the beginning of the input buffer.
-   */
-
-  if (tmp->tail == i_max)
-    tmp->tail = 0;
-  else
-    {
-      tmp->inbuf[0] = tmp->inbuf[tmp->tail];
-      tmp->tail = 1;
-    }
-  return &tmp->f;
+	if (tmp->tail < 2)
+		return NULL;
+
+	i_max = tmp->tail & ~1; /* atomic size is 2 samples */
+
+	/* What is this, state debugging? should be #ifdef'd then
+	tmp->outbuf[0] = tmp->ssindex & 0xff;
+	tmp->outbuf[1] = (tmp->signal >> 8) & 0xff;
+	tmp->outbuf[2] = (tmp->signal & 0xff);
+	tmp->outbuf[3] = tmp->zero_count;
+	tmp->outbuf[4] = tmp->next_flag;
+	*/
+	for (i = 0; i < i_max; i+=2) {
+		tmp->outbuf[i/2] =
+			(adpcm(tmp->inbuf[i  ], &tmp->state) << 4) |
+			(adpcm(tmp->inbuf[i+1], &tmp->state)     );
+	};
+
+	tmp->f.frametype = AST_FRAME_VOICE;
+	tmp->f.subclass = AST_FORMAT_ADPCM;
+	tmp->f.samples = i_max;
+	tmp->f.mallocd = 0;
+	tmp->f.offset = AST_FRIENDLY_OFFSET;
+	tmp->f.src = __PRETTY_FUNCTION__;
+	tmp->f.data = tmp->outbuf;
+	tmp->f.datalen = i_max / 2;
+
+	/*
+	 * If there is a signal left over (there should be no more than
+	 * one) move it to the beginning of the input buffer.
+	 */
+
+	if (tmp->tail == i_max)
+		tmp->tail = 0;
+	else {
+		tmp->inbuf[0] = tmp->inbuf[tmp->tail];
+		tmp->tail = 1;
+	}
+	return &tmp->f;
 }
 
 
@@ -490,39 +471,37 @@
  * AdpcmToLin_Sample
  */
 
-static struct ast_frame *
-adpcmtolin_sample (void)
-{
-  static struct ast_frame f;
-  f.frametype = AST_FRAME_VOICE;
-  f.subclass = AST_FORMAT_ADPCM;
-  f.datalen = sizeof (adpcm_slin_ex);
-  f.samples = sizeof(adpcm_slin_ex) * 2;
-  f.mallocd = 0;
-  f.offset = 0;
-  f.src = __PRETTY_FUNCTION__;
-  f.data = adpcm_slin_ex;
-  return &f;
+static struct ast_frame *adpcmtolin_sample(void)
+{
+	static struct ast_frame f;
+	f.frametype = AST_FRAME_VOICE;
+	f.subclass = AST_FORMAT_ADPCM;
+	f.datalen = sizeof(adpcm_slin_ex);
+	f.samples = sizeof(adpcm_slin_ex) * 2;
+	f.mallocd = 0;
+	f.offset = 0;
+	f.src = __PRETTY_FUNCTION__;
+	f.data = adpcm_slin_ex;
+	return &f;
 }
 
 /*
  * LinToAdpcm_Sample
  */
 
-static struct ast_frame *
-lintoadpcm_sample (void)
-{
-  static struct ast_frame f;
-  f.frametype = AST_FRAME_VOICE;
-  f.subclass = AST_FORMAT_SLINEAR;
-  f.datalen = sizeof (slin_adpcm_ex);
-  /* Assume 8000 Hz */
-  f.samples = sizeof (slin_adpcm_ex) / 2;
-  f.mallocd = 0;
-  f.offset = 0;
-  f.src = __PRETTY_FUNCTION__;
-  f.data = slin_adpcm_ex;
-  return &f;
+static struct ast_frame *lintoadpcm_sample(void)
+{
+	static struct ast_frame f;
+	f.frametype = AST_FRAME_VOICE;
+	f.subclass = AST_FORMAT_SLINEAR;
+	f.datalen = sizeof(slin_adpcm_ex);
+	/* Assume 8000 Hz */
+	f.samples = sizeof(slin_adpcm_ex) / 2;
+	f.mallocd = 0;
+	f.offset = 0;
+	f.src = __PRETTY_FUNCTION__;
+	f.data = slin_adpcm_ex;
+	return &f;
 }
 
 /*
@@ -536,12 +515,11 @@
  *  None.
  */
 
-static void
-adpcm_destroy (struct ast_translator_pvt *pvt)
-{
-  free (pvt);
-  localusecnt--;
-  ast_update_use_count ();
+static void adpcm_destroy(struct ast_translator_pvt *pvt)
+{
+	free(pvt);
+	localusecnt--;
+	ast_update_use_count();
 }
 
 /*
@@ -549,15 +527,15 @@
  */
 
 static struct ast_translator adpcmtolin = {
-  "adpcmtolin",
-  AST_FORMAT_ADPCM,
-  AST_FORMAT_SLINEAR,
-  adpcmtolin_new,
-  adpcmtolin_framein,
-  adpcmtolin_frameout,
-  adpcm_destroy,
-  /* NULL */
-  adpcmtolin_sample
+	"adpcmtolin",
+	AST_FORMAT_ADPCM,
+	AST_FORMAT_SLINEAR,
+	adpcmtolin_new,
+	adpcmtolin_framein,
+	adpcmtolin_frameout,
+	adpcm_destroy,
+	/* NULL */
+	adpcmtolin_sample
 };
 
 /*
@@ -565,91 +543,84 @@
  */
 
 static struct ast_translator lintoadpcm = {
-  "lintoadpcm",
-  AST_FORMAT_SLINEAR,
-  AST_FORMAT_ADPCM,
-  lintoadpcm_new,
-  lintoadpcm_framein,
-  lintoadpcm_frameout,
-  adpcm_destroy,
-  /* NULL */
-  lintoadpcm_sample
+	"lintoadpcm",
+	AST_FORMAT_SLINEAR,
+	AST_FORMAT_ADPCM,
+	lintoadpcm_new,
+	lintoadpcm_framein,
+	lintoadpcm_frameout,
+	adpcm_destroy,
+	/* NULL */
+	lintoadpcm_sample
 };
 
-static void 
-parse_config(void)
-{
-  struct ast_config *cfg;
-  struct ast_variable *var;
-  if ((cfg = ast_config_load("codecs.conf"))) {
-    if ((var = ast_variable_browse(cfg, "plc"))) {
-      while (var) {
-       if (!strcasecmp(var->name, "genericplc")) {
-         useplc = ast_true(var->value) ? 1 : 0;
-         if (option_verbose > 2)
-           ast_verbose(VERBOSE_PREFIX_3 "codec_adpcm: %susing generic PLC\n", useplc ? "" : "not ");
-       }
-       var = var->next;
-      }
-    }
-    ast_config_destroy(cfg);
-  }
-}
-
-int
-reload(void)
-{
-  parse_config();
-  return 0;
-}
-
-int
-unload_module (void)
-{
-  int res;
-  ast_mutex_lock (&localuser_lock);
-  res = ast_unregister_translator (&lintoadpcm);
-  if (!res)
-    res = ast_unregister_translator (&adpcmtolin);
-  if (localusecnt)
-    res = -1;
-  ast_mutex_unlock (&localuser_lock);
-  return res;
-}
-
-int
-load_module (void)
-{
-  int res;
-  parse_config();
-  res = ast_register_translator (&adpcmtolin);
-  if (!res)
-    res = ast_register_translator (&lintoadpcm);
-  else
-    ast_unregister_translator (&adpcmtolin);
-  return res;
+static void parse_config(void)
+{
+	struct ast_config *cfg;
+	struct ast_variable *var;
+	if ((cfg = ast_config_load("codecs.conf"))) {
+		if ((var = ast_variable_browse(cfg, "plc"))) {
+			while (var) {
+				if (!strcasecmp(var->name, "genericplc")) {
+					useplc = ast_true(var->value) ? 1 : 0;
+					if (option_verbose > 2)
+						ast_verbose(VERBOSE_PREFIX_3 "codec_adpcm: %susing generic PLC\n", useplc ? "" : "not ");
+				}
+				var = var->next;
+			}
+		}
+		ast_config_destroy(cfg);
+	}
+}
+
+int reload(void)
+{
+	parse_config();
+	return 0;
+}
+
+int unload_module(void)
+{
+	int res;
+	ast_mutex_lock(&localuser_lock);
+	res = ast_unregister_translator(&lintoadpcm);
+	if (!res)
+		res = ast_unregister_translator(&adpcmtolin);
+	if (localusecnt)
+		res = -1;
+	ast_mutex_unlock(&localuser_lock);
+	return res;
+}
+
+int load_module(void)
+{
+	int res;
+	parse_config();
+	res = ast_register_translator(&adpcmtolin);
+	if (!res)
+		res = ast_register_translator(&lintoadpcm);
+	else
+		ast_unregister_translator(&adpcmtolin);
+	return res;
 }
 
 /*
  * Return a description of this module.
  */
 
-char *
-description (void)
-{
-  return tdesc;
-}
-
-int
-usecount (void)
-{
-  int res;
-  STANDARD_USECOUNT (res);
-  return res;
-}
-
-char *
-key ()
-{
-  return ASTERISK_GPL_KEY;
-}
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}

Modified: team/russell/autoconf_and_menuselect/codecs/codec_alaw.c
URL: http://svn.digium.com/view/asterisk/team/russell/autoconf_and_menuselect/codecs/codec_alaw.c?rev=8399&r1=8398&r2=8399&view=diff
==============================================================================
--- team/russell/autoconf_and_menuselect/codecs/codec_alaw.c (original)
+++ team/russell/autoconf_and_menuselect/codecs/codec_alaw.c Sat Jan 21 14:11:18 2006
@@ -42,6 +42,7 @@
 #include "asterisk/translate.h"
 #include "asterisk/channel.h"
 #include "asterisk/alaw.h"
+#include "asterisk/utils.h"
 
 #define BUFFER_SIZE   8096	/* size for the translation buffers */
 
@@ -62,10 +63,10 @@
  */
 struct alaw_encoder_pvt
 {
-  struct ast_frame f;
-  char offset[AST_FRIENDLY_OFFSET];   /*!< Space to build offset */
-  unsigned char outbuf[BUFFER_SIZE];  /*!< Encoded alaw, two nibbles to a word */
-  int tail;
+	struct ast_frame f;
+	char offset[AST_FRIENDLY_OFFSET];   /*!< Space to build offset */
+	unsigned char outbuf[BUFFER_SIZE];  /*!< Encoded alaw, two nibbles to a word */
+	int tail;
 };
 
 /*!
@@ -73,11 +74,11 @@
  */
 struct alaw_decoder_pvt
 {
-  struct ast_frame f;
-  char offset[AST_FRIENDLY_OFFSET];	/* Space to build offset */
-  short outbuf[BUFFER_SIZE];	/* Decoded signed linear values */
-  int tail;
-  plc_state_t plc;
+	struct ast_frame f;
+	char offset[AST_FRIENDLY_OFFSET];	/* Space to build offset */
+	short outbuf[BUFFER_SIZE];		/* Decoded signed linear values */
+	int tail;
+	plc_state_t plc;
 };
 
 /*!
@@ -91,19 +92,18 @@
  *  None.
  */
 

[... 1820 lines stripped ...]


More information about the asterisk-commits mailing list