formatting and doxygen fixes (issue #6300)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8360 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-01-20 23:23:00 +00:00
parent 4dc76fbcc1
commit ba56332ce8
4 changed files with 790 additions and 859 deletions

View File

@@ -62,10 +62,10 @@ static int useplc = 0;
*/
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 +73,11 @@ struct alaw_encoder_pvt
*/
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 +91,18 @@ struct alaw_decoder_pvt
* None.
*/
static struct ast_translator_pvt * alawtolin_new (void)
static struct ast_translator_pvt *alawtolin_new(void)
{
struct alaw_decoder_pvt *tmp;
tmp = malloc (sizeof (struct alaw_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;
struct alaw_decoder_pvt *tmp;
tmp = malloc(sizeof(struct alaw_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;
}
/*!
@@ -117,18 +116,17 @@ static struct ast_translator_pvt * alawtolin_new (void)
* None.
*/
static struct ast_translator_pvt * lintoalaw_new (void)
static struct ast_translator_pvt *lintoalaw_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;
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;
}
/*!
@@ -143,39 +141,39 @@ static struct ast_translator_pvt * lintoalaw_new (void)
* tmp->tail is the number of packed values in the buffer.
*/
static int
alawtolin_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
static int alawtolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f)
{
struct alaw_decoder_pvt *tmp = (struct alaw_decoder_pvt *) pvt;
int x;
unsigned char *b;
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;
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;
}
return 0;
}
if ((tmp->tail + f->datalen) * 2 > sizeof(tmp->outbuf)) {
ast_log(LOG_WARNING, "Out of buffer space\n");
return -1;
}
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]);
/* 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);
if(useplc)
plc_rx(&tmp->plc, tmp->outbuf+tmp->tail, f->datalen);
tmp->tail += f->datalen;
return 0;
tmp->tail += f->datalen;
return 0;
}
/*!
@@ -190,23 +188,23 @@ alawtolin_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
* 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)
return NULL;
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;
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;
}
/*!
@@ -220,21 +218,20 @@ static struct ast_frame * alawtolin_frameout (struct ast_translator_pvt *pvt)
* 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;
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;
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;
}
/*!
@@ -249,60 +246,60 @@ static int lintoalaw_framein (struct ast_translator_pvt *pvt, struct ast_frame *
* 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) {
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;
}
/*!
* \brief alawToLin_Sample
*/
static struct ast_frame * alawtolin_sample (void)
static struct ast_frame *alawtolin_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 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;
}
/*!
* \brief LinToalaw_Sample
*/
static struct ast_frame * lintoalaw_sample (void)
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;
f.src = __PRETTY_FUNCTION__;
f.data = slin_ulaw_ex;
return &f;
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;
f.src = __PRETTY_FUNCTION__;
f.data = slin_ulaw_ex;
return &f;
}
/*!
@@ -316,11 +313,11 @@ static struct ast_frame * lintoalaw_sample (void)
* None.
*/
static void alaw_destroy (struct ast_translator_pvt *pvt)
static void alaw_destroy(struct ast_translator_pvt *pvt)
{
free (pvt);
localusecnt--;
ast_update_use_count ();
free(pvt);
localusecnt--;
ast_update_use_count();
}
/*!
@@ -328,15 +325,15 @@ static void alaw_destroy (struct ast_translator_pvt *pvt)
*/
static struct ast_translator alawtolin = {
"alawtolin",
AST_FORMAT_ALAW,
AST_FORMAT_SLINEAR,
alawtolin_new,
alawtolin_framein,
alawtolin_frameout,
alaw_destroy,
/* NULL */
alawtolin_sample
"alawtolin",
AST_FORMAT_ALAW,
AST_FORMAT_SLINEAR,
alawtolin_new,
alawtolin_framein,
alawtolin_frameout,
alaw_destroy,
/* NULL */
alawtolin_sample
};
/*!
@@ -344,85 +341,85 @@ static struct ast_translator alawtolin = {
*/
static struct ast_translator lintoalaw = {
"lintoalaw",
AST_FORMAT_SLINEAR,
AST_FORMAT_ALAW,
lintoalaw_new,
lintoalaw_framein,
lintoalaw_frameout,
alaw_destroy,
/* NULL */
lintoalaw_sample
"lintoalaw",
AST_FORMAT_SLINEAR,
AST_FORMAT_ALAW,
lintoalaw_new,
lintoalaw_framein,
lintoalaw_frameout,
alaw_destroy,
/* NULL */
lintoalaw_sample
};
static void parse_config(void)
{
struct ast_config *cfg;
struct ast_variable *var;
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;
}
}
ast_config_destroy(cfg);
}
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;
}
}
ast_config_destroy(cfg);
}
}
int reload(void)
{
parse_config();
return 0;
parse_config();
return 0;
}
int unload_module (void)
int unload_module(void)
{
int res;
ast_mutex_lock (&localuser_lock);
res = ast_unregister_translator (&lintoalaw);
if (!res)
res = ast_unregister_translator (&alawtolin);
if (localusecnt)
res = -1;
ast_mutex_unlock (&localuser_lock);
return res;
int res;
ast_mutex_lock(&localuser_lock);
res = ast_unregister_translator(&lintoalaw);
if (!res)
res = ast_unregister_translator(&alawtolin);
if (localusecnt)
res = -1;
ast_mutex_unlock(&localuser_lock);
return res;
}
int load_module (void)
int load_module(void)
{
int res;
parse_config();
res = ast_register_translator (&alawtolin);
if (!res)
res = ast_register_translator (&lintoalaw);
else
ast_unregister_translator (&alawtolin);
return res;
int res;
parse_config();
res = ast_register_translator(&alawtolin);
if (!res)
res = ast_register_translator(&lintoalaw);
else
ast_unregister_translator(&alawtolin);
return res;
}
/*
* Return a description of this module.
*/
char * description (void)
char *description(void)
{
return tdesc;
return tdesc;
}
int usecount (void)
int usecount(void)
{
int res;
STANDARD_USECOUNT (res);
return res;
int res;
STANDARD_USECOUNT(res);
return res;
}
char * key ()
char *key()
{
return ASTERISK_GPL_KEY;
return ASTERISK_GPL_KEY;
}