diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-08 21:40:57 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-08 21:40:57 +0000 |
commit | f1822bc2a6fdfea0a2fa629a0dc70336f22af185 (patch) | |
tree | 380e359c10d849c23bbe9bef0990dad66bdffdd2 /codecs/codec_ulaw.c | |
parent | 5adcee992f51b2ae0e6bd74e5f82a6b2a37e85d3 (diff) |
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
Diffstat (limited to 'codecs/codec_ulaw.c')
-rw-r--r-- | codecs/codec_ulaw.c | 320 |
1 files changed, 53 insertions, 267 deletions
diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c index 4f38a024e..ff42128e7 100644 --- a/codecs/codec_ulaw.c +++ b/codecs/codec_ulaw.c @@ -44,235 +44,43 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/ulaw.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 = "Mu-law Coder/Decoder"; - -static int useplc = 0; +#define BUFFER_SAMPLES 8096 /* size for the translation buffers */ /* Sample frame data */ #include "slin_ulaw_ex.h" #include "ulaw_slin_ex.h" -/*! - * \brief Private workspace for translating signed linear signals to ulaw. - */ - -struct ulaw_encoder_pvt -{ - struct ast_frame f; - char offset[AST_FRIENDLY_OFFSET]; /*!< Space to build offset */ - unsigned char outbuf[BUFFER_SIZE]; /*!< Encoded ulaw, two nibbles to a word */ - int tail; -}; - -/*! - * \brief Private workspace for translating ulaw signals to signed linear. - */ - -struct ulaw_decoder_pvt +/*! \brief convert and store samples in outbuf */ +static int ulawtolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) { - 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 ulawToLin_New - * Create a new instance of ulaw_decoder_pvt. - * - * Results: - * Returns a pointer to the new instance. - * - * Side effects: - * None. - */ - -static struct ast_translator_pvt *ulawtolin_new(void) -{ - struct ulaw_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 LinToulaw_New - * Create a new instance of ulaw_encoder_pvt. - * - * Results: - * Returns a pointer to the new instance. - * - * Side effects: - * None. - */ - -static struct ast_translator_pvt *lintoulaw_new(void) -{ - struct ulaw_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 ulawToLin_FrameIn - * Fill an input buffer with packed 4-bit ulaw values if there is room - * left. - * - * Results: - * Foo - * - * Side effects: - * tmp->tail is the number of packed values in the buffer. - */ - -static int ulawtolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -{ - struct ulaw_decoder_pvt *tmp = (struct ulaw_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; - } - - 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_MULAW(b[x]); + int i; + unsigned char *src = f->data; + int16_t *dst = (int16_t *)pvt->outbuf; - if(useplc) - plc_rx(&tmp->plc, tmp->outbuf+tmp->tail, f->datalen); + /* convert and copy in outbuf */ + for (i=0; i<f->samples; i++) + dst[pvt->samples + i] = AST_MULAW(src[i]); - tmp->tail += f->datalen; + pvt->samples += f->samples; + pvt->datalen += 2 * f->samples; return 0; } -/*! - * \brief ulawToLin_FrameOut - * Convert 4-bit ulaw 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 *ulawtolin_frameout(struct ast_translator_pvt *pvt) +/*! \brief convert and store samples in outbuf */ +static int lintoulaw_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) { - struct ulaw_decoder_pvt *tmp = (struct ulaw_decoder_pvt *)pvt; - - if (!tmp->tail) - return NULL; + int i; + int16_t *src = f->data; - 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 LinToulaw_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 lintoulaw_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -{ - struct ulaw_encoder_pvt *tmp = (struct ulaw_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_LIN2MU(s[x]); - tmp->tail += f->datalen/2; + for (i=0 ; i < f->samples; i++) + pvt->outbuf[pvt->samples + i] = AST_LIN2MU(src[i]); + pvt->samples += f->samples; + pvt->datalen += f->samples; /* 1 byte/sample */ return 0; } -/*! - * \brief LinToulaw_FrameOut - * Convert a buffer of raw 16-bit signed linear PCM to a buffer - * of 4-bit ulaw packed two to a byte (Big Endian). - * - * Results: - * Foo - * - * Side effects: - * Leftover inbuf data gets packed, tail gets updated. - */ - -static struct ast_frame *lintoulaw_frameout(struct ast_translator_pvt *pvt) -{ - struct ulaw_encoder_pvt *tmp = (struct ulaw_encoder_pvt *)pvt; - - if (tmp->tail) { - tmp->f.frametype = AST_FRAME_VOICE; - tmp->f.subclass = AST_FORMAT_ULAW; - 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; -} - - -/*! - * \brief ulawToLin_Sample - */ - +/*! * \brief ulawToLin_Sample */ static struct ast_frame *ulawtolin_sample(void) { static struct ast_frame f; @@ -307,37 +115,21 @@ static struct ast_frame *lintoulaw_sample(void) } /*! - * \brief ulaw_Destroy - * Destroys a private workspace. - * - * Results: - * It's gone! - * - * Side effects: - * None. - */ - -static void ulaw_destroy(struct ast_translator_pvt *pvt) -{ - free(pvt); - localusecnt--; - ast_update_use_count(); -} - -/*! * \brief The complete translator for ulawToLin. */ +static struct ast_module_lock me = { .usecnt = -1 }; + static struct ast_translator ulawtolin = { - "ulawtolin", - AST_FORMAT_ULAW, - AST_FORMAT_SLINEAR, - ulawtolin_new, - ulawtolin_framein, - ulawtolin_frameout, - ulaw_destroy, - /* NULL */ - ulawtolin_sample + .name = "ulawtolin", + .srcfmt = AST_FORMAT_ULAW, + .dstfmt = AST_FORMAT_SLINEAR, + .framein = ulawtolin_framein, + .sample = ulawtolin_sample, + .lockp = &me, + .buffer_samples = BUFFER_SAMPLES, + .buf_size = BUFFER_SAMPLES * 2, + .plc_samples = 160, }; /*! @@ -345,34 +137,30 @@ static struct ast_translator ulawtolin = { */ static struct ast_translator lintoulaw = { - "lintoulaw", - AST_FORMAT_SLINEAR, - AST_FORMAT_ULAW, - lintoulaw_new, - lintoulaw_framein, - lintoulaw_frameout, - ulaw_destroy, - /* NULL */ - lintoulaw_sample + .name = "lintoulaw", + .srcfmt = AST_FORMAT_SLINEAR, + .dstfmt = AST_FORMAT_ULAW, + .framein = lintoulaw_framein, + .sample = lintoulaw_sample, + .lockp = &me, + .buf_size = BUFFER_SAMPLES, + .buffer_samples = BUFFER_SAMPLES, }; 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_ulaw: %susing generic PLC\n", useplc ? "" : "not "); - } - var = var->next; - } + struct ast_config *cfg = ast_config_load("codecs.conf"); + if (cfg == NULL) + return; + for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) { + if (!strcasecmp(var->name, "genericplc")) { + ulawtolin.useplc = ast_true(var->value) ? 1 : 0; + if (option_verbose > 2) + ast_verbose(VERBOSE_PREFIX_3 "codec_ulaw: %susing generic PLC\n", ulawtolin.useplc ? "" : "not "); } - ast_config_destroy(cfg); } + ast_config_destroy(cfg); } int reload(void) @@ -384,13 +172,13 @@ int reload(void) int unload_module(void) { int res; - ast_mutex_lock(&localuser_lock); + ast_mutex_lock(&me.lock); res = ast_unregister_translator(&lintoulaw); if (!res) res = ast_unregister_translator(&ulawtolin); - if (localusecnt) + if (me.usecnt) res = -1; - ast_mutex_unlock(&localuser_lock); + ast_mutex_unlock(&me.lock); return res; } @@ -412,14 +200,12 @@ int load_module(void) char *description(void) { - return tdesc; + return "Mu-law Coder/Decoder"; } int usecount(void) { - int res; - OLD_STANDARD_USECOUNT(res); - return res; + return me.usecnt; } char *key() |