Changeset 3900 for pjproject/branches/1.x

Timestamp:

Dec 7, 2011 5:19:34 AM (12 years ago)

Author:

bennylp

Message:

Fixed #1421 (Audio is missing temporarily if SRTP is enabled due to lock codec feature). The problem occured because when lock codec is called, the stream may not transmit any RTP packets yet, causing the RTCP statistic to return zero as the last RTP sequence number sent. The zero RTP sequence number would cause SRTP to refuse to encode the RTP packet with error replay status

File:

• pjproject/branches/1.x/pjmedia/src/pjmedia/stream.c (modified) (4 diffs)

pjproject/branches/1.x/pjmedia/src/pjmedia/stream.c

@@ -926 +926 @@
         void *rtcp_pkt;
         int len;
+        pj_status_t status;
 
         pjmedia_rtcp_build_rtcp(&stream->rtcp, &rtcp_pkt, &len);
 
-        pjmedia_transport_send_rtcp(stream->transport, rtcp_pkt, len);
+        status=pjmedia_transport_send_rtcp(stream->transport, rtcp_pkt, len);
+        if (status != PJ_SUCCESS) {
+            PJ_PERROR(4,(stream->port.info.name.ptr, status,
+                         "Error sending RTCP"));
+        }
 
         stream->rtcp_last_tx = timestamp;
@@ -1339 +1344 @@
 
     /* Send the RTP packet to the transport. */
-    pjmedia_transport_send_rtp(stream->transport, channel->out_pkt, 
-                               frame_out.size + sizeof(pjmedia_rtp_hdr));
+    status = pjmedia_transport_send_rtp(stream->transport, channel->out_pkt,
+                                        frame_out.size +
+                                            sizeof(pjmedia_rtp_hdr));
+    if (status != PJ_SUCCESS) {
+        PJ_PERROR(4,(stream->port.info.name.ptr, status,
+                     "Error sending RTP"));
+    }
 
     /* Update stat */
@@ -1840 +1850 @@
                 pkt += len;
                 len = ((pj_uint8_t*)pkt) - ((pj_uint8_t*)stream->enc->out_pkt);
-                pjmedia_transport_send_rtcp(stream->transport, 
-                                            stream->enc->out_pkt, len);
+                status = pjmedia_transport_send_rtcp(stream->transport,
+                                                     stream->enc->out_pkt,
+                                                     len);
+                if (status != PJ_SUCCESS) {
+                    PJ_PERROR(4,(stream->port.info.name.ptr, status,
+                                 "Error sending RTCP SDES"));
+                }
             }
         } else {
-            pjmedia_transport_send_rtcp(stream->transport, sr_rr_pkt, len);
+            status = pjmedia_transport_send_rtcp(stream->transport,
+                                                 sr_rr_pkt, len);
+            if (status != PJ_SUCCESS) {
+                PJ_PERROR(4,(stream->port.info.name.ptr, status,
+                             "Error sending initial RTCP RR"));
+            }
         }
 
@@ -2250 +2270 @@
 
         pjmedia_rtcp_init2(&stream->rtcp, &rtcp_setting);
+
+        if (info->rtp_seq_ts_set) {
+            stream->rtcp.stat.rtp_tx_last_seq = info->rtp_seq;
+            stream->rtcp.stat.rtp_tx_last_ts = info->rtp_ts;
+        }
     }