Changeset 569 for pjproject/trunk/pjmedia/src/pjmedia/stream.c

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.

File:

• pjproject/trunk/pjmedia/src/pjmedia/stream.c (modified) (3 diffs)

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;