merge rizzo's codec module rework (very similar to the format module rework)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@18541 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 55 insertions, 283 deletions

diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c
index 480b92c2a..cc3f64394 100644
--- a/codecs/codec_alaw.c
+++ b/codecs/codec_alaw.c
@@ -44,232 +44,42 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/alaw.h"
 #include "asterisk/utils.h"
 
-#define BUFFER_SIZE   8096	/* size for the translation buffers */
-
-AST_MUTEX_DEFINE_STATIC(localuser_lock);
-static int localusecnt = 0;
-
-static char *tdesc = "A-law Coder/Decoder";
-
-static int useplc = 0;
+#define BUFFER_SAMPLES   8096	/* size for the translation buffers */
 
 /* Sample frame data (Mu data is okay) */
 
 #include "slin_ulaw_ex.h"
 #include "ulaw_slin_ex.h"
 
-/*!
- * \brief Private workspace for translating signed linear signals to alaw.
- */
-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;
-};
-
-/*!
- * \brief Private workspace for translating alaw signals to signed linear.
- */
-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;
-};
-
-/*!
- * \brief alawToLin_New
- *  Create a new instance of alaw_decoder_pvt.
- *
- * Results:
- *  Returns a pointer to the new instance.
- *
- * Side effects:
- *  None.
- */
-
-static struct ast_translator_pvt *alawtolin_new(void)
-{
-	struct alaw_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;
-}
-
-/*!
- * \brief LinToalaw_New
- *  Create a new instance of alaw_encoder_pvt.
- *
- * Results:
- *  Returns a pointer to the new instance.
- *
- * Side effects:
- *  None.
- */
-
-static struct ast_translator_pvt *lintoalaw_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;
-}
-
-/*!
- * \brief alawToLin_FrameIn
- *  Fill an input buffer with packed 4-bit alaw values if there is room
- *  left.
- *
- * Results:
- *  Foo
- *
- * Side effects:
- *  tmp->tail is the number of packed values in the buffer.
- */
-
-static int alawtolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
+/*! \brief decode frame into lin and fill output buffer. */
+static int alawtolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
 {
-	struct alaw_decoder_pvt *tmp = (struct alaw_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) * 2 > sizeof(tmp->outbuf)) {
-			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;
-	}
+	int i;
+	unsigned char *src = f->data;
+	int16_t *dst = (int16_t *)pvt->outbuf;
 
-	if ((tmp->tail + f->datalen) * 2 > 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] = AST_ALAW(b[x]);
-
-	if(useplc)
-		plc_rx(&tmp->plc, tmp->outbuf+tmp->tail, f->datalen);
-
-	tmp->tail += f->datalen;
+	for ( i = 0; i < f->samples; i++)
+		dst[pvt->samples + i] = AST_ALAW(src[i]);
+	pvt->samples += f->samples;
+	pvt->datalen += 2*f->samples;	/* 2 bytes/sample */
 	return 0;
 }
 
-/*!
- * \brief alawToLin_FrameOut
- *  Convert 4-bit alaw encoded signals to 16-bit signed linear.
- *
- * Results:
- *  Converted signals are placed in tmp->f.data, tmp->f.datalen
- *  and tmp->f.samples are calculated.
- *
- * Side effects:
- *  None.
- */
-
-static struct ast_frame *alawtolin_frameout(struct ast_translator_pvt *pvt)
-{
-	struct alaw_decoder_pvt *tmp = (struct alaw_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;
-}
-
-/*!
- * \brief LinToalaw_FrameIn
- *  Fill an input buffer with 16-bit signed linear PCM values.
- *
- * Results:
- *  None.
- *
- * Side effects:
- *  tmp->tail is number of signal values in the input buffer.
- */
-
-static int lintoalaw_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
+/*! \brief convert and store input samples in output buffer */
+static int lintoalaw_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
 {
-	struct alaw_encoder_pvt *tmp = (struct alaw_encoder_pvt *)pvt;
 	int x;
-	short *s;
-	if (tmp->tail + f->datalen / 2 >= sizeof(tmp->outbuf)) {
-		ast_log(LOG_WARNING, "Out of buffer space\n");
-		return -1;
-	}
-	s = f->data;
-	for (x=0;x<f->datalen/2;x++) 
-		tmp->outbuf[x+tmp->tail] = AST_LIN2A(s[x]);
-	tmp->tail += f->datalen/2;
-	return 0;
-}
+	char *dst = pvt->outbuf + pvt->samples;
+	int16_t *src = f->data;
 
-/*!
- * \brief LinToalaw_FrameOut
- *  Convert a buffer of raw 16-bit signed linear PCM to a buffer
- *  of 4-bit alaw packed two to a byte (Big Endian).
- *
- * Results:
- *  Foo
- *
- * Side effects:
- *  Leftover inbuf data gets packed, tail gets updated.
- */
-
-static struct ast_frame *lintoalaw_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;
+	for ( x = 0; x < f->samples; x++) 
+		*dst++ = AST_LIN2A(src[x]);
+	pvt->samples += f->samples;
+	pvt->datalen += f->samples;	/* 1 byte/sample */
+	return 0;
 }
 
-/*!
- * \brief alawToLin_Sample
- */
-
+/*! \brief alawToLin_Sample */
 static struct ast_frame *alawtolin_sample(void)
 {
 	static struct ast_frame f;
@@ -284,17 +94,13 @@ static struct ast_frame *alawtolin_sample(void)
 	return &f;
 }
 
-/*!
- * \brief LinToalaw_Sample
- */
-
+/*! \brief LinToalaw_Sample */
 static struct ast_frame *lintoalaw_sample(void)
 {
 	static struct ast_frame f;
 	f.frametype = AST_FRAME_VOICE;
 	f.subclass = AST_FORMAT_SLINEAR;
 	f.datalen = sizeof(slin_ulaw_ex);
-	/* Assume 8000 Hz */
 	f.samples = sizeof(slin_ulaw_ex) / 2;
 	f.mallocd = 0;
 	f.offset = 0;
@@ -303,76 +109,49 @@ static struct ast_frame *lintoalaw_sample(void)
 	return &f;
 }
 
-/*!
- * \brief alaw_Destroy
- *  Destroys a private workspace.
- *
- * Results:
- *  It's gone!
- *
- * Side effects:
- *  None.
- */
-
-static void alaw_destroy(struct ast_translator_pvt *pvt)
-{
-	free(pvt);
-	localusecnt--;
-	ast_update_use_count();
-}
-
-/*!
- * \brief The complete translator for alawToLin.
- */
+static struct ast_module_lock me = { .usecnt = -1 };
 
 static struct ast_translator alawtolin = {
-	"alawtolin",
-	AST_FORMAT_ALAW,
-	AST_FORMAT_SLINEAR,
-	alawtolin_new,
-	alawtolin_framein,
-	alawtolin_frameout,
-	alaw_destroy,
-	/* NULL */
-	alawtolin_sample
+	.name = "alawtolin",
+	.srcfmt = AST_FORMAT_ALAW,
+	.dstfmt = AST_FORMAT_SLINEAR,
+	.framein = alawtolin_framein,
+	.sample = alawtolin_sample,
+	.buffer_samples = BUFFER_SAMPLES,
+	.buf_size = BUFFER_SAMPLES * 2,
+	.plc_samples = 160,
+	.lockp = &me,
 };
 
-/*!
- * \brief The complete translator for LinToalaw.
- */
-
 static struct ast_translator lintoalaw = {
 	"lintoalaw",
-	AST_FORMAT_SLINEAR,
-	AST_FORMAT_ALAW,
-	lintoalaw_new,
-	lintoalaw_framein,
-	lintoalaw_frameout,
-	alaw_destroy,
-	/* NULL */
-	lintoalaw_sample
+	.srcfmt = AST_FORMAT_SLINEAR,
+	.dstfmt = AST_FORMAT_ALAW,
+	.framein = lintoalaw_framein,
+	.sample = lintoalaw_sample,
+	.buffer_samples = BUFFER_SAMPLES,
+	.buf_size = BUFFER_SAMPLES,
+	.lockp = &me,
 };
 
 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_alaw: %susing generic PLC\n", useplc ? "" : "not ");
-				}
-				var = var->next;
-			}
+	struct ast_config *cfg = ast_config_load("codecs.conf");
+	if (!cfg)
+		return;
+	for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) {
+		if (!strcasecmp(var->name, "genericplc")) {
+			alawtolin.useplc = ast_true(var->value) ? 1 : 0;
+			if (option_verbose > 2)
+				ast_verbose(VERBOSE_PREFIX_3 "codec_alaw: %susing generic PLC\n", alawtolin.useplc ? "" : "not ");
 		}
-		ast_config_destroy(cfg);
 	}
+	ast_config_destroy(cfg);
 }
 
+/*! \brief standard module stuff */
+
 int reload(void)
 {
 	parse_config();
@@ -382,13 +161,12 @@ int reload(void)
 int unload_module(void)
 {
 	int res;
-	ast_mutex_lock(&localuser_lock);
+	ast_mutex_lock(&me.lock);
 	res = ast_unregister_translator(&lintoalaw);
-	if (!res)
-		res = ast_unregister_translator(&alawtolin);
-	if (localusecnt)
+	res |= ast_unregister_translator(&alawtolin);
+	if (me.usecnt)
 		res = -1;
-	ast_mutex_unlock(&localuser_lock);
+	ast_mutex_unlock(&me.lock);
 	return res;
 }
 
@@ -404,20 +182,14 @@ int load_module(void)
 	return res;
 }
 
-/*
- * Return a description of this module.
- */
-
 char *description(void)
 {
-	return tdesc;
+	return "A-law Coder/Decoder";
 }
 
 int usecount(void)
 {
-	int res;
-	OLD_STANDARD_USECOUNT(res);
-	return res;
+	return me.usecnt;
 }
 
 char *key()