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

Timestamp:

Jul 26, 2018 7:19:39 AM (6 years ago)

Author:

nanang

Message:

Re #2096:

• Added new error code for sending RTP/RTCP failure when DTLS-SRTP nego is in progress.
• When sending RTP/RTCP fails, only print error message once for consecutive same errors.

File:

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

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

@@ -247 +247 @@
     pj_uint32_t              rtp_rx_last_ts;        /**< Last received RTP timestamp*/
     pj_status_t              rtp_rx_last_err;       /**< Last RTP recv() error */
+    pj_status_t              rtp_tx_last_err;       /**< Last RTP send() error */
+    pj_status_t              rtcp_tx_last_err;      /**< Last RTCP send() error */
 
     /* RTCP Feedback */
@@ -1142 +1144 @@
     /* Send! */
     status = pjmedia_transport_send_rtcp(stream->transport, pkt, len);
+    if (status != PJ_SUCCESS) {
+        if (stream->rtcp_tx_last_err != status) {
+            PJ_PERROR(4,(stream->port.info.name.ptr, status,
+                         "Error sending RTCP"));
+            stream->rtcp_tx_last_err = status;
+        }
+    } else {
+        if (stream->rtcp_tx_last_err != PJ_SUCCESS) {
+            PJ_LOG(4,(stream->port.info.name.ptr, "Sending RTCP resumed"));
+            stream->rtcp_tx_last_err = PJ_SUCCESS;
+        }
+    }
 
     return status;
@@ -1184 +1198 @@
         status = send_rtcp(stream, !stream->rtcp_sdes_bye_disabled, PJ_FALSE,
                            with_xr, PJ_FALSE);
-        if (status != PJ_SUCCESS) {
-            PJ_PERROR(4,(stream->port.info.name.ptr, status,
-                         "Error sending RTCP"));
-        }
-
-        stream->rtcp_last_tx = timestamp;
+        if (status == PJ_SUCCESS) {
+            stream->rtcp_last_tx = timestamp;
+        }
     }
 }
@@ -1485 +1496 @@
                                             sizeof(pjmedia_rtp_hdr));
     if (status != PJ_SUCCESS) {
-        PJ_PERROR(4,(stream->port.info.name.ptr, status,
-                     "Error sending RTP"));
+        if (stream->rtp_tx_last_err != status) {
+            PJ_PERROR(4,(stream->port.info.name.ptr, status,
+                         "Error sending RTP"));
+            stream->rtp_tx_last_err = status;
+        }
         return PJ_SUCCESS;
+    } else {
+        if (stream->rtp_tx_last_err != PJ_SUCCESS) {
+            PJ_LOG(4,(stream->port.info.name.ptr, "Sending RTP resumed"));
+            stream->rtp_tx_last_err = PJ_SUCCESS;
+        }
     }