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

Minor samples updates

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2611 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-04-04 16:33:56 +00:00
parent 52f13283ea
commit e2b0f32c18
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
codecs/codec_g723_1.c
View File

@@ -115,7 +115,7 @@ static struct ast_frame *lintog723_sample(void)
f.subclass = AST_FORMAT_SLINEAR; f.subclass = AST_FORMAT_SLINEAR;
f.datalen = sizeof(slin_g723_ex); f.datalen = sizeof(slin_g723_ex);
/* Assume 8000 Hz */ /* Assume 8000 Hz */
f.samples = sizeof(slin_g723_ex)/16; f.samples = sizeof(slin_g723_ex)/2;
f.mallocd = 0; f.mallocd = 0;
f.offset = 0; f.offset = 0;
f.src = __PRETTY_FUNCTION__; f.src = __PRETTY_FUNCTION__;
@@ -130,7 +130,7 @@ static struct ast_frame *g723tolin_sample(void)
f.subclass = AST_FORMAT_G723_1; f.subclass = AST_FORMAT_G723_1;
f.datalen = sizeof(g723_slin_ex); f.datalen = sizeof(g723_slin_ex);
/* All frames are 30 ms long */ /* All frames are 30 ms long */
f.samples = 30; f.samples = 240;
f.mallocd = 0; f.mallocd = 0;
f.offset = 0; f.offset = 0;
f.src = __PRETTY_FUNCTION__; f.src = __PRETTY_FUNCTION__;
@@ -167,7 +167,7 @@ static struct ast_frame *g723tolin_frameout(struct ast_translator_pvt *pvt)
tmp->f.subclass = AST_FORMAT_SLINEAR; tmp->f.subclass = AST_FORMAT_SLINEAR;
tmp->f.datalen = tmp->tail * 2; tmp->f.datalen = tmp->tail * 2;
/* Assume 8000 Hz */ /* Assume 8000 Hz */
tmp->f.samples = tmp->tail / 8; 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;
tmp->f.src = __PRETTY_FUNCTION__; tmp->f.src = __PRETTY_FUNCTION__;
@@ -296,9 +296,8 @@ static struct ast_frame *lintog723_frameout(struct ast_translator_pvt *pvt)
Coder(&tmp->cod, tmp->buf, tmp->outbuf + cnt); Coder(&tmp->cod, tmp->buf, tmp->outbuf + cnt);
#endif #endif
/* Assume 8000 Hz */ /* Assume 8000 Hz */
tmp->f.samples += 30; tmp->f.samples += 240;
/* FIXME:SLD: Shouldn't the [0] be [cnt]?? */ cnt += g723_len(tmp->outbuf[cnt]);
cnt += g723_len(tmp->outbuf[0]);
tmp->tail -= Frame; tmp->tail -= Frame;
/* Move the data at the end of the buffer to the front */ /* Move the data at the end of the buffer to the front */
if (tmp->tail) if (tmp->tail)