Changeset 2854

Timestamp:

Aug 5, 2009 5:10:35 PM (15 years ago)

Author:

bennylp

Message:

More ticket #925: added compile time option to enable verbose logging output, and one more fix about samples_per_frame mismatch

File:

• pjproject/trunk/pjsip-apps/src/samples/jbsim.c (modified) (13 diffs)

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

@@ -40 +40 @@
 /* Defaults settings */
 #define CODEC           "PCMU"
-#define LOG_FILE        "jbsim.out"
+#define LOG_FILE        "jbsim.csv"
 #define WAV_REF         "../../tests/pjsua/wavs/input.8.wav"
 #define WAV_OUT         "jbsim.wav"
-#define DURATION        20
+#define DURATION        60
 #define DTX             PJ_TRUE
 #define PLC             PJ_TRUE
@@ -50 +50 @@
 #define LOSS_CORR       0
 #define LOSS_EXTRA      2
+#define SILENT          1
 
 /*
@@ -122 +123 @@
 {
     /* General options */
+    pj_bool_t        silent;            /* Write little to stdout   */
     const char      *log_file;          /* The output log file      */
 
@@ -188 +190 @@
  * Logging
  */
-static void write_log(struct log_entry *entry)
+static void write_log(struct log_entry *entry, pj_bool_t to_stdout)
 {
     /* Format (CSV): */
@@ -209 +211 @@
             pj_file_write(g_app.log_fd, log, &size);
         }
+        if (to_stdout && !g_app.cfg.silent)
+            printf("%s", log);
         header_written = PJ_TRUE;
     }
@@ -260 +264 @@
         pj_file_write(g_app.log_fd, log, &size);
     }
+
+    if (to_stdout && !g_app.cfg.silent)
+        printf("%s", log);
 }
 
@@ -275 +282 @@
     entry.log = data;
     entry.wall_clock = g_app.wall_clock;
-    write_log(&entry);
+    write_log(&entry, PJ_FALSE);
 }
 
@@ -480 +487 @@
 #endif
 #if defined(PJMEDIA_HAS_ILBC_CODEC) && PJMEDIA_HAS_ILBC_CODEC != 0
-    pjmedia_codec_ilbc_init(g_app.endpt, 30);
+    /* Init ILBC with mode=20 to make the losts occur at the same
+     * places as other codecs.
+     */
+    pjmedia_codec_ilbc_init(g_app.endpt, 20);
 #endif
 #if defined(PJMEDIA_HAS_INTEL_IPP) && PJMEDIA_HAS_INTEL_IPP != 0
@@ -585 +595 @@
     frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
     frame.buf = g_app.framebuf;
-    frame.size = src->info.samples_per_frame * 2;
+    frame.size = dst->info.samples_per_frame * 2;
     
     status = pjmedia_port_get_frame(src, &frame);
@@ -705 +715 @@
         }
 
-        write_log(&entry);
+        write_log(&entry, PJ_TRUE);
 
         ++strm->state.tx.total_tx;
@@ -793 +803 @@
             entry.jb_state = &jstate;
 
-            write_log(&entry);
+            write_log(&entry, PJ_TRUE);
 
             /* GET */
@@ -816 +826 @@
                 strcat(msg, "** NULL frame was returned **");
 
-            write_log(&entry);
+            write_log(&entry, PJ_TRUE);
 
         }
@@ -961 +971 @@
     g_app.cfg.codec = pj_str(CODEC);
     g_app.cfg.duration_msec = DURATION * 1000;
+    g_app.cfg.silent = SILENT;
     g_app.cfg.log_file = LOG_FILE;
     g_app.cfg.tx_wav_in = WAV_REF;