Changeset 213

Timestamp:

Feb 22, 2006 12:25:51 AM (18 years ago)

Author:

bennylp

Message:

Better error reporting in pjmedia stream

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/stream.c (modified) (11 diffs)
• pjsip/build/pjsip.dsw (modified) (1 diff)

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

@@ -35 +35 @@
 #define THIS_FILE                       "stream.c"
 #define ERRLEVEL                        1
-#define TRACE_(expr)                    PJ_LOG(3,expr)
+#define TRACE_(expr)                    stream_perror expr
 
 #define PJMEDIA_MAX_FRAME_DURATION_MS   200
@@ -97 +97 @@
 
 
+/*
+ * 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(3,(sender, "%s: %s [err:%d]", title, errmsg, status));
+}
+
 
 /*
@@ -145 +157 @@
                                         channel->pcm_buf_size, &frame_out);
     if (status != 0) {
-        TRACE_((THIS_FILE, "decode() has return error status %d", status));
+        TRACE_((THIS_FILE, "codec decode() error", status));
 
         frame->type = PJMEDIA_FRAME_TYPE_NONE;
@@ -153 +165 @@
     /* Put in sound buffer. */
     if (frame_out.size > frame->size) {
-        TRACE_((THIS_FILE, "Sound playout buffer truncated %d bytes", 
-                frame_out.size - frame->size));
+        PJ_LOG(4,(THIS_FILE, "Sound playout buffer truncated %d bytes", 
+                  frame_out.size - frame->size));
         frame_out.size = frame->size;
     }
@@ -197 +209 @@
                                         &frame_out);
     if (status != 0) {
-        TRACE_((THIS_FILE, "Codec encode() has returned error status %d", 
-                status));
+        TRACE_((THIS_FILE, "Codec encode() error", status));
         return status;
     }
@@ -209 +220 @@
                                 (const void**)&rtphdr, &rtphdrlen);
     if (status != 0) {
-        TRACE_((THIS_FILE, "RTP encode_rtp() has returned error status %d", 
-                           status));
+        TRACE_((THIS_FILE, "RTP encode_rtp() error", status));
         return status;
     }
@@ -217 +227 @@
         /* We don't support RTP with extended header yet. */
         PJ_TODO(SUPPORT_SENDING_RTP_WITH_EXTENDED_HEADER);
-        TRACE_((THIS_FILE, "Unsupported extended RTP header for transmission"));
+        //TRACE_((THIS_FILE, "Unsupported extended RTP header for transmission"));
         return 0;
     }
@@ -267 +277 @@
         status = pj_sock_select(FD_SETSIZE, &fds, NULL, NULL, &timeout);
         if (status < 0) {
-            char errmsg[PJ_ERR_MSG_SIZE];
-            pj_strerror(pj_get_netos_error(), errmsg, sizeof(errmsg));
-            TRACE_((THIS_FILE, "Jitter buffer select() error: %s",
-                    errmsg));
+            TRACE_((THIS_FILE, "Jitter buffer select() error", 
+                    pj_get_netos_error()));
             pj_thread_sleep(500);
             continue;
@@ -299 +307 @@
                                    &hdr, &payload, &payloadlen);
         if (status != PJ_SUCCESS) {
-            TRACE_((THIS_FILE, "RTP decode_rtp() has returned error status %d",
-                    status));
+            TRACE_((THIS_FILE, "RTP decode error", status));
             continue;
         }
@@ -309 +316 @@
             status != PJMEDIA_RTP_ESESSRESTART) 
         {
-            TRACE_((THIS_FILE, 
-                    "RTP session_update() has returned error status %d", 
-                    status));
+            TRACE_((THIS_FILE, "RTP session_update error", status));
             continue;
         }
@@ -326 +331 @@
 
         if (status != 0) {
-            TRACE_((THIS_FILE, 
-                    "Jitter buffer put() has returned error status %d", 
-                    status));
+            TRACE_((THIS_FILE, "Jitter buffer put() error", status));
             continue;
         }

pjproject/trunk/pjsip/build/pjsip.dsw

@@ -53 +53 @@
 
 Project: "pjmedia_codec"=..\..\pjmedia\build\pjmedia_codec.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "pjsip++"=".\pjsip++.dsp" - Package Owner=<4>
 
 Package=<5>