diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2008-06-27 12:52:51 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2008-06-27 12:52:51 +0000 |
| commit | 41171475ee587b18522664d5db1cdb2b7604d0f4 (patch) | |
| tree | 2f5610bf23b4ea4d11448576ce210347629c13c3 | |
| parent | 22632cf74a2f3484976564cac440aefba408d052 (diff) | |
Fixed minor bug on ptime calculation on player creation; Updated pjsua-app info on ports ptime and default capture latency
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2074 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjsip-apps/src/pjsua/pjsua_app.c | 4 | ||||
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_media.c | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pjsip-apps/src/pjsua/pjsua_app.c b/pjsip-apps/src/pjsua/pjsua_app.c index 264036ec..96bdb250 100644 --- a/pjsip-apps/src/pjsua/pjsua_app.c +++ b/pjsip-apps/src/pjsua/pjsua_app.c @@ -233,7 +233,7 @@ static void usage(void) puts (" --ilbc-mode=MODE Set iLBC codec mode (20 or 30, default is 20)"); puts (" --capture-dev=id Audio capture device ID (default=-1)"); puts (" --playback-dev=id Audio playback device ID (default=-1)"); - puts (" --capture-lat=N Audio capture latency, in ms (default=10)"); + puts (" --capture-lat=N Audio capture latency, in ms (default=100)"); puts (" --playback-lat=N Audio playback latency, in ms (default=100)"); puts (" --snd-auto-close=N Auto close audio device when it is idle for N seconds."); puts (" Specify N=-1 (default) to disable this feature."); @@ -2647,7 +2647,7 @@ static void conf_list(void) printf("Port #%02d[%2dKHz/%dms/%d] %20.*s transmitting to: %s\n", info.slot_id, info.clock_rate/1000, - info.samples_per_frame * 1000 / info.clock_rate, + info.samples_per_frame*1000/info.channel_count/info.clock_rate, info.channel_count, (int)info.name.slen, info.name.ptr, diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c index 84b85101..919f0c35 100644 --- a/pjsip/src/pjsua-lib/pjsua_media.c +++ b/pjsip/src/pjsua-lib/pjsua_media.c @@ -1150,7 +1150,6 @@ pj_status_t pjsua_media_channel_update(pjsua_call_id call_id, } } else { - pjmedia_srtp_info srtp_info; pjmedia_transport_info tp_info; /* Start/restart media transport */ @@ -1543,10 +1542,12 @@ PJ_DEF(pj_status_t) pjsua_player_create( const pj_str_t *filename, return PJ_ENOMEM; } - status = pjmedia_wav_player_port_create(pool, path, - pjsua_var.mconf_cfg.samples_per_frame * - 1000 / pjsua_var.media_cfg.clock_rate, - options, 0, &port); + status = pjmedia_wav_player_port_create( + pool, path, + pjsua_var.mconf_cfg.samples_per_frame * + 1000 / pjsua_var.media_cfg.channel_count / + pjsua_var.media_cfg.clock_rate, + options, 0, &port); if (status != PJ_SUCCESS) { PJSUA_UNLOCK(); pjsua_perror(THIS_FILE, "Unable to open file for playback", status); |