Changeset 505 for pjproject/trunk

Timestamp:

Jun 14, 2006 8:02:05 PM (18 years ago)

Author:

bennylp

Message:

Fixed couple of bugs in stream: (1) race condition when transport callback is called when stream is not fully initialized, and (2) timestamp is not incremented when NULL frame is fed in put_frame()

File:

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

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

@@ -454 +454 @@
 
     /* Number of samples in the frame */
-    ts_len = frame->size / 2;
+    //ts_len = frame->size / 2;
+    ts_len = port->info.samples_per_frame;
 
     /* Init frame_out buffer. */
@@ -940 +941 @@
     stream->last_dtmf = -1;
 
-    /* Attach transport */
-    status = (*tp->op->attach)(tp, stream, &info->rem_addr, 
-                               sizeof(info->rem_addr), &on_rx_rtp,
-                               &on_rx_rtcp);
-    if (status != PJ_SUCCESS)
-        goto err_cleanup;
-
-    stream->transport = tp;
-
 
     /* Create mutex to protect jitter buffer: */
@@ -1061 +1053 @@
         goto err_cleanup;
 
+
+    /* Only attach transport when stream is ready. */
+    status = (*tp->op->attach)(tp, stream, &info->rem_addr, 
+                               sizeof(info->rem_addr), &on_rx_rtp,
+                               &on_rx_rtcp);
+    if (status != PJ_SUCCESS)
+        goto err_cleanup;
+
+    stream->transport = tp;