Changeset 5982 for pjproject/trunk/pjmedia/src/pjmedia/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/stream.c (modified) (12 diffs)

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

@@ -39 +39 @@
 #define THIS_FILE                       "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)
 
@@ -269 +269 @@
 static pj_int16_t zero_frame[2 * 30 * 16000 / 1000];
 
-/*
- * 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));
-}
 
 static void on_rx_rtcp( void *data,
@@ -749 +738 @@
                                            &frame_out);
             if (status != 0) {
-                LOGERR_((port->info.name.ptr, "codec decode() error",
-                         status));
+                LOGERR_((port->info.name.ptr, status,
+                         "codec decode() error"));
 
                 if (use_dec_buf) {
@@ -862 +851 @@
                                            0, frame);
             if (status != PJ_SUCCESS) {
-                LOGERR_((port->info.name.ptr, "codec decode() error",
-                         status));
+                LOGERR_((port->info.name.ptr, status,
+                         "codec decode() error"));
                 pjmedia_frame_ext_append_subframe(f, NULL, 0,
                                             (pj_uint16_t)samples_per_frame);
@@ -1397 +1386 @@
                                        &frame_out);
         if (status != PJ_SUCCESS) {
-            LOGERR_((stream->port.info.name.ptr,
-                    "Codec encode() error", status));
+            LOGERR_((stream->port.info.name.ptr, status,
+                    "Codec encode() error"));
             return status;
         }
@@ -1421 +1410 @@
                                        &frame_out);
         if (status != PJ_SUCCESS) {
-            LOGERR_((stream->port.info.name.ptr,
-                    "Codec encode() error", status));
+            LOGERR_((stream->port.info.name.ptr, status,
+                    "Codec encode() error"));
             return status;
         }
@@ -1445 +1434 @@
 
     if (status != PJ_SUCCESS) {
-        LOGERR_((stream->port.info.name.ptr,
-                "RTP encode_rtp() error", status));
+        LOGERR_((stream->port.info.name.ptr, status,
+                "RTP encode_rtp() error"));
         return status;
     }
@@ -1776 +1765 @@
                                     &hdr, &payload, &payloadlen);
     if (status != PJ_SUCCESS) {
-        LOGERR_((stream->port.info.name.ptr, "RTP decode error", status));
+        LOGERR_((stream->port.info.name.ptr, status, "RTP decode error"));
         stream->rtcp.stat.rx.discard++;
         return;
@@ -1931 +1920 @@
                                      payloadlen, &ts, &count, frames);
         if (status != PJ_SUCCESS) {
-            LOGERR_((stream->port.info.name.ptr,
-                     "Codec parse() error",
-                     status));
+            LOGERR_((stream->port.info.name.ptr, status,
+                     "Codec parse() error"));
             count = 0;
         } else if (stream->detect_ptime_change &&
@@ -2059 +2047 @@
 
     if (status != 0) {
-        LOGERR_((stream->port.info.name.ptr, "Jitter buffer put() error",
-                status));
+        LOGERR_((stream->port.info.name.ptr, status,
+                 "Jitter buffer put() error"));
         pkt_discarded = PJ_TRUE;
         goto on_return;
@@ -2122 +2110 @@
     if (bytes_read < 0) {
         if (bytes_read != -PJ_STATUS_FROM_OS(OSERR_EWOULDBLOCK)) {
-            LOGERR_((stream->port.info.name.ptr, "RTCP recv() error",
-                    (pj_status_t)-bytes_read));
+            LOGERR_((stream->port.info.name.ptr, (pj_status_t)-bytes_read,
+                     "RTCP recv() error"));
         }
         return;
@@ -2779 +2767 @@
                          TRACE_JB_PATH_PREFIX "%s.csv",
                          stream->port.info.name.ptr);
-        status = pj_file_open(pool, trace_name, PJ_O_WRONLY, &stream->trace_jb_fd);
+        status = pj_file_open(pool, trace_name, PJ_O_WRONLY,
+                              &stream->trace_jb_fd);
         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);