Changeset 1684

Timestamp:

Jan 12, 2008 2:16:30 PM (17 years ago)

Author:

bennylp

Message:

Fixed overflow bug in length calculation, added force option, and added trailing silence in the output file

File:

• pjproject/trunk/pjsip-apps/src/samples/mix.c (modified) (9 diffs)

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

@@ -50 +50 @@
  " options:\n"
  "    -c N          Set clock rate to N Hz (default 16000)\n"
+ "    -f            Force write (overwrite output without warning\n"
 ;
 
 #define MAX_WAV     16
 #define PTIME       20
+#define APPEND      1000
 
 struct wav_input
@@ -76 +78 @@
     pjmedia_endpt *med_ept;
     unsigned clock_rate = 16000;
-    int c;
+    int c, force=0;
     const char *out_fname;
     pjmedia_conf *conf;
@@ -93 +95 @@
 
     /* Parse arguments */
-    while ((c=pj_getopt(argc, argv, "c:")) != -1) {
+    while ((c=pj_getopt(argc, argv, "c:f")) != -1) {
         switch (c) {
         case 'c':
@@ -102 +104 @@
             }
             break;
+        case 'f':
+            force = 1;
+            break;
         }
     }
@@ -112 +117 @@
 
     out_fname = argv[pj_optind++];
-    if (pj_file_exists(out_fname)) {
+    if (force==0 && pj_file_exists(out_fname)) {
         char in[8];
 
@@ -167 +172 @@
                                               &wav_input[i].port) );
         len = pjmedia_wav_player_get_len(wav_input[i].port);
-        len = len * clock_rate / wav_input[i].port->info.clock_rate;
+        len = (pj_ssize_t)(len * 1.0 * clock_rate / 
+                            wav_input[i].port->info.clock_rate);
         if (len > longest)
             longest = len;
@@ -179 +185 @@
     /* Loop reading frame from the bridge and write it to WAV */
     processed = 0;
-    while (processed < longest) {
+    while (processed < longest + clock_rate * APPEND * 2 / 1000) {
         pj_int16_t framebuf[PTIME * 48000 / 1000];
         pjmedia_port *cp = pjmedia_conf_get_master_port(conf);
@@ -188 +194 @@
         pj_assert(frame.size <= sizeof(framebuf));
         
-        status = pjmedia_port_get_frame(cp, &frame);
-        if (status != PJ_SUCCESS)
-            break;
+        CHECK( pjmedia_port_get_frame(cp, &frame) );
 
         CHECK( pjmedia_port_put_frame(wavout, &frame));
@@ -196 +200 @@
         processed += frame.size;
     }
+
+    PJ_LOG(3,(THIS_FILE, "Done. Output duration: %d.%03d",
+              (processed >> 2)/clock_rate,
+              ((processed >> 2)*1000/clock_rate) % 1000));
 
     /* Shutdown everything */