Changeset 621 for pjproject/trunk/pjsip-apps/src/samples/siprtp_report.c

Timestamp:

Jul 22, 2006 12:53:04 PM (18 years ago)

Author:

bennylp

Message:

Few changes in siprtp:
(1) Added "s" command to show summary of all calls statistic
(2) Media start delay changed from 1000ms to 50ms
(3) Changed print_call to use LOG instead of printf, so that it can be turned off

File:

• pjproject/trunk/pjsip-apps/src/samples/siprtp_report.c (modified) (12 diffs)

pjproject/trunk/pjsip-apps/src/samples/siprtp_report.c

@@ -26 +26 @@
  * functionality (such as writing to XML file).
  */
-
-static const char *good_number(char *buf, pj_int32_t val)
-{
-    if (val < 1000) {
-        pj_ansi_sprintf(buf, "%d", val);
-    } else if (val < 1000000) {
-        pj_ansi_sprintf(buf, "%d.%dK", 
-                        val / 1000,
-                        (val % 1000) / 100);
-    } else {
-        pj_ansi_sprintf(buf, "%d.%02dM", 
-                        val / 1000000,
-                        (val % 1000000) / 10000);
-    }
-
-    return buf;
-}
 
 
@@ -55 +38 @@
     char duration[80], last_update[80];
     char bps[16], ipbps[16], packets[16], bytes[16], ipbytes[16];
+    unsigned decor;
     pj_time_val now;
+
+
+    decor = pj_log_get_decor();
+    pj_log_set_decor(PJ_LOG_HAS_NEWLINE);
 
     pj_gettimeofday(&now);
@@ -80 +68 @@
 
     /* Call number and state */
-    printf("Call #%d: %s%s\n", call_index, pjsip_inv_state_name(inv->state), 
-                               duration);
+    PJ_LOG(3, (THIS_FILE,
+              "Call #%d: %s%s", 
+              call_index, pjsip_inv_state_name(inv->state), 
+              duration));
 
 
@@ -92 +82 @@
         userinfo[len] = '\0';
 
-    printf("   %s\n", userinfo);
+    PJ_LOG(3, (THIS_FILE, "   %s", userinfo));
 
 
@@ -98 +88 @@
         call->connect_time.sec == 0) 
     {
+        pj_log_set_decor(decor);
         return;
     }
@@ -124 +115 @@
         }
 
-        printf("   Signaling quality: %s%s\n", pdd, connectdelay);
-    }
-
-
-    printf("   Stream #0: audio %.*s@%dHz, %dms/frame, %sB/s (%sB/s +IP hdr)\n",
+        PJ_LOG(3, (THIS_FILE, 
+                   "   Signaling quality: %s%s", pdd, connectdelay));
+    }
+
+
+    PJ_LOG(3, (THIS_FILE,
+               "   Stream #0: audio %.*s@%dHz, %dms/frame, %sB/s (%sB/s +IP hdr)",
         (int)audio->si.fmt.encoding_name.slen,
         audio->si.fmt.encoding_name.ptr,
@@ -134 +127 @@
         audio->samples_per_frame * 1000 / audio->clock_rate,
         good_number(bps, audio->bytes_per_frame * audio->clock_rate / audio->samples_per_frame),
-        good_number(ipbps, (audio->bytes_per_frame+32) * audio->clock_rate / audio->samples_per_frame));
+        good_number(ipbps, (audio->bytes_per_frame+32) * audio->clock_rate / audio->samples_per_frame)));
 
     if (audio->rtcp.stat.rx.update_cnt == 0)
@@ -148 +141 @@
     }
 
-    printf("              RX stat last update: %s\n"
+    PJ_LOG(3, (THIS_FILE, 
+           "              RX stat last update: %s\n"
            "                 total %s packets %sB received (%sB +IP hdr)%s\n"
            "                 pkt loss=%d (%3.1f%%), dup=%d (%3.1f%%), reorder=%d (%3.1f%%)%s\n"
            "                       (msec)    min     avg     max     last\n"
            "                 loss period: %7.3f %7.3f %7.3f %7.3f%s\n"
-           "                 jitter     : %7.3f %7.3f %7.3f %7.3f%s\n",
+           "                 jitter     : %7.3f %7.3f %7.3f %7.3f%s",
            last_update,
            good_number(packets, audio->rtcp.stat.rx.pkt),
@@ -176 +170 @@
            audio->rtcp.stat.rx.jitter.last / 1000.0,
            ""
-           );
+           ));
 
 
@@ -191 +185 @@
     }
 
-    printf("              TX stat last update: %s\n"
+    PJ_LOG(3, (THIS_FILE,
+           "              TX stat last update: %s\n"
            "                 total %s packets %sB sent (%sB +IP hdr)%s\n"
            "                 pkt loss=%d (%3.1f%%), dup=%d (%3.1f%%), reorder=%d (%3.1f%%)%s\n"
            "                       (msec)    min     avg     max     last\n"
            "                 loss period: %7.3f %7.3f %7.3f %7.3f%s\n"
-           "                 jitter     : %7.3f %7.3f %7.3f %7.3f%s\n",
+           "                 jitter     : %7.3f %7.3f %7.3f %7.3f%s",
            last_update,
            good_number(packets, audio->rtcp.stat.tx.pkt),
@@ -219 +214 @@
            audio->rtcp.stat.tx.jitter.last / 1000.0,
            ""
-           );
-
-
-    printf("             RTT delay      : %7.3f %7.3f %7.3f %7.3f%s\n", 
+           ));
+
+
+    PJ_LOG(3, (THIS_FILE,
+           "             RTT delay      : %7.3f %7.3f %7.3f %7.3f%s\n", 
            audio->rtcp.stat.rtt.min / 1000.0,
            audio->rtcp.stat.rtt.avg / 1000.0,
@@ -228 +224 @@
            audio->rtcp.stat.rtt.last / 1000.0,
            ""
-           );
-
+           ));
+
+    pj_log_set_decor(decor);
 }