Changeset 5982 for pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c

Timestamp:

May 9, 2019 7:24:57 AM (5 years ago)

Author:

nanang

Message:

Re #1298: Updated PJMEDIA* to use PJ_ERROR consistently.

File:

• pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c (modified) (11 diffs)

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

@@ -41 +41 @@
 #define THIS_FILE                       "vid_stream.c"
 #define ERRLEVEL                        1
-#define LOGERR_(expr)                   stream_perror expr
+#define LOGERR_(expr)                   PJ_PERROR(4,expr)
 #define TRC_(expr)                      PJ_LOG(5,expr)
 #define SIGNATURE                       PJMEDIA_SIG_PORT_VID_STREAM
@@ -196 +196 @@
 static pj_status_t decode_frame(pjmedia_vid_stream *stream,
                                 pjmedia_frame *frame);
-
-/*
- * Print error.
- */
-static void stream_perror(const char *sender, const char *title,
-                          pj_status_t status)
-{
-    char errmsg[PJ_ERR_MSG_SIZE];
-
-    pj_strerror(status, errmsg, sizeof(errmsg));
-    PJ_LOG(4,(sender, "%s: %s [err:%d]", title, errmsg, status));
-}
 
 
@@ -645 +633 @@
                                     &hdr, &payload, &payloadlen);
     if (status != PJ_SUCCESS) {
-        LOGERR_((channel->port.info.name.ptr, "RTP decode error", status));
+        LOGERR_((channel->port.info.name.ptr, status, "RTP decode error"));
         stream->rtcp.stat.rx.discard++;
         return;
@@ -826 +814 @@
 
     if (status != 0) {
-        LOGERR_((channel->port.info.name.ptr, "Jitter buffer put() error", 
-                status));
+        LOGERR_((channel->port.info.name.ptr, status,
+                 "Jitter buffer put() error"));
         pkt_discarded = PJ_TRUE;
         goto on_return;
@@ -867 +855 @@
     if (bytes_read < 0) {
         if (bytes_read != -PJ_STATUS_FROM_OS(OSERR_EWOULDBLOCK)) {
-            LOGERR_((stream->cname.ptr, "RTCP recv() error",
-                    (pj_status_t)-bytes_read));
+            LOGERR_((stream->cname.ptr, (pj_status_t)-bytes_read,
+                     "RTCP recv() error"));
         }
         return;
@@ -968 +956 @@
                                             &has_more_data);
     if (status != PJ_SUCCESS) {
-        LOGERR_((channel->port.info.name.ptr,
-                "Codec encode_begin() error", status));
+        LOGERR_((channel->port.info.name.ptr, status,
+                "Codec encode_begin() error"));
 
         /* Update RTP timestamp */
@@ -997 +985 @@
                                         &rtphdrlen);
         if (status != PJ_SUCCESS) {
-            LOGERR_((channel->port.info.name.ptr,
-                    "RTP encode_rtp() error", status));
+            LOGERR_((channel->port.info.name.ptr, status,
+                    "RTP encode_rtp() error"));
             return status;
         }
@@ -1017 +1005 @@
                 enum { COUNT_TO_REPORT = 20 };
                 if (stream->send_err_cnt++ == 0) {
-                    LOGERR_((channel->port.info.name.ptr,
-                             "Transport send_rtp() error",
-                             status));
+                    LOGERR_((channel->port.info.name.ptr, status,
+                             "Transport send_rtp() error"));
                 }
                 if (stream->send_err_cnt > COUNT_TO_REPORT)
@@ -1046 +1033 @@
                                                &has_more_data);
         if (status != PJ_SUCCESS) {
-            LOGERR_((channel->port.info.name.ptr,
-                     "Codec encode_more() error", status));
+            LOGERR_((channel->port.info.name.ptr, status,
+                     "Codec encode_more() error"));
             /* Ignore this error (?) */
             break;
@@ -1235 +1222 @@
                                           (unsigned)frame->size, frame);
         if (status != PJ_SUCCESS) {
-            LOGERR_((channel->port.info.name.ptr, "codec decode() error",
-                     status));
+            LOGERR_((channel->port.info.name.ptr, status,
+                     "codec decode() error"));
             frame->type = PJMEDIA_FRAME_TYPE_NONE;
             frame->size = 0;
@@ -1844 +1831 @@
         if (status != PJ_SUCCESS) {
             stream->trace_jb_fd = TRACE_JB_INVALID_FD;
-            PJ_LOG(3,(THIS_FILE, "Failed creating RTP trace file '%s'", 
-                      trace_name));
+            PJ_PERROR(3,(THIS_FILE, status,
+                         "Failed creating RTP trace file '%s'", 
+                         trace_name));
         } else {
             stream->trace_jb_buf = (char*)pj_pool_alloc(pool, PJ_LOG_MAX_SIZE);