Commit e3e56ecd authored by Guillaume Beraudo's avatar Guillaume Beraudo

Merge branch 'master' of git.linphone.org:ortp

parents 0e8d7a32 359fe425
......@@ -48,14 +48,14 @@ typedef enum {
typedef struct rtcp_common_header
{
#ifdef ORTP_BIGENDIAN
uint16_t version:2;
uint16_t padbit:1;
uint16_t rc:5;
uint16_t packet_type:8;
uint16_t version:2;
uint16_t padbit:1;
uint16_t rc:5;
uint16_t packet_type:8;
#else
uint16_t rc:5;
uint16_t padbit:1;
uint16_t version:2;
uint16_t rc:5;
uint16_t padbit:1;
uint16_t version:2;
uint16_t packet_type:8;
#endif
uint16_t length:16;
......
......@@ -31,7 +31,7 @@ libortp_la_SOURCES= str_utils.c \
stun.c stun_udp.c \
srtp.c \
b64.c \
zrtp.c zrtp.h
zrtp.c
if LIBZRTPCPP
AM_CFLAGS+= $(LIBZRTPCPP_CFLAGS)
......
......@@ -1093,7 +1093,8 @@ static void process_rtcp_packet( RtpSession *session, mblk_t *block ) {
rtpstream->last_rcv_SR_time.tv_sec = reception_date.tv_sec;
compute_rtt(session,&reception_date,&sr->rb[0]);
}else if ( rtcp_is_RR(block)){
compute_rtt(session,&reception_date,rtcp_RR_get_report_block(block,0));
const report_block_t *rb=rtcp_RR_get_report_block(block,0);
if (rb) compute_rtt(session,&reception_date,rb);
}
}while (rtcp_next_packet(block));
rtcp_rewind(block);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment