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

support DTX and CNG in speex (bug #4608)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6113 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-07-12 22:20:16 +00:00
parent 676116f2e2
commit 85eb4c9afb
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
codecs/codec_speex.c
View File

@@ -69,6 +69,7 @@ struct ast_translator_pvt {
/* Enough to store a full second */ /* Enough to store a full second */
short buf[8000]; short buf[8000];
int tail; int tail;
int silent_state;
}; };
#define speex_coder_pvt ast_translator_pvt #define speex_coder_pvt ast_translator_pvt
@@ -91,8 +92,6 @@ static struct ast_translator_pvt *lintospeex_new(void)
speex_encoder_ctl(tmp->speex, SPEEX_SET_QUALITY, &quality); speex_encoder_ctl(tmp->speex, SPEEX_SET_QUALITY, &quality);
if (vad) if (vad)
speex_encoder_ctl(tmp->speex, SPEEX_SET_VAD, &vad); speex_encoder_ctl(tmp->speex, SPEEX_SET_VAD, &vad);
if (dtx)
speex_encoder_ctl(tmp->speex, SPEEX_SET_DTX, &dtx);
} }
if (vbr) { if (vbr) {
speex_encoder_ctl(tmp->speex, SPEEX_SET_VBR, &vbr); speex_encoder_ctl(tmp->speex, SPEEX_SET_VBR, &vbr);
@@ -101,7 +100,10 @@ static struct ast_translator_pvt *lintospeex_new(void)
if (abr) { if (abr) {
speex_encoder_ctl(tmp->speex, SPEEX_SET_ABR, &abr); speex_encoder_ctl(tmp->speex, SPEEX_SET_ABR, &abr);
} }
if (dtx)
speex_encoder_ctl(tmp->speex, SPEEX_SET_DTX, &dtx);
tmp->tail = 0; tmp->tail = 0;
tmp->silent_state = 0;
} }
localusecnt++; localusecnt++;
} }
@@ -241,6 +243,7 @@ static struct ast_frame *lintospeex_frameout(struct ast_translator_pvt *tmp)
float fbuf[1024]; float fbuf[1024];
int len; int len;
int y=0,x; int y=0,x;
int is_speech=1;
/* We can't work on anything less than a frame in size */ /* We can't work on anything less than a frame in size */
if (tmp->tail < tmp->framesize) if (tmp->tail < tmp->framesize)
return NULL; return NULL;
@@ -256,7 +259,7 @@ static struct ast_frame *lintospeex_frameout(struct ast_translator_pvt *tmp)
for (x=0;x<tmp->framesize;x++) for (x=0;x<tmp->framesize;x++)
fbuf[x] = tmp->buf[x]; fbuf[x] = tmp->buf[x];
/* Encode a frame of data */ /* Encode a frame of data */
speex_encode(tmp->speex, fbuf, &tmp->bits); is_speech = speex_encode(tmp->speex, fbuf, &tmp->bits) || !dtx;
/* Assume 8000 Hz -- 20 ms */ /* Assume 8000 Hz -- 20 ms */
tmp->tail -= tmp->framesize; tmp->tail -= tmp->framesize;
/* Move the data at the end of the buffer to the front */ /* Move the data at the end of the buffer to the front */
@@ -264,6 +267,20 @@ static struct ast_frame *lintospeex_frameout(struct ast_translator_pvt *tmp)
memmove(tmp->buf, tmp->buf + tmp->framesize, tmp->tail * 2); memmove(tmp->buf, tmp->buf + tmp->framesize, tmp->tail * 2);
y++; y++;
} }
/* Use AST_FRAME_CNG to signify the start of any silence period */
if(!is_speech) {
if(tmp->silent_state) {
return NULL;
} else {
tmp->silent_state = 1;
speex_bits_reset(&tmp->bits);
tmp->f.frametype = AST_FRAME_CNG;
}
} else {
tmp->silent_state = 0;
}
/* Terminate bit stream */ /* Terminate bit stream */
speex_bits_pack(&tmp->bits, 15, 5); speex_bits_pack(&tmp->bits, 15, 5);
len = speex_bits_write(&tmp->bits, (char *)tmp->outbuf, sizeof(tmp->outbuf)); len = speex_bits_write(&tmp->bits, (char *)tmp->outbuf, sizeof(tmp->outbuf));

2
frame.c
View File

@@ -1117,7 +1117,7 @@ static int speex_get_wb_sz_at(unsigned char *data, int len, int bit)
static int speex_samples(unsigned char *data, int len) static int speex_samples(unsigned char *data, int len)
{ {
static int SpeexSubModeSz[] = { static int SpeexSubModeSz[] = {
0, 43, 119, 160, 5, 43, 119, 160,
220, 300, 364, 492, 220, 300, 364, 492,
79, 0, 0, 0, 79, 0, 0, 0,
0, 0, 0, 0 }; 0, 0, 0, 0 };