Changeset 2836


Ignore:
Timestamp:
Jul 16, 2009 11:37:15 AM (11 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

Location:
pjproject/trunk/pjsip-apps/src/pjsystest
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip-apps/src/pjsystest/gui.h

    r2835 r2836  
     1/* $Id$ */ 
     2/*  
     3 * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) 
     4 * 
     5 * This program is free software; you can redistribute it and/or modify 
     6 * it under the terms of the GNU General Public License as published by 
     7 * the Free Software Foundation; either version 2 of the License, or 
     8 * (at your option) any later version. 
     9 * 
     10 * This program is distributed in the hope that it will be useful, 
     11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
     12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     13 * GNU General Public License for more details. 
     14 * 
     15 * You should have received a copy of the GNU General Public License 
     16 * along with this program; if not, write to the Free Software 
     17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
     18 */ 
    119#ifndef __GUI_H__ 
    220#define __GUI_H__ 
     
    3452 
    3553/* Initialize GUI with the menus and stuff */ 
    36 PJ_DECL(pj_status_t) gui_init(gui_menu *menu); 
     54pj_status_t gui_init(gui_menu *menu); 
    3755 
    3856/* Run GUI main loop */ 
    39 PJ_DECL(pj_status_t) gui_start(gui_menu *menu); 
     57pj_status_t gui_start(gui_menu *menu); 
    4058 
    4159/* Signal GUI mainloop to stop */ 
    42 PJ_DECL(void) gui_destroy(void); 
     60void gui_destroy(void); 
    4361 
    4462/* AUX: display messagebox */ 
    45 PJ_DECL(enum gui_key) gui_msgbox(const char *title, const char *message, enum gui_flag flag); 
     63enum gui_key gui_msgbox(const char *title, const char *message, enum gui_flag flag); 
    4664 
    4765/* AUX: sleep */ 
    48 PJ_DECL(void) gui_sleep(unsigned sec); 
     66void gui_sleep(unsigned sec); 
    4967 
    5068 
  • pjproject/trunk/pjsip-apps/src/pjsystest/main_console.c

    r2835 r2836  
     1/* $Id$ */ 
     2/*  
     3 * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) 
     4 * 
     5 * This program is free software; you can redistribute it and/or modify 
     6 * it under the terms of the GNU General Public License as published by 
     7 * the Free Software Foundation; either version 2 of the License, or 
     8 * (at your option) any later version. 
     9 * 
     10 * This program is distributed in the hope that it will be useful, 
     11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
     12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     13 * GNU General Public License for more details. 
     14 * 
     15 * You should have received a copy of the GNU General Public License 
     16 * along with this program; if not, write to the Free Software 
     17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
     18 */ 
    119#include "systest.h" 
    220#include "gui.h" 
     
    624static pj_bool_t console_quit; 
    725 
    8 PJ_DEF(enum gui_key) gui_msgbox(const char *title, const char *message, enum gui_flag flag) 
     26enum gui_key gui_msgbox(const char *title, const char *message, enum gui_flag flag) 
    927{ 
    1028    puts(title); 
     
    3149} 
    3250 
    33 PJ_DEF(pj_status_t) gui_init(gui_menu *menu) 
     51pj_status_t gui_init(gui_menu *menu) 
    3452{ 
    3553    PJ_UNUSED_ARG(menu); 
     
    5876} 
    5977 
    60 PJ_DEF(pj_status_t) gui_start(gui_menu *menu) 
     78pj_status_t gui_start(gui_menu *menu) 
    6179{ 
    6280    while (!console_quit) { 
     
    104122} 
    105123 
    106 PJ_DEF(void) gui_destroy(void) 
     124void gui_destroy(void) 
    107125{ 
    108126    console_quit = PJ_TRUE; 
    109127} 
    110128 
    111 PJ_DEF(void) gui_sleep(unsigned sec) 
     129void gui_sleep(unsigned sec) 
    112130{ 
    113131    pj_thread_sleep(sec * 1000); 
  • pjproject/trunk/pjsip-apps/src/pjsystest/main_wm.c

    r2835 r2836  
     1/* $Id$ */ 
     2/*  
     3 * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) 
     4 * 
     5 * This program is free software; you can redistribute it and/or modify 
     6 * it under the terms of the GNU General Public License as published by 
     7 * the Free Software Foundation; either version 2 of the License, or 
     8 * (at your option) any later version. 
     9 * 
     10 * This program is distributed in the hope that it will be useful, 
     11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
     12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     13 * GNU General Public License for more details. 
     14 * 
     15 * You should have received a copy of the GNU General Public License 
     16 * along with this program; if not, write to the Free Software 
     17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
     18 */ 
    119#include "gui.h" 
    220#include "systest.h" 
     
    1129 
    1230#define MAINWINDOWCLASS TEXT("SysTestDlg") 
    13 #define MAINWINDOWTITLE TEXT("SysTest") 
     31#define MAINWINDOWTITLE TEXT("PJSYSTEST") 
    1432 
    1533typedef struct menu_handler_t { 
     
    188206/* === API === */ 
    189207 
    190 PJ_DEF(pj_status_t) gui_init(gui_menu *menu) 
     208pj_status_t gui_init(gui_menu *menu) 
    191209{ 
    192210    WNDCLASS wc; 
     
    194212    RECT r; 
    195213    DWORD dwStyle; 
    196     unsigned log_decor; 
    197214 
    198215    pj_status_t status  = PJ_SUCCESS; 
     
    335352} 
    336353 
    337 PJ_DEF(enum gui_key) gui_msgbox(const char *title, const char *message, enum gui_flag flag) 
     354enum gui_key gui_msgbox(const char *title, const char *message, enum gui_flag flag) 
    338355{ 
    339356    wchar_t buf_title[64]; 
     
    371388} 
    372389 
    373 PJ_DEF(void) gui_sleep(unsigned sec) 
     390void gui_sleep(unsigned sec) 
    374391{ 
    375392    pj_thread_sleep(sec * 1000); 
    376393} 
    377394 
    378 PJ_DEF(pj_status_t) gui_start(gui_menu *menu) 
     395pj_status_t gui_start(gui_menu *menu) 
    379396{ 
    380397    MSG msg; 
     
    390407} 
    391408 
    392 PJ_DEF(void) gui_destroy(void) 
     409void gui_destroy(void) 
    393410{ 
    394411    if (g_hWndMain) { 
  • pjproject/trunk/pjsip-apps/src/pjsystest/systest.c

    r2835 r2836  
     1/* $Id$ */ 
     2/*  
     3 * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) 
     4 * 
     5 * This program is free software; you can redistribute it and/or modify 
     6 * it under the terms of the GNU General Public License as published by 
     7 * the Free Software Foundation; either version 2 of the License, or 
     8 * (at your option) any later version. 
     9 * 
     10 * This program is distributed in the hope that it will be useful, 
     11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
     12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     13 * GNU General Public License for more details. 
     14 * 
     15 * You should have received a copy of the GNU General Public License 
     16 * along with this program; if not, write to the Free Software 
     17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
     18 */ 
    119#include "systest.h" 
    220#include "gui.h" 
     
    678696 
    679697        /* Advance next loop */ 
    680         start_pos += wav->info.clock_rate; 
     698        if (start_pos == 0) { 
     699            start_pos = max_signal_pos + wav->info.clock_rate * 9 / 10; 
     700        } else { 
     701            start_pos += wav->info.clock_rate; 
     702        } 
    681703    } 
    682704 
     
    743765    /* Setup the test */ 
    744766    //status = pjsua_conf_connect(0, 0); 
     767    status = pjsua_conf_connect(play_slot, 0); 
    745768    status = pjsua_conf_connect(0, rec_slot); 
    746     status = pjsua_conf_connect(play_slot, 0); 
    747769    status = pjsua_conf_connect(play_slot, rec_slot); 
    748770     
     
    754776    //status = pjsua_conf_disconnect(0, 0); 
    755777    status = pjsua_conf_disconnect(play_slot, rec_slot); 
     778    status = pjsua_conf_disconnect(0, rec_slot); 
    756779    status = pjsua_conf_disconnect(play_slot, 0); 
    757     status = pjsua_conf_disconnect(0, rec_slot); 
    758780 
    759781    pjsua_recorder_destroy(rec_id); 
     
    774796        goto on_return; 
    775797 
    776     status = pjsua_conf_connect(pjsua_player_get_conf_port(play_id), 0); 
     798    play_slot = pjsua_player_get_conf_port(play_id); 
     799 
     800    status = pjsua_conf_connect(play_slot, 0); 
    777801    if (status != PJ_SUCCESS) 
    778802        goto on_return; 
     
    782806                     "Can you hear the 'tock' echo?", 
    783807                     WITH_YESNO); 
     808 
     809    pjsua_player_destroy(play_id); 
     810    play_id = PJSUA_INVALID_ID; 
     811 
    784812    if (key != KEY_YES) 
    785813        goto on_return; 
  • pjproject/trunk/pjsip-apps/src/pjsystest/systest.h

    r2835 r2836  
     1/* $Id$ */ 
     2/*  
     3 * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) 
     4 * 
     5 * This program is free software; you can redistribute it and/or modify 
     6 * it under the terms of the GNU General Public License as published by 
     7 * the Free Software Foundation; either version 2 of the License, or 
     8 * (at your option) any later version. 
     9 * 
     10 * This program is distributed in the hope that it will be useful, 
     11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
     12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     13 * GNU General Public License for more details. 
     14 * 
     15 * You should have received a copy of the GNU General Public License 
     16 * along with this program; if not, write to the Free Software 
     17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
     18 */ 
    119#ifndef __SYSTEST_H__ 
    220#define __SYSTEST_H__ 
     
    3351#endif 
    3452 
     53/* API, to be called by main() */ 
    3554int         systest_init(void); 
    3655int         systest_run(void); 
     
    3857void        systest_deinit(void); 
    3958 
     59/* Test item is used to record the test result */ 
    4060typedef struct test_item_t 
    4161{ 
Note: See TracChangeset for help on using the changeset viewer.