kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor performance improvement

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@42477 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-09-08 21:33:32 +00:00
parent 160cea6139
commit c63fe750bb
4 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
codecs/codec_gsm.c
View File

@@ -183,14 +183,16 @@ static struct ast_frame *lintogsm_frameout(struct ast_trans_pvt *pvt)
return NULL;
while (pvt->samples >= GSM_SAMPLES) {
/* Encode a frame of data */
gsm_encode(tmp->gsm, tmp->buf, (gsm_byte *)pvt->outbuf + datalen);
gsm_encode(tmp->gsm, tmp->buf + samples, (gsm_byte *) pvt->outbuf + datalen);
datalen += GSM_FRAME_LEN;
samples += GSM_SAMPLES;
pvt->samples -= GSM_SAMPLES;
/* Move the data at the end of the buffer to the front */
if (pvt->samples)
memmove(tmp->buf, tmp->buf + GSM_SAMPLES, pvt->samples * 2);
}
/* Move the data at the end of the buffer to the front */
if (pvt->samples)
memmove(tmp->buf, tmp->buf + samples, pvt->samples * 2);
return ast_trans_frameout(pvt, datalen, samples);
}

14
codecs/codec_ilbc.c
View File

@@ -176,17 +176,21 @@ static struct ast_frame *lintoilbc_frameout(struct ast_trans_pvt *pvt)
while (pvt->samples >= ILBC_SAMPLES) {
float tmpf[ILBC_SAMPLES];
int i;
/* Encode a frame of data */
for ( i = 0 ; i < ILBC_SAMPLES ; i++ )
tmpf[i] = tmp->buf[i];
for (i = 0 ; i < ILBC_SAMPLES ; i++)
tmpf[i] = tmp->buf[samples + i];
iLBC_encode((unsigned char *) pvt->outbuf + datalen, tmpf, &tmp->enc);
datalen += ILBC_FRAME_LEN;
samples += ILBC_SAMPLES;
pvt->samples -= ILBC_SAMPLES;
/* Move the data at the end of the buffer to the front */
if (pvt->samples)
memmove(tmp->buf, tmp->buf + ILBC_SAMPLES, pvt->samples * 2);
}
/* Move the data at the end of the buffer to the front */
if (pvt->samples)
memmove(tmp->buf, tmp->buf + samples, pvt->samples * 2);
return ast_trans_frameout(pvt, datalen, samples);
}

3
codecs/codec_lpc10.c
View File

@@ -218,9 +218,6 @@ static struct ast_frame *lintolpc10_frameout(struct ast_trans_pvt *pvt)
/* Use one of the two left over bits to record if this is a 22 or 23 ms frame...
important for IAX use */
tmp->longer = 1 - tmp->longer;
#if 0 /* what the heck was this for? */
((char *)(tmp->f.data))[consumed - 1] |= tmp->longer;
#endif
}
/* Move the data at the end of the buffer to the front */
if (pvt->samples)

13
codecs/codec_speex.c
View File

@@ -274,11 +274,11 @@ static struct ast_frame *lintospeex_frameout(struct ast_trans_pvt *pvt)
#ifdef _SPEEX_TYPES_H
/* Preprocess audio */
if (preproc)
is_speech = speex_preprocess(tmp->pp, tmp->buf, NULL);
is_speech = speex_preprocess(tmp->pp, tmp->buf + samples, NULL);
/* Encode a frame of data */
if (is_speech) {
/* If DTX enabled speex_encode returns 0 during silence */
is_speech = speex_encode_int(tmp->speex, tmp->buf, &tmp->bits) || !dtx;
is_speech = speex_encode_int(tmp->speex, tmp->buf + samples, &tmp->bits) || !dtx;
} else {
/* 5 zeros interpreted by Speex as silence (submode 0) */
speex_bits_pack(&tmp->bits, 0, 5);
@@ -289,18 +289,19 @@ static struct ast_frame *lintospeex_frameout(struct ast_trans_pvt *pvt)
int x;
/* Convert to floating point */
for (x = 0; x < tmp->framesize; x++)
fbuf[x] = tmp->buf[x];
fbuf[x] = tmp->buf[samples + x];
/* Encode a frame of data */
is_speech = speex_encode(tmp->speex, fbuf, &tmp->bits) || !dtx;
}
#endif
samples += tmp->framesize;
pvt->samples -= tmp->framesize;
/* Move the data at the end of the buffer to the front */
if (pvt->samples)
memmove(tmp->buf, tmp->buf + tmp->framesize, pvt->samples * 2);
}
/* Move the data at the end of the buffer to the front */
if (pvt->samples)
memmove(tmp->buf, tmp->buf + samples, pvt->samples * 2);
/* Use AST_FRAME_CNG to signify the start of any silence period */
if (is_speech) {
tmp->silent_state = 0;