Changeset 5101 for pjproject

Timestamp:

May 28, 2015 7:07:17 AM (10 years ago)

Author:

nanang

Message:

Misc (re #1843): Updated error message in pjmedia stream & video stream upon RTP receiving failure, also avoid printing the same message repeatedly of same subsequent failures.

Location:

pjproject/trunk/pjmedia/src/pjmedia

Files:

• stream.c (modified) (2 diffs)
• vid_stream.c (modified) (2 diffs)

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

@@ -227 +227 @@
 
     pj_uint32_t              rtp_rx_last_ts;        /**< Last received RTP timestamp*/
+    pj_status_t              rtp_rx_last_err;       /**< Last RTP recv() error */
 };
 
@@ -1632 +1633 @@
     /* Check for errors */
     if (bytes_read < 0) {
-        LOGERR_((stream->port.info.name.ptr, "RTP recv() error",
-                (pj_status_t)-bytes_read));
+        status = (pj_status_t)-bytes_read;
+        if (stream->rtp_rx_last_err != status) {
+            char errmsg[PJ_ERR_MSG_SIZE];
+            pj_strerror(status, errmsg, sizeof(errmsg));
+            PJ_LOG(4,(stream->port.info.name.ptr,
+                      "Unable to receive RTP packet, recv() returned %d: %s",
+                      status, errmsg));
+            stream->rtp_rx_last_err = status;
+        }
         return;
+    } else {
+        stream->rtp_rx_last_err = PJ_SUCCESS;
     }
 

pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c

@@ -172 +172 @@
     pj_uint32_t              last_dec_ts;   /**< Last decoded timestamp.    */
     int                      last_dec_seq;  /**< Last decoded sequence.     */
-
+    pj_status_t              rtp_rx_last_err; /**< Last RTP recv() error.   */
 
     pj_timestamp             ts_freq;       /**< Timestamp frequency.       */
@@ -607 +607 @@
     /* Check for errors */
     if (bytes_read < 0) {
-        LOGERR_((channel->port.info.name.ptr, "RTP recv() error", 
-                (pj_status_t)-bytes_read));
+        status = (pj_status_t)-bytes_read;
+        if (stream->rtp_rx_last_err != status) {
+            char errmsg[PJ_ERR_MSG_SIZE];
+            pj_strerror(status, errmsg, sizeof(errmsg));
+            PJ_LOG(4,(channel->port.info.name.ptr,
+                      "Unable to receive RTP packet, recv() returned %d: %s",
+                      status, errmsg));
+            stream->rtp_rx_last_err = status;
+        }
         return;
+    } else {
+        stream->rtp_rx_last_err = PJ_SUCCESS;
     }