Changeset 569

Timestamp:

Jun 29, 2006 3:42:57 PM (18 years ago)

Author:

bennylp

Message:

Fixed minor bug: RTCP session not fully cleared when it is initialized (should bzero everything), causing incorrect stats when it is reused for next call. Also couple of gcc warnings fixed.

Location:

pjproject/trunk/pjmedia/src/pjmedia

Files:

• rtcp.c (modified) (2 diffs)
• sdp.c (modified) (1 diff)
• stream.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/rtcp.c

@@ -134 +134 @@
     pj_time_val now;
     
-    /* Reset packet */
-    pj_memset(rtcp_pkt, 0, sizeof(pjmedia_rtcp_pkt));
-    
-    /* Reset statistics */
-    pj_memset(&sess->stat, 0, sizeof(pjmedia_rtcp_stat));
-    sess->avg_jitter = 0;
+    /* Memset everything */
+    pj_memset(sess, 0, sizeof(pjmedia_rtcp_session));
 
     /* Last RX timestamp in RTP packet */
@@ -151 +147 @@
     sess->pkt_size = samples_per_frame;
 
-    /* Init time */
-    sess->rx_lsr = 0;
-    sess->rx_lsr_time.u64 = 0;
-    
     /* Init common RTCP header */
     rtcp_pkt->common.version = 2;

pjproject/trunk/pjmedia/src/pjmedia/sdp.c

@@ -458 +458 @@
                            rtpmap->clock_rate,
                            (rtpmap->param.slen ? "/" : ""),
-                           rtpmap->param.slen,
+                           (int)rtpmap->param.slen,
                            rtpmap->param.ptr);
 

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -683 +683 @@
  * in the RTP socket. 
  */
-static void on_rx_rtp( pjmedia_stream *stream, 
+static void on_rx_rtp( void *data, 
                        const void *pkt,
                        pj_ssize_t bytes_read)
 
 {
+    pjmedia_stream *stream = data;
     pjmedia_channel *channel = stream->dec;
     const pjmedia_rtp_hdr *hdr;
@@ -825 +826 @@
  * in the RTCP socket. 
  */
-static void on_rx_rtcp( pjmedia_stream *stream,
+static void on_rx_rtcp( void *data,
                         const void *pkt, 
                         pj_ssize_t bytes_read)
 {
+    pjmedia_stream *stream = data;
+
     /* Check for errors */
     if (bytes_read < 0) {
@@ -1068 +1071 @@
 
     /* Only attach transport when stream is ready. */
-    status = (*tp->op->attach)(tp, stream, &info->rem_addr, &info->rem_rtcp,
-                               sizeof(info->rem_addr), &on_rx_rtp,
-                               &on_rx_rtcp);
+    status = pjmedia_transport_attach(tp, stream, &info->rem_addr, 
+                                      &info->rem_rtcp, sizeof(info->rem_addr), 
+                                      &on_rx_rtp, &on_rx_rtcp);
     if (status != PJ_SUCCESS)
         goto err_cleanup;