Timestamp fixes

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1170 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index badc0287be3cd77e5e812c9ee9f035303d35ad82..2b6013f774ae0817d14c04ccd8ce4acda59e585d 100755 (executable)
--- 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);
                }