kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

ensure translators don't generate old timestamps when silent periods end (bug #4707 with formatting fixes)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6203 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-07-25 19:41:39 +00:00
parent ff5409507c
commit 6d7b939467
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
translate.c
View File

@@ -152,10 +152,12 @@ struct ast_frame *ast_translate(struct ast_trans_pvt *path, struct ast_frame *f,
/* Make sure this is in line with what we were expecting */ /* Make sure this is in line with what we were expecting */
if (!ast_tveq(path->nextin, f->delivery)) { if (!ast_tveq(path->nextin, f->delivery)) {
/* The time has changed between what we expected and this /* The time has changed between what we expected and this
most recent time on the new packet. Adjust our output most recent time on the new packet. If we have a
time appropriately */ valid prediction adjust our output time appropriately */
path->nextout = ast_tvadd(path->nextout, if (!ast_tvzero(path->nextout)) {
ast_tvsub(f->delivery, path->nextin)); path->nextout = ast_tvadd(path->nextout,
ast_tvsub(f->delivery, path->nextin));
}
path->nextin = f->delivery; path->nextin = f->delivery;
} }
} else { } else {
@@ -180,6 +182,10 @@ struct ast_frame *ast_translate(struct ast_trans_pvt *path, struct ast_frame *f,
p->next->step->framein(p->next->state, out); p->next->step->framein(p->next->state, out);
else { else {
if (!ast_tvzero(delivery)) { if (!ast_tvzero(delivery)) {
/* Regenerate prediction after a discontinuity */
if (ast_tvzero(path->nextout))
path->nextout = ast_tvnow();
/* Use next predicted outgoing timestamp */ /* Use next predicted outgoing timestamp */
out->delivery = path->nextout; out->delivery = path->nextout;
@@ -189,6 +195,9 @@ struct ast_frame *ast_translate(struct ast_trans_pvt *path, struct ast_frame *f,
} else { } else {
out->delivery = ast_tv(0, 0); out->delivery = ast_tv(0, 0);
} }
/* Invalidate prediction if we're entering a silence period */
if (out->frametype == AST_FRAME_CNG)
path->nextout = ast_tv(0, 0);
return out; return out;
} }
p = p->next; p = p->next;