Changeset 1048 for pjproject/trunk

Timestamp:

Mar 7, 2007 11:26:00 AM (18 years ago)

Author:

bennylp

Message:

Fixed ticket #164: Bug in pjmedia_stream_resume() not resuming the stream (thanks PurnaChandar? and Carmine)

File:

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

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

@@ -918 +918 @@
     }
 
+    /* Ignore keep-alive packets */
+    if (bytes_read < sizeof(pjmedia_rtp_hdr))
+        return;
+
     /* Update RTP and RTCP session. */
     status = pjmedia_rtp_decode_rtp(&channel->rtp, pkt, bytes_read,
@@ -932 +936 @@
                         pj_ntohl(hdr->ts), payloadlen);
 
+    /* Ignore the packet if decoder is paused */
+    if (channel->paused)
+        return;
+
     /* Handle incoming DTMF. */
     if (hdr->pt == stream->rx_event_pt) {
@@ -937 +945 @@
         return;
     }
-
 
     /* Update RTP session (also checks if RTP session can accept
@@ -1474 +1481 @@
     if ((dir & PJMEDIA_DIR_DECODING) && stream->dec) {
         stream->dec->paused = 1;
+
+        /* Also reset jitter buffer */
+        pj_mutex_lock( stream->jb_mutex );
+        pjmedia_jbuf_reset(stream->jb);
+        pj_mutex_unlock( stream->jb_mutex );
+
         PJ_LOG(4,(stream->port.info.name.ptr, "Decoder stream paused"));
     }
@@ -1490 +1503 @@
 
     if ((dir & PJMEDIA_DIR_ENCODING) && stream->enc) {
-        stream->enc->paused = 1;
+        stream->enc->paused = 0;
         PJ_LOG(4,(stream->port.info.name.ptr, "Encoder stream resumed"));
     }
 
     if ((dir & PJMEDIA_DIR_DECODING) && stream->dec) {
-        stream->dec->paused = 1;
+        stream->dec->paused = 0;
         PJ_LOG(4,(stream->port.info.name.ptr, "Decoder stream resumed"));
     }