diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-07-09 00:24:28 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-07-09 00:24:28 +0000 |
| commit | 544ed4ae5ec3e5c7dbb3197bb51bc087d204dc29 (patch) | |
| tree | 5640c21e6468f1a42478bbcdbccc42f004feb7f9 /channels/chan_iax2.c | |
| parent | 7f527600cc16370cdae816b53f60a4ec237dae4b (diff) | |
Timestamp fixes
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1170 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_iax2.c')
| -rwxr-xr-x | channels/chan_iax2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index badc0287b..2b6013f77 100755 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -2148,9 +2148,10 @@ static int iax2_send(struct chan_iax2_pvt *pvt, struct ast_frame *f, unsigned in return -1; } + lastsent = pvt->lastsent; + /* Calculate actual timestamp */ fts = calc_timestamp(pvt, ts); - lastsent = pvt->lastsent; if ((pvt->trunk || ((fts & 0xFFFF0000L) == (lastsent & 0xFFFF0000L))) /* High two bits are the same on timestamp, or sending on a trunk */ && @@ -3696,7 +3697,7 @@ static int socket_read(int *id, int fd, short events, void *cbdata) /* Retrieve the type and subclass */ f.frametype = fh->type; if (f.frametype == AST_FRAME_VIDEO) { - f.subclass = uncompress_subclass(fh->csub & ~0x40) | ((fh->csub & 0x40) >> 6); + f.subclass = uncompress_subclass(fh->csub & ~0x40) | ((fh->csub >> 6) & 0x1); } else { f.subclass = uncompress_subclass(fh->csub); } |