Changeset 4251

Show
Ignore:
Timestamp:
08/07/08 23:42:11 (6 years ago)
Author:
soohyunc
Message:

XR block contents changed because we need two different types of XR format

(1) ackvec and AoA transmission (RFC 3611 Section 4.1), BT=1
(2) time stamp transmission (RFC 3611 Section 4.4), BT=4 LEN=2

Location:
vic/branches/cc/rtp
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • vic/branches/cc/rtp/rtp.h

    r4250 r4251  
    141141        u_int16_t begin_seq; /* first seqno that this block report */ 
    142142        u_int16_t end_seq;      /* last seqno that this block report plus 1 */ 
    143         u_int32_t chunk;        /* extended report chunks */ 
     143        u_int32_t *chunk;       /* extended report chunks */ 
    144144}; 
    145145 
  • vic/branches/cc/rtp/session.cpp

    r4249 r4251  
    648648                int xrlen = (xrh->xr_flags << 16) >> 16; // XR length 
    649649                xrb = (rtcp_xr_blk*)(xrh + xrlen + 1);  // XR block 
    650                 xrb->begin_seq = lastseq_;// this will be used for ackofack 
    651                 xrb->end_seq = seqno_ + 1;// as defined in RFC3611 section 4.1 
    652                 xrb->chunk = get_ackvec();      // ackvec 
     650                xrb->begin_seq = htonl(lastseq_);// this will be used for ackofack 
     651                xrb->end_seq = htonl(seqno_ + 1);// as defined in RFC3611 section 4.1 
     652                xrb->chunk = (u_int32_t *) htonl(get_ackvec()); 
     653                //xrb->chunk = htonl(mt->ref_ts()); 
    653654        } 
    654655 
     
    10881089         */ 
    10891090        if (xrb->begin_seq == xrb->end_seq) { 
    1090                 // we just received ackofack, so do receiver stuffs here 
    1091                  
     1091                // we received ackofack, so do receiver stuffs here 
    10921092                //trim_vec(xrb->chunk); // chunk in xrb is ackvec 
    10931093                ch_[0].send(build_ackvpkt(xrh), xrlen); 
    10941094        } else { 
    1095                 ackvec_ = xrb->chunk; 
     1095                // we received ackvec, so do sender stuffs here 
     1096                ackvec_ = (u_int32_t) &xrb->chunk; 
    10961097                ackofack_ = xrb->begin_seq; 
    10971098                // time stamp update comes to here