formatting and doxygen fixes (issue #6300)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8360 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Russell Bryant 20 years ago
parent 4dc76fbcc1
commit ba56332ce8

@ -80,44 +80,39 @@ struct ulaw_encoder_pvt
int tail; int tail;
}; };
static struct ast_translator_pvt * static struct ast_translator_pvt *alawtoulaw_new(void)
alawtoulaw_new (void)
{ {
struct ulaw_encoder_pvt *tmp; struct ulaw_encoder_pvt *tmp;
tmp = malloc (sizeof (struct ulaw_encoder_pvt)); tmp = malloc(sizeof(struct ulaw_encoder_pvt));
if (tmp) if (tmp) {
{
memset(tmp, 0, sizeof(*tmp)); memset(tmp, 0, sizeof(*tmp));
tmp->tail = 0; tmp->tail = 0;
localusecnt++; localusecnt++;
ast_update_use_count (); ast_update_use_count();
} }
return (struct ast_translator_pvt *) tmp; return (struct ast_translator_pvt *)tmp;
} }
static struct ast_translator_pvt * static struct ast_translator_pvt *ulawtoalaw_new(void)
ulawtoalaw_new (void)
{ {
struct alaw_encoder_pvt *tmp; struct alaw_encoder_pvt *tmp;
tmp = malloc (sizeof (struct alaw_encoder_pvt)); tmp = malloc(sizeof(struct alaw_encoder_pvt));
if (tmp) if (tmp) {
{
memset(tmp, 0, sizeof(*tmp)); memset(tmp, 0, sizeof(*tmp));
localusecnt++; localusecnt++;
ast_update_use_count (); ast_update_use_count();
tmp->tail = 0; tmp->tail = 0;
} }
return (struct ast_translator_pvt *) tmp; return (struct ast_translator_pvt *)tmp;
} }
static int static int alawtoulaw_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
alawtoulaw_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
{ {
struct ulaw_encoder_pvt *tmp = (struct ulaw_encoder_pvt *) pvt; struct ulaw_encoder_pvt *tmp = (struct ulaw_encoder_pvt *)pvt;
int x; int x;
unsigned char *b; unsigned char *b;
if ((tmp->tail + f->datalen)> sizeof(tmp->outbuf)) { if ((tmp->tail + f->datalen) > sizeof(tmp->outbuf)) {
ast_log(LOG_WARNING, "Out of buffer space\n"); ast_log(LOG_WARNING, "Out of buffer space\n");
return -1; return -1;
} }
@ -131,10 +126,9 @@ alawtoulaw_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
return 0; return 0;
} }
static struct ast_frame * static struct ast_frame *alawtoulaw_frameout(struct ast_translator_pvt *pvt)
alawtoulaw_frameout (struct ast_translator_pvt *pvt)
{ {
struct ulaw_encoder_pvt *tmp = (struct ulaw_encoder_pvt *) pvt; struct ulaw_encoder_pvt *tmp = (struct ulaw_encoder_pvt *)pvt;
if (!tmp->tail) if (!tmp->tail)
return NULL; return NULL;
@ -151,15 +145,13 @@ alawtoulaw_frameout (struct ast_translator_pvt *pvt)
return &tmp->f; return &tmp->f;
} }
static int static int ulawtoalaw_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
ulawtoalaw_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
{ {
struct alaw_encoder_pvt *tmp = (struct alaw_encoder_pvt *) pvt; struct alaw_encoder_pvt *tmp = (struct alaw_encoder_pvt *)pvt;
int x; int x;
unsigned char *s; unsigned char *s;
if (tmp->tail + f->datalen >= sizeof(tmp->outbuf)) if (tmp->tail + f->datalen >= sizeof(tmp->outbuf)) {
{ ast_log(LOG_WARNING, "Out of buffer space\n");
ast_log (LOG_WARNING, "Out of buffer space\n");
return -1; return -1;
} }
s = f->data; s = f->data;
@ -181,10 +173,9 @@ ulawtoalaw_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
* Leftover inbuf data gets packed, tail gets updated. * Leftover inbuf data gets packed, tail gets updated.
*/ */
static struct ast_frame * static struct ast_frame *ulawtoalaw_frameout(struct ast_translator_pvt *pvt)
ulawtoalaw_frameout (struct ast_translator_pvt *pvt)
{ {
struct alaw_encoder_pvt *tmp = (struct alaw_encoder_pvt *) pvt; struct alaw_encoder_pvt *tmp = (struct alaw_encoder_pvt *)pvt;
if (tmp->tail) { if (tmp->tail) {
tmp->f.frametype = AST_FRAME_VOICE; tmp->f.frametype = AST_FRAME_VOICE;
@ -197,21 +188,20 @@ ulawtoalaw_frameout (struct ast_translator_pvt *pvt)
tmp->f.datalen = tmp->tail; tmp->f.datalen = tmp->tail;
tmp->tail = 0; tmp->tail = 0;
return &tmp->f; return &tmp->f;
} else return NULL; } else
return NULL;
} }
/* /*
* alawToLin_Sample * alawToLin_Sample
*/ */
static struct ast_frame * static struct ast_frame *alawtoulaw_sample(void)
alawtoulaw_sample (void)
{ {
static struct ast_frame f; static struct ast_frame f;
f.frametype = AST_FRAME_VOICE; f.frametype = AST_FRAME_VOICE;
f.subclass = AST_FORMAT_ALAW; f.subclass = AST_FORMAT_ALAW;
f.datalen = sizeof (ulaw_slin_ex); f.datalen = sizeof(ulaw_slin_ex);
f.samples = sizeof(ulaw_slin_ex); f.samples = sizeof(ulaw_slin_ex);
f.mallocd = 0; f.mallocd = 0;
f.offset = 0; f.offset = 0;
@ -220,13 +210,12 @@ alawtoulaw_sample (void)
return &f; return &f;
} }
static struct ast_frame * static struct ast_frame *ulawtoalaw_sample(void)
ulawtoalaw_sample (void)
{ {
static struct ast_frame f; static struct ast_frame f;
f.frametype = AST_FRAME_VOICE; f.frametype = AST_FRAME_VOICE;
f.subclass = AST_FORMAT_ULAW; f.subclass = AST_FORMAT_ULAW;
f.datalen = sizeof (ulaw_slin_ex); f.datalen = sizeof(ulaw_slin_ex);
f.samples = sizeof(ulaw_slin_ex); f.samples = sizeof(ulaw_slin_ex);
f.mallocd = 0; f.mallocd = 0;
f.offset = 0; f.offset = 0;
@ -235,7 +224,6 @@ ulawtoalaw_sample (void)
return &f; return &f;
} }
/* /*
* alaw_Destroy * alaw_Destroy
* Destroys a private workspace. * Destroys a private workspace.
@ -247,12 +235,11 @@ ulawtoalaw_sample (void)
* None. * None.
*/ */
static void static void alaw_destroy(struct ast_translator_pvt *pvt)
alaw_destroy (struct ast_translator_pvt *pvt)
{ {
free (pvt); free(pvt);
localusecnt--; localusecnt--;
ast_update_use_count (); ast_update_use_count();
} }
/* /*
@ -287,22 +274,20 @@ static struct ast_translator ulawtoalaw = {
ulawtoalaw_sample ulawtoalaw_sample
}; };
int int unload_module(void)
unload_module (void)
{ {
int res; int res;
ast_mutex_lock (&localuser_lock); ast_mutex_lock(&localuser_lock);
res = ast_unregister_translator (&ulawtoalaw); res = ast_unregister_translator(&ulawtoalaw);
if (!res) if (!res)
res = ast_unregister_translator (&alawtoulaw); res = ast_unregister_translator(&alawtoulaw);
if (localusecnt) if (localusecnt)
res = -1; res = -1;
ast_mutex_unlock (&localuser_lock); ast_mutex_unlock(&localuser_lock);
return res; return res;
} }
int int load_module(void)
load_module (void)
{ {
int res; int res;
int x; int x;
@ -310,11 +295,11 @@ load_module (void)
mu2a[x] = AST_LIN2A(AST_MULAW(x)); mu2a[x] = AST_LIN2A(AST_MULAW(x));
a2mu[x] = AST_LIN2MU(AST_ALAW(x)); a2mu[x] = AST_LIN2MU(AST_ALAW(x));
} }
res = ast_register_translator (&alawtoulaw); res = ast_register_translator(&alawtoulaw);
if (!res) if (!res)
res = ast_register_translator (&ulawtoalaw); res = ast_register_translator(&ulawtoalaw);
else else
ast_unregister_translator (&alawtoulaw); ast_unregister_translator(&alawtoulaw);
return res; return res;
} }
@ -322,22 +307,19 @@ load_module (void)
* Return a description of this module. * Return a description of this module.
*/ */
char * char *description(void)
description (void)
{ {
return tdesc; return tdesc;
} }
int int usecount(void)
usecount (void)
{ {
int res; int res;
STANDARD_USECOUNT (res); STANDARD_USECOUNT(res);
return res; return res;
} }
char * char *key()
key ()
{ {
return ASTERISK_GPL_KEY; return ASTERISK_GPL_KEY;
} }

@ -102,8 +102,7 @@ struct adpcm_state {
* Sets the index to the step size table for the next encode. * Sets the index to the step size table for the next encode.
*/ */
static inline short static inline short decode(int encoded, struct adpcm_state *state)
decode(int encoded, struct adpcm_state* state)
{ {
int diff; int diff;
int step; int step;
@ -117,9 +116,12 @@ decode(int encoded, struct adpcm_state* state)
diff = (((encoded << 1) + 1) * step) >> 3; diff = (((encoded << 1) + 1) * step) >> 3;
#else /* BLI code */ #else /* BLI code */
diff = step >> 3; diff = step >> 3;
if (encoded & 4) diff += step; if (encoded & 4)
if (encoded & 2) diff += step >> 1; diff += step;
if (encoded & 1) diff += step >> 2; if (encoded & 2)
diff += step >> 1;
if (encoded & 1)
diff += step >> 2;
if ((encoded >> 1) & step & 0x1) if ((encoded >> 1) & step & 0x1)
diff++; diff++;
#endif #endif
@ -143,8 +145,7 @@ decode(int encoded, struct adpcm_state* state)
#ifdef AUTO_RETURN #ifdef AUTO_RETURN
if (encoded) if (encoded)
state->zero_count = 0; state->zero_count = 0;
else if (++(state->zero_count) == 24) else if (++(state->zero_count) == 24) {
{
state->zero_count = 0; state->zero_count = 0;
if (state->signal > 0) if (state->signal > 0)
state->next_flag = 0x1; state->next_flag = 0x1;
@ -174,8 +175,7 @@ decode(int encoded, struct adpcm_state* state)
* signal gets updated with each pass. * signal gets updated with each pass.
*/ */
static inline int static inline int adpcm(short csig, struct adpcm_state *state)
adpcm(short csig, struct adpcm_state* state)
{ {
int diff; int diff;
int step; int step;
@ -190,35 +190,28 @@ adpcm(short csig, struct adpcm_state* state)
diff = csig - state->signal; diff = csig - state->signal;
#ifdef NOT_BLI #ifdef NOT_BLI
if (diff < 0) if (diff < 0) {
{
encoded = (-diff << 2) / step; encoded = (-diff << 2) / step;
if (encoded > 7) if (encoded > 7)
encoded = 7; encoded = 7;
encoded |= 0x08; encoded |= 0x08;
} } else {
else
{
encoded = (diff << 2) / step; encoded = (diff << 2) / step;
if (encoded > 7) if (encoded > 7)
encoded = 7; encoded = 7;
} }
#else /* BLI code */ #else /* BLI code */
if (diff < 0) if (diff < 0) {
{
encoded = 8; encoded = 8;
diff = -diff; diff = -diff;
} } else
else
encoded = 0; encoded = 0;
if (diff >= step) if (diff >= step) {
{
encoded |= 4; encoded |= 4;
diff -= step; diff -= step;
} }
step >>= 1; step >>= 1;
if (diff >= step) if (diff >= step) {
{
encoded |= 2; encoded |= 2;
diff -= step; diff -= step;
} }
@ -272,20 +265,18 @@ struct adpcm_decoder_pvt
* None. * None.
*/ */
static struct ast_translator_pvt * static struct ast_translator_pvt *adpcmtolin_new(void)
adpcmtolin_new (void)
{ {
struct adpcm_decoder_pvt *tmp; struct adpcm_decoder_pvt *tmp;
tmp = malloc (sizeof (struct adpcm_decoder_pvt)); tmp = malloc(sizeof(struct adpcm_decoder_pvt));
if (tmp) if (tmp) {
{
memset(tmp, 0, sizeof(*tmp)); memset(tmp, 0, sizeof(*tmp));
tmp->tail = 0; tmp->tail = 0;
plc_init(&tmp->plc); plc_init(&tmp->plc);
localusecnt++; localusecnt++;
ast_update_use_count (); ast_update_use_count();
} }
return (struct ast_translator_pvt *) tmp; return (struct ast_translator_pvt *)tmp;
} }
/* /*
@ -299,19 +290,17 @@ adpcmtolin_new (void)
* None. * None.
*/ */
static struct ast_translator_pvt * static struct ast_translator_pvt *lintoadpcm_new(void)
lintoadpcm_new (void)
{ {
struct adpcm_encoder_pvt *tmp; struct adpcm_encoder_pvt *tmp;
tmp = malloc (sizeof (struct adpcm_encoder_pvt)); tmp = malloc(sizeof(struct adpcm_encoder_pvt));
if (tmp) if (tmp) {
{
memset(tmp, 0, sizeof(*tmp)); memset(tmp, 0, sizeof(*tmp));
localusecnt++; localusecnt++;
ast_update_use_count (); ast_update_use_count();
tmp->tail = 0; tmp->tail = 0;
} }
return (struct ast_translator_pvt *) tmp; return (struct ast_translator_pvt *)tmp;
} }
/* /*
@ -326,10 +315,9 @@ lintoadpcm_new (void)
* tmp->tail is the number of packed values in the buffer. * tmp->tail is the number of packed values in the buffer.
*/ */
static int static int adpcmtolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
adpcmtolin_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
{ {
struct adpcm_decoder_pvt *tmp = (struct adpcm_decoder_pvt *) pvt; struct adpcm_decoder_pvt *tmp = (struct adpcm_decoder_pvt *)pvt;
int x; int x;
unsigned char *b; unsigned char *b;
@ -357,7 +345,8 @@ adpcmtolin_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
tmp->outbuf[tmp->tail++] = decode(b[x] & 0x0f, &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); if(useplc)
plc_rx(&tmp->plc, tmp->outbuf+tmp->tail-f->datalen*2, f->datalen*2);
return 0; return 0;
} }
@ -374,17 +363,16 @@ adpcmtolin_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
* None. * None.
*/ */
static struct ast_frame * static struct ast_frame *adpcmtolin_frameout(struct ast_translator_pvt *pvt)
adpcmtolin_frameout (struct ast_translator_pvt *pvt)
{ {
struct adpcm_decoder_pvt *tmp = (struct adpcm_decoder_pvt *) pvt; struct adpcm_decoder_pvt *tmp = (struct adpcm_decoder_pvt *)pvt;
if (!tmp->tail) if (!tmp->tail)
return NULL; return NULL;
tmp->f.frametype = AST_FRAME_VOICE; tmp->f.frametype = AST_FRAME_VOICE;
tmp->f.subclass = AST_FORMAT_SLINEAR; tmp->f.subclass = AST_FORMAT_SLINEAR;
tmp->f.datalen = tmp->tail *2; tmp->f.datalen = tmp->tail * 2;
tmp->f.samples = tmp->tail; tmp->f.samples = tmp->tail;
tmp->f.mallocd = 0; tmp->f.mallocd = 0;
tmp->f.offset = AST_FRIENDLY_OFFSET; tmp->f.offset = AST_FRIENDLY_OFFSET;
@ -405,19 +393,15 @@ adpcmtolin_frameout (struct ast_translator_pvt *pvt)
* tmp->tail is number of signal values in the input buffer. * tmp->tail is number of signal values in the input buffer.
*/ */
static int static int lintoadpcm_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
lintoadpcm_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
{ {
struct adpcm_encoder_pvt *tmp = (struct adpcm_encoder_pvt *) pvt; struct adpcm_encoder_pvt *tmp = (struct adpcm_encoder_pvt *)pvt;
if ((tmp->tail + f->datalen / 2) < (sizeof (tmp->inbuf) / 2)) if ((tmp->tail + f->datalen / 2) < (sizeof(tmp->inbuf) / 2)) {
{ memcpy(&tmp->inbuf[tmp->tail], f->data, f->datalen);
memcpy (&tmp->inbuf[tmp->tail], f->data, f->datalen);
tmp->tail += f->datalen / 2; tmp->tail += f->datalen / 2;
} } else {
else ast_log(LOG_WARNING, "Out of buffer space\n");
{
ast_log (LOG_WARNING, "Out of buffer space\n");
return -1; return -1;
} }
return 0; return 0;
@ -435,14 +419,13 @@ lintoadpcm_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
* Leftover inbuf data gets packed, tail gets updated. * Leftover inbuf data gets packed, tail gets updated.
*/ */
static struct ast_frame * static struct ast_frame *lintoadpcm_frameout(struct ast_translator_pvt *pvt)
lintoadpcm_frameout (struct ast_translator_pvt *pvt)
{ {
struct adpcm_encoder_pvt *tmp = (struct adpcm_encoder_pvt *) pvt; struct adpcm_encoder_pvt *tmp = (struct adpcm_encoder_pvt *)pvt;
int i_max, i; int i_max, i;
if (tmp->tail < 2) return NULL; if (tmp->tail < 2)
return NULL;
i_max = tmp->tail & ~1; /* atomic size is 2 samples */ i_max = tmp->tail & ~1; /* atomic size is 2 samples */
@ -453,14 +436,12 @@ lintoadpcm_frameout (struct ast_translator_pvt *pvt)
tmp->outbuf[3] = tmp->zero_count; tmp->outbuf[3] = tmp->zero_count;
tmp->outbuf[4] = tmp->next_flag; tmp->outbuf[4] = tmp->next_flag;
*/ */
for (i = 0; i < i_max; i+=2) for (i = 0; i < i_max; i+=2) {
{
tmp->outbuf[i/2] = tmp->outbuf[i/2] =
(adpcm(tmp->inbuf[i ], &tmp->state) << 4) | (adpcm(tmp->inbuf[i ], &tmp->state) << 4) |
(adpcm(tmp->inbuf[i+1], &tmp->state) ); (adpcm(tmp->inbuf[i+1], &tmp->state) );
}; };
tmp->f.frametype = AST_FRAME_VOICE; tmp->f.frametype = AST_FRAME_VOICE;
tmp->f.subclass = AST_FORMAT_ADPCM; tmp->f.subclass = AST_FORMAT_ADPCM;
tmp->f.samples = i_max; tmp->f.samples = i_max;
@ -477,8 +458,7 @@ lintoadpcm_frameout (struct ast_translator_pvt *pvt)
if (tmp->tail == i_max) if (tmp->tail == i_max)
tmp->tail = 0; tmp->tail = 0;
else else {
{
tmp->inbuf[0] = tmp->inbuf[tmp->tail]; tmp->inbuf[0] = tmp->inbuf[tmp->tail];
tmp->tail = 1; tmp->tail = 1;
} }
@ -490,13 +470,12 @@ lintoadpcm_frameout (struct ast_translator_pvt *pvt)
* AdpcmToLin_Sample * AdpcmToLin_Sample
*/ */
static struct ast_frame * static struct ast_frame *adpcmtolin_sample(void)
adpcmtolin_sample (void)
{ {
static struct ast_frame f; static struct ast_frame f;
f.frametype = AST_FRAME_VOICE; f.frametype = AST_FRAME_VOICE;
f.subclass = AST_FORMAT_ADPCM; f.subclass = AST_FORMAT_ADPCM;
f.datalen = sizeof (adpcm_slin_ex); f.datalen = sizeof(adpcm_slin_ex);
f.samples = sizeof(adpcm_slin_ex) * 2; f.samples = sizeof(adpcm_slin_ex) * 2;
f.mallocd = 0; f.mallocd = 0;
f.offset = 0; f.offset = 0;
@ -509,15 +488,14 @@ adpcmtolin_sample (void)
* LinToAdpcm_Sample * LinToAdpcm_Sample
*/ */
static struct ast_frame * static struct ast_frame *lintoadpcm_sample(void)
lintoadpcm_sample (void)
{ {
static struct ast_frame f; static struct ast_frame f;
f.frametype = AST_FRAME_VOICE; f.frametype = AST_FRAME_VOICE;
f.subclass = AST_FORMAT_SLINEAR; f.subclass = AST_FORMAT_SLINEAR;
f.datalen = sizeof (slin_adpcm_ex); f.datalen = sizeof(slin_adpcm_ex);
/* Assume 8000 Hz */ /* Assume 8000 Hz */
f.samples = sizeof (slin_adpcm_ex) / 2; f.samples = sizeof(slin_adpcm_ex) / 2;
f.mallocd = 0; f.mallocd = 0;
f.offset = 0; f.offset = 0;
f.src = __PRETTY_FUNCTION__; f.src = __PRETTY_FUNCTION__;
@ -536,12 +514,11 @@ lintoadpcm_sample (void)
* None. * None.
*/ */
static void static void adpcm_destroy(struct ast_translator_pvt *pvt)
adpcm_destroy (struct ast_translator_pvt *pvt)
{ {
free (pvt); free(pvt);
localusecnt--; localusecnt--;
ast_update_use_count (); ast_update_use_count();
} }
/* /*
@ -576,8 +553,7 @@ static struct ast_translator lintoadpcm = {
lintoadpcm_sample lintoadpcm_sample
}; };
static void static void parse_config(void)
parse_config(void)
{ {
struct ast_config *cfg; struct ast_config *cfg;
struct ast_variable *var; struct ast_variable *var;
@ -596,37 +572,34 @@ parse_config(void)
} }
} }
int int reload(void)
reload(void)
{ {
parse_config(); parse_config();
return 0; return 0;
} }
int int unload_module(void)
unload_module (void)
{ {
int res; int res;
ast_mutex_lock (&localuser_lock); ast_mutex_lock(&localuser_lock);
res = ast_unregister_translator (&lintoadpcm); res = ast_unregister_translator(&lintoadpcm);
if (!res) if (!res)
res = ast_unregister_translator (&adpcmtolin); res = ast_unregister_translator(&adpcmtolin);
if (localusecnt) if (localusecnt)
res = -1; res = -1;
ast_mutex_unlock (&localuser_lock); ast_mutex_unlock(&localuser_lock);
return res; return res;
} }
int int load_module(void)
load_module (void)
{ {
int res; int res;
parse_config(); parse_config();
res = ast_register_translator (&adpcmtolin); res = ast_register_translator(&adpcmtolin);
if (!res) if (!res)
res = ast_register_translator (&lintoadpcm); res = ast_register_translator(&lintoadpcm);
else else
ast_unregister_translator (&adpcmtolin); ast_unregister_translator(&adpcmtolin);
return res; return res;
} }
@ -634,22 +607,19 @@ load_module (void)
* Return a description of this module. * Return a description of this module.
*/ */
char * char *description(void)
description (void)
{ {
return tdesc; return tdesc;
} }
int int usecount(void)
usecount (void)
{ {
int res; int res;
STANDARD_USECOUNT (res); STANDARD_USECOUNT(res);
return res; return res;
} }
char * char *key()
key ()
{ {
return ASTERISK_GPL_KEY; return ASTERISK_GPL_KEY;
} }

@ -91,19 +91,18 @@ struct alaw_decoder_pvt
* None. * None.
*/ */
static struct ast_translator_pvt * alawtolin_new (void) static struct ast_translator_pvt *alawtolin_new(void)
{ {
struct alaw_decoder_pvt *tmp; struct alaw_decoder_pvt *tmp;
tmp = malloc (sizeof (struct alaw_decoder_pvt)); tmp = malloc(sizeof(struct alaw_decoder_pvt));
if (tmp) if (tmp) {
{
memset(tmp, 0, sizeof(*tmp)); memset(tmp, 0, sizeof(*tmp));
tmp->tail = 0; tmp->tail = 0;
plc_init(&tmp->plc); plc_init(&tmp->plc);
localusecnt++; localusecnt++;
ast_update_use_count (); ast_update_use_count();
} }
return (struct ast_translator_pvt *) tmp; return (struct ast_translator_pvt *)tmp;
} }
/*! /*!
@ -117,18 +116,17 @@ static struct ast_translator_pvt * alawtolin_new (void)
* None. * None.
*/ */
static struct ast_translator_pvt * lintoalaw_new (void) static struct ast_translator_pvt *lintoalaw_new(void)
{ {
struct alaw_encoder_pvt *tmp; struct alaw_encoder_pvt *tmp;
tmp = malloc (sizeof (struct alaw_encoder_pvt)); tmp = malloc(sizeof(struct alaw_encoder_pvt));
if (tmp) if (tmp) {
{
memset(tmp, 0, sizeof(*tmp)); memset(tmp, 0, sizeof(*tmp));
localusecnt++; localusecnt++;
ast_update_use_count (); ast_update_use_count();
tmp->tail = 0; tmp->tail = 0;
} }
return (struct ast_translator_pvt *) tmp; return (struct ast_translator_pvt *)tmp;
} }
/*! /*!
@ -143,10 +141,9 @@ static struct ast_translator_pvt * lintoalaw_new (void)
* tmp->tail is the number of packed values in the buffer. * tmp->tail is the number of packed values in the buffer.
*/ */
static int static int alawtolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
alawtolin_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
{ {
struct alaw_decoder_pvt *tmp = (struct alaw_decoder_pvt *) pvt; struct alaw_decoder_pvt *tmp = (struct alaw_decoder_pvt *)pvt;
int x; int x;
unsigned char *b; unsigned char *b;
@ -172,7 +169,8 @@ alawtolin_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
for (x=0;x<f->datalen;x++) for (x=0;x<f->datalen;x++)
tmp->outbuf[tmp->tail + x] = AST_ALAW(b[x]); tmp->outbuf[tmp->tail + x] = AST_ALAW(b[x]);
if(useplc) plc_rx(&tmp->plc, tmp->outbuf+tmp->tail, f->datalen); if(useplc)
plc_rx(&tmp->plc, tmp->outbuf+tmp->tail, f->datalen);
tmp->tail += f->datalen; tmp->tail += f->datalen;
return 0; return 0;
@ -190,16 +188,16 @@ alawtolin_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
* None. * None.
*/ */
static struct ast_frame * alawtolin_frameout (struct ast_translator_pvt *pvt) static struct ast_frame *alawtolin_frameout(struct ast_translator_pvt *pvt)
{ {
struct alaw_decoder_pvt *tmp = (struct alaw_decoder_pvt *) pvt; struct alaw_decoder_pvt *tmp = (struct alaw_decoder_pvt *)pvt;
if (!tmp->tail) if (!tmp->tail)
return NULL; return NULL;
tmp->f.frametype = AST_FRAME_VOICE; tmp->f.frametype = AST_FRAME_VOICE;
tmp->f.subclass = AST_FORMAT_SLINEAR; tmp->f.subclass = AST_FORMAT_SLINEAR;
tmp->f.datalen = tmp->tail *2; tmp->f.datalen = tmp->tail * 2;
tmp->f.samples = tmp->tail; tmp->f.samples = tmp->tail;
tmp->f.mallocd = 0; tmp->f.mallocd = 0;
tmp->f.offset = AST_FRIENDLY_OFFSET; tmp->f.offset = AST_FRIENDLY_OFFSET;
@ -220,14 +218,13 @@ static struct ast_frame * alawtolin_frameout (struct ast_translator_pvt *pvt)
* tmp->tail is number of signal values in the input buffer. * tmp->tail is number of signal values in the input buffer.
*/ */
static int lintoalaw_framein (struct ast_translator_pvt *pvt, struct ast_frame *f) static int lintoalaw_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
{ {
struct alaw_encoder_pvt *tmp = (struct alaw_encoder_pvt *) pvt; struct alaw_encoder_pvt *tmp = (struct alaw_encoder_pvt *)pvt;
int x; int x;
short *s; short *s;
if (tmp->tail + f->datalen/2 >= sizeof(tmp->outbuf)) if (tmp->tail + f->datalen / 2 >= sizeof(tmp->outbuf)) {
{ ast_log(LOG_WARNING, "Out of buffer space\n");
ast_log (LOG_WARNING, "Out of buffer space\n");
return -1; return -1;
} }
s = f->data; s = f->data;
@ -249,9 +246,9 @@ static int lintoalaw_framein (struct ast_translator_pvt *pvt, struct ast_frame *
* Leftover inbuf data gets packed, tail gets updated. * Leftover inbuf data gets packed, tail gets updated.
*/ */
static struct ast_frame * lintoalaw_frameout (struct ast_translator_pvt *pvt) static struct ast_frame *lintoalaw_frameout(struct ast_translator_pvt *pvt)
{ {
struct alaw_encoder_pvt *tmp = (struct alaw_encoder_pvt *) pvt; struct alaw_encoder_pvt *tmp = (struct alaw_encoder_pvt *)pvt;
if (tmp->tail) { if (tmp->tail) {
tmp->f.frametype = AST_FRAME_VOICE; tmp->f.frametype = AST_FRAME_VOICE;
@ -264,20 +261,20 @@ static struct ast_frame * lintoalaw_frameout (struct ast_translator_pvt *pvt)
tmp->f.datalen = tmp->tail; tmp->f.datalen = tmp->tail;
tmp->tail = 0; tmp->tail = 0;
return &tmp->f; return &tmp->f;
} else return NULL; } else
return NULL;
} }
/*! /*!
* \brief alawToLin_Sample * \brief alawToLin_Sample
*/ */
static struct ast_frame * alawtolin_sample (void) static struct ast_frame *alawtolin_sample(void)
{ {
static struct ast_frame f; static struct ast_frame f;
f.frametype = AST_FRAME_VOICE; f.frametype = AST_FRAME_VOICE;
f.subclass = AST_FORMAT_ALAW; f.subclass = AST_FORMAT_ALAW;
f.datalen = sizeof (ulaw_slin_ex); f.datalen = sizeof(ulaw_slin_ex);
f.samples = sizeof(ulaw_slin_ex); f.samples = sizeof(ulaw_slin_ex);
f.mallocd = 0; f.mallocd = 0;
f.offset = 0; f.offset = 0;
@ -290,14 +287,14 @@ static struct ast_frame * alawtolin_sample (void)
* \brief LinToalaw_Sample * \brief LinToalaw_Sample
*/ */
static struct ast_frame * lintoalaw_sample (void) static struct ast_frame *lintoalaw_sample(void)
{ {
static struct ast_frame f; static struct ast_frame f;
f.frametype = AST_FRAME_VOICE; f.frametype = AST_FRAME_VOICE;
f.subclass = AST_FORMAT_SLINEAR; f.subclass = AST_FORMAT_SLINEAR;
f.datalen = sizeof (slin_ulaw_ex); f.datalen = sizeof(slin_ulaw_ex);
/* Assume 8000 Hz */ /* Assume 8000 Hz */
f.samples = sizeof (slin_ulaw_ex) / 2; f.samples = sizeof(slin_ulaw_ex) / 2;
f.mallocd = 0; f.mallocd = 0;
f.offset = 0; f.offset = 0;
f.src = __PRETTY_FUNCTION__; f.src = __PRETTY_FUNCTION__;
@ -316,11 +313,11 @@ static struct ast_frame * lintoalaw_sample (void)
* None. * None.
*/ */
static void alaw_destroy (struct ast_translator_pvt *pvt) static void alaw_destroy(struct ast_translator_pvt *pvt)
{ {
free (pvt); free(pvt);
localusecnt--; localusecnt--;
ast_update_use_count (); ast_update_use_count();
} }
/*! /*!
@ -381,28 +378,28 @@ int reload(void)
return 0; return 0;
} }
int unload_module (void) int unload_module(void)
{ {
int res; int res;
ast_mutex_lock (&localuser_lock); ast_mutex_lock(&localuser_lock);
res = ast_unregister_translator (&lintoalaw); res = ast_unregister_translator(&lintoalaw);
if (!res) if (!res)
res = ast_unregister_translator (&alawtolin); res = ast_unregister_translator(&alawtolin);
if (localusecnt) if (localusecnt)
res = -1; res = -1;
ast_mutex_unlock (&localuser_lock); ast_mutex_unlock(&localuser_lock);
return res; return res;
} }
int load_module (void) int load_module(void)
{ {
int res; int res;
parse_config(); parse_config();
res = ast_register_translator (&alawtolin); res = ast_register_translator(&alawtolin);
if (!res) if (!res)
res = ast_register_translator (&lintoalaw); res = ast_register_translator(&lintoalaw);
else else
ast_unregister_translator (&alawtolin); ast_unregister_translator(&alawtolin);
return res; return res;
} }
@ -410,19 +407,19 @@ int load_module (void)
* Return a description of this module. * Return a description of this module.
*/ */
char * description (void) char *description(void)
{ {
return tdesc; return tdesc;
} }
int usecount (void) int usecount(void)
{ {
int res; int res;
STANDARD_USECOUNT (res); STANDARD_USECOUNT(res);
return res; return res;
} }
char * key () char *key()
{ {
return ASTERISK_GPL_KEY; return ASTERISK_GPL_KEY;
} }

@ -57,20 +57,20 @@ static int useplc = 0;
#include "slin_ulaw_ex.h" #include "slin_ulaw_ex.h"
#include "ulaw_slin_ex.h" #include "ulaw_slin_ex.h"
/* /*!
* Private workspace for translating signed linear signals to ulaw. * \brief Private workspace for translating signed linear signals to ulaw.
*/ */
struct ulaw_encoder_pvt struct ulaw_encoder_pvt
{ {
struct ast_frame f; struct ast_frame f;
char offset[AST_FRIENDLY_OFFSET]; /* Space to build offset */ char offset[AST_FRIENDLY_OFFSET]; /*!< Space to build offset */
unsigned char outbuf[BUFFER_SIZE]; /* Encoded ulaw, two nibbles to a word */ unsigned char outbuf[BUFFER_SIZE]; /*!< Encoded ulaw, two nibbles to a word */
int tail; int tail;
}; };
/* /*!
* Private workspace for translating ulaw signals to signed linear. * \brief Private workspace for translating ulaw signals to signed linear.
*/ */
struct ulaw_decoder_pvt struct ulaw_decoder_pvt
@ -82,8 +82,8 @@ struct ulaw_decoder_pvt
plc_state_t plc; plc_state_t plc;
}; };
/* /*!
* ulawToLin_New * \brief ulawToLin_New
* Create a new instance of ulaw_decoder_pvt. * Create a new instance of ulaw_decoder_pvt.
* *
* Results: * Results:
@ -93,24 +93,22 @@ struct ulaw_decoder_pvt
* None. * None.
*/ */
static struct ast_translator_pvt * static struct ast_translator_pvt *ulawtolin_new(void)
ulawtolin_new (void)
{ {
struct ulaw_decoder_pvt *tmp; struct ulaw_decoder_pvt *tmp;
tmp = malloc (sizeof (struct ulaw_decoder_pvt)); tmp = malloc(sizeof(struct ulaw_decoder_pvt));
if (tmp) if (tmp) {
{
memset(tmp, 0, sizeof(*tmp)); memset(tmp, 0, sizeof(*tmp));
tmp->tail = 0; tmp->tail = 0;
plc_init(&tmp->plc); plc_init(&tmp->plc);
localusecnt++; localusecnt++;
ast_update_use_count (); ast_update_use_count();
} }
return (struct ast_translator_pvt *) tmp; return (struct ast_translator_pvt *)tmp;
} }
/* /*!
* LinToulaw_New * \brief LinToulaw_New
* Create a new instance of ulaw_encoder_pvt. * Create a new instance of ulaw_encoder_pvt.
* *
* Results: * Results:
@ -120,23 +118,21 @@ ulawtolin_new (void)
* None. * None.
*/ */
static struct ast_translator_pvt * static struct ast_translator_pvt *lintoulaw_new(void)
lintoulaw_new (void)
{ {
struct ulaw_encoder_pvt *tmp; struct ulaw_encoder_pvt *tmp;
tmp = malloc (sizeof (struct ulaw_encoder_pvt)); tmp = malloc(sizeof(struct ulaw_encoder_pvt));
if (tmp) if (tmp) {
{
memset(tmp, 0, sizeof(*tmp)); memset(tmp, 0, sizeof(*tmp));
localusecnt++; localusecnt++;
ast_update_use_count (); ast_update_use_count();
tmp->tail = 0; tmp->tail = 0;
} }
return (struct ast_translator_pvt *) tmp; return (struct ast_translator_pvt *)tmp;
} }
/* /*!
* ulawToLin_FrameIn * \brief ulawToLin_FrameIn
* Fill an input buffer with packed 4-bit ulaw values if there is room * Fill an input buffer with packed 4-bit ulaw values if there is room
* left. * left.
* *
@ -147,10 +143,9 @@ lintoulaw_new (void)
* tmp->tail is the number of packed values in the buffer. * tmp->tail is the number of packed values in the buffer.
*/ */
static int static int ulawtolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
ulawtolin_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
{ {
struct ulaw_decoder_pvt *tmp = (struct ulaw_decoder_pvt *) pvt; struct ulaw_decoder_pvt *tmp = (struct ulaw_decoder_pvt *)pvt;
int x; int x;
unsigned char *b; unsigned char *b;
@ -176,14 +171,15 @@ ulawtolin_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
for (x=0;x<f->datalen;x++) for (x=0;x<f->datalen;x++)
tmp->outbuf[tmp->tail + x] = AST_MULAW(b[x]); tmp->outbuf[tmp->tail + x] = AST_MULAW(b[x]);
if(useplc) plc_rx(&tmp->plc, tmp->outbuf+tmp->tail, f->datalen); if(useplc)
plc_rx(&tmp->plc, tmp->outbuf+tmp->tail, f->datalen);
tmp->tail += f->datalen; tmp->tail += f->datalen;
return 0; return 0;
} }
/* /*!
* ulawToLin_FrameOut * \brief ulawToLin_FrameOut
* Convert 4-bit ulaw encoded signals to 16-bit signed linear. * Convert 4-bit ulaw encoded signals to 16-bit signed linear.
* *
* Results: * Results:
@ -194,17 +190,16 @@ ulawtolin_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
* None. * None.
*/ */
static struct ast_frame * static struct ast_frame *ulawtolin_frameout(struct ast_translator_pvt *pvt)
ulawtolin_frameout (struct ast_translator_pvt *pvt)
{ {
struct ulaw_decoder_pvt *tmp = (struct ulaw_decoder_pvt *) pvt; struct ulaw_decoder_pvt *tmp = (struct ulaw_decoder_pvt *)pvt;
if (!tmp->tail) if (!tmp->tail)
return NULL; return NULL;
tmp->f.frametype = AST_FRAME_VOICE; tmp->f.frametype = AST_FRAME_VOICE;
tmp->f.subclass = AST_FORMAT_SLINEAR; tmp->f.subclass = AST_FORMAT_SLINEAR;
tmp->f.datalen = tmp->tail *2; tmp->f.datalen = tmp->tail * 2;
tmp->f.samples = tmp->tail; tmp->f.samples = tmp->tail;
tmp->f.mallocd = 0; tmp->f.mallocd = 0;
tmp->f.offset = AST_FRIENDLY_OFFSET; tmp->f.offset = AST_FRIENDLY_OFFSET;
@ -214,8 +209,8 @@ ulawtolin_frameout (struct ast_translator_pvt *pvt)
return &tmp->f; return &tmp->f;
} }
/* /*!
* LinToulaw_FrameIn * \brief LinToulaw_FrameIn
* Fill an input buffer with 16-bit signed linear PCM values. * Fill an input buffer with 16-bit signed linear PCM values.
* *
* Results: * Results:
@ -225,15 +220,13 @@ ulawtolin_frameout (struct ast_translator_pvt *pvt)
* tmp->tail is number of signal values in the input buffer. * tmp->tail is number of signal values in the input buffer.
*/ */
static int static int lintoulaw_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
lintoulaw_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
{ {
struct ulaw_encoder_pvt *tmp = (struct ulaw_encoder_pvt *) pvt; struct ulaw_encoder_pvt *tmp = (struct ulaw_encoder_pvt *)pvt;
int x; int x;
short *s; short *s;
if (tmp->tail + f->datalen/2 >= sizeof(tmp->outbuf)) if (tmp->tail + f->datalen / 2 >= sizeof(tmp->outbuf)) {
{ ast_log(LOG_WARNING, "Out of buffer space\n");
ast_log (LOG_WARNING, "Out of buffer space\n");
return -1; return -1;
} }
s = f->data; s = f->data;
@ -243,8 +236,8 @@ lintoulaw_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
return 0; return 0;
} }
/* /*!
* LinToulaw_FrameOut * \brief LinToulaw_FrameOut
* Convert a buffer of raw 16-bit signed linear PCM to a buffer * Convert a buffer of raw 16-bit signed linear PCM to a buffer
* of 4-bit ulaw packed two to a byte (Big Endian). * of 4-bit ulaw packed two to a byte (Big Endian).
* *
@ -255,10 +248,9 @@ lintoulaw_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
* Leftover inbuf data gets packed, tail gets updated. * Leftover inbuf data gets packed, tail gets updated.
*/ */
static struct ast_frame * static struct ast_frame *lintoulaw_frameout(struct ast_translator_pvt *pvt)
lintoulaw_frameout (struct ast_translator_pvt *pvt)
{ {
struct ulaw_encoder_pvt *tmp = (struct ulaw_encoder_pvt *) pvt; struct ulaw_encoder_pvt *tmp = (struct ulaw_encoder_pvt *)pvt;
if (tmp->tail) { if (tmp->tail) {
tmp->f.frametype = AST_FRAME_VOICE; tmp->f.frametype = AST_FRAME_VOICE;
@ -271,21 +263,21 @@ lintoulaw_frameout (struct ast_translator_pvt *pvt)
tmp->f.datalen = tmp->tail; tmp->f.datalen = tmp->tail;
tmp->tail = 0; tmp->tail = 0;
return &tmp->f; return &tmp->f;
} else return NULL; } else
return NULL;
} }
/* /*!
* ulawToLin_Sample * \brief ulawToLin_Sample
*/ */
static struct ast_frame * static struct ast_frame *ulawtolin_sample(void)
ulawtolin_sample (void)
{ {
static struct ast_frame f; static struct ast_frame f;
f.frametype = AST_FRAME_VOICE; f.frametype = AST_FRAME_VOICE;
f.subclass = AST_FORMAT_ULAW; f.subclass = AST_FORMAT_ULAW;
f.datalen = sizeof (ulaw_slin_ex); f.datalen = sizeof(ulaw_slin_ex);
f.samples = sizeof(ulaw_slin_ex); f.samples = sizeof(ulaw_slin_ex);
f.mallocd = 0; f.mallocd = 0;
f.offset = 0; f.offset = 0;
@ -294,19 +286,18 @@ ulawtolin_sample (void)
return &f; return &f;
} }
/* /*!
* LinToulaw_Sample * \brief LinToulaw_Sample
*/ */
static struct ast_frame * static struct ast_frame *lintoulaw_sample(void)
lintoulaw_sample (void)
{ {
static struct ast_frame f; static struct ast_frame f;
f.frametype = AST_FRAME_VOICE; f.frametype = AST_FRAME_VOICE;
f.subclass = AST_FORMAT_SLINEAR; f.subclass = AST_FORMAT_SLINEAR;
f.datalen = sizeof (slin_ulaw_ex); f.datalen = sizeof(slin_ulaw_ex);
/* Assume 8000 Hz */ /* Assume 8000 Hz */
f.samples = sizeof (slin_ulaw_ex) / 2; f.samples = sizeof(slin_ulaw_ex) / 2;
f.mallocd = 0; f.mallocd = 0;
f.offset = 0; f.offset = 0;
f.src = __PRETTY_FUNCTION__; f.src = __PRETTY_FUNCTION__;
@ -314,8 +305,8 @@ lintoulaw_sample (void)
return &f; return &f;
} }
/* /*!
* ulaw_Destroy * \brief ulaw_Destroy
* Destroys a private workspace. * Destroys a private workspace.
* *
* Results: * Results:
@ -325,16 +316,15 @@ lintoulaw_sample (void)
* None. * None.
*/ */
static void static void ulaw_destroy(struct ast_translator_pvt *pvt)
ulaw_destroy (struct ast_translator_pvt *pvt)
{ {
free (pvt); free(pvt);
localusecnt--; localusecnt--;
ast_update_use_count (); ast_update_use_count();
} }
/* /*!
* The complete translator for ulawToLin. * \brief The complete translator for ulawToLin.
*/ */
static struct ast_translator ulawtolin = { static struct ast_translator ulawtolin = {
@ -349,8 +339,8 @@ static struct ast_translator ulawtolin = {
ulawtolin_sample ulawtolin_sample
}; };
/* /*!
* The complete translator for LinToulaw. * \brief The complete translator for LinToulaw.
*/ */
static struct ast_translator lintoulaw = { static struct ast_translator lintoulaw = {
@ -365,8 +355,7 @@ static struct ast_translator lintoulaw = {
lintoulaw_sample lintoulaw_sample
}; };
static void static void parse_config(void)
parse_config(void)
{ {
struct ast_config *cfg; struct ast_config *cfg;
struct ast_variable *var; struct ast_variable *var;
@ -385,38 +374,34 @@ parse_config(void)
} }
} }
int int reload(void)
reload(void)
{ {
parse_config(); parse_config();
return 0; return 0;
} }
int unload_module(void)
int
unload_module (void)
{ {
int res; int res;
ast_mutex_lock (&localuser_lock); ast_mutex_lock(&localuser_lock);
res = ast_unregister_translator (&lintoulaw); res = ast_unregister_translator(&lintoulaw);
if (!res) if (!res)
res = ast_unregister_translator (&ulawtolin); res = ast_unregister_translator(&ulawtolin);
if (localusecnt) if (localusecnt)
res = -1; res = -1;
ast_mutex_unlock (&localuser_lock); ast_mutex_unlock(&localuser_lock);
return res; return res;
} }
int int load_module(void)
load_module (void)
{ {
int res; int res;
parse_config(); parse_config();
res = ast_register_translator (&ulawtolin); res = ast_register_translator(&ulawtolin);
if (!res) if (!res)
res = ast_register_translator (&lintoulaw); res = ast_register_translator(&lintoulaw);
else else
ast_unregister_translator (&ulawtolin); ast_unregister_translator(&ulawtolin);
return res; return res;
} }
@ -424,22 +409,19 @@ load_module (void)
* Return a description of this module. * Return a description of this module.
*/ */
char * char *description(void)
description (void)
{ {
return tdesc; return tdesc;
} }
int int usecount(void)
usecount (void)
{ {
int res; int res;
STANDARD_USECOUNT (res); STANDARD_USECOUNT(res);
return res; return res;
} }
char * char *key()
key ()
{ {
return ASTERISK_GPL_KEY; return ASTERISK_GPL_KEY;
} }

Loading…
Cancel
Save