Changeset 2836 for pjproject/trunk/pjsip-apps/src/pjsystest/systest.c

Timestamp:

Jul 16, 2009 11:37:15 AM (15 years ago)

Author:

bennylp

Message:

More ticket #920: fix latency calculation not able to calculate latency higher than 500ms and added copyright info in source files

File:

• pjproject/trunk/pjsip-apps/src/pjsystest/systest.c (modified) (6 diffs)

pjproject/trunk/pjsip-apps/src/pjsystest/systest.c

@@ +1 @@
+/* $Id$ */
+/* 
+ * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ */
 #include "systest.h"
 #include "gui.h"
@@ -678 +696 @@
 
         /* Advance next loop */
-        start_pos += wav->info.clock_rate;
+        if (start_pos == 0) {
+            start_pos = max_signal_pos + wav->info.clock_rate * 9 / 10;
+        } else {
+            start_pos += wav->info.clock_rate;
+        }
     }
 
@@ -743 +765 @@
     /* Setup the test */
     //status = pjsua_conf_connect(0, 0);
+    status = pjsua_conf_connect(play_slot, 0);
     status = pjsua_conf_connect(0, rec_slot);
-    status = pjsua_conf_connect(play_slot, 0);
     status = pjsua_conf_connect(play_slot, rec_slot);
     
@@ -754 +776 @@
     //status = pjsua_conf_disconnect(0, 0);
     status = pjsua_conf_disconnect(play_slot, rec_slot);
+    status = pjsua_conf_disconnect(0, rec_slot);
     status = pjsua_conf_disconnect(play_slot, 0);
-    status = pjsua_conf_disconnect(0, rec_slot);
 
     pjsua_recorder_destroy(rec_id);
@@ -774 +796 @@
         goto on_return;
 
-    status = pjsua_conf_connect(pjsua_player_get_conf_port(play_id), 0);
+    play_slot = pjsua_player_get_conf_port(play_id);
+
+    status = pjsua_conf_connect(play_slot, 0);
     if (status != PJ_SUCCESS)
         goto on_return;
@@ -782 +806 @@
                      "Can you hear the 'tock' echo?",
                      WITH_YESNO);
+
+    pjsua_player_destroy(play_id);
+    play_id = PJSUA_INVALID_ID;
+
     if (key != KEY_YES)
         goto on_return;