kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-04 05:55:58 -07:00
Code Issues Packages Projects Releases Wiki Activity

_really_ fix IAX2 crazy timestamp problem (bug #4747)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6180 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-07-20 22:46:58 +00:00
parent bd18858411
commit 3f5035dce4
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_iax2.c
+10 -2
View File
@@ -3380,6 +3380,7 @@ static unsigned int calc_timestamp(struct chan_iax2_pvt *p, unsigned int ts, str
int ms;
int voice = 0;
int genuine = 0;
int adjust;
struct timeval *delivery = NULL;
@@ -3421,8 +3422,15 @@ static unsigned int calc_timestamp(struct chan_iax2_pvt *p, unsigned int ts, str
if (p->notsilenttx && abs(ms - p->nextpred) <= MAX_TIMESTAMP_SKEW) {
/* Adjust our txcore, keeping voice and
non-voice synchronized */
p->offset = ast_tvadd(p->offset,
ast_samp2tv((ms - p->nextpred)/10, 1000)); /* XXX what scale is this ??? */
/* We need someone who understands this code to comment here on
why the 'adjust' value is handled as if it was in units
of 10,000 microseconds, instead of milliseconds
*/
adjust = (ms - p->nextpred);
if (adjust < 0)
p->offset = ast_tvsub(p->offset, ast_samp2tv(abs(adjust), 10000));
else if (adjust > 0)
p->offset = ast_tvadd(p->offset, ast_samp2tv(adjust, 10000));
if (!p->nextpred) {
p->nextpred = ms; /*f->samples / 8;*/