diff options
| author | Benny Prijono <bennylp@teluu.com> | 2008-03-21 09:15:50 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2008-03-21 09:15:50 +0000 |
| commit | d5d8ed46c038edabde3d78da903c8a4479c6c0df (patch) | |
| tree | 8c87caa6db8c9e67d39743c571da642a527e4a10 /pjsip | |
| parent | e1f6e2c436a7ff660c91810a8e0baff70664cc96 (diff) | |
More ticket #61: (after rolling back previously buggy patch) Fixed bug in pjsua-lib with SRTP. If call is hold and resumed, SRTP transports will use itself as the underlying transport
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1884 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_media.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c index d50667ce..e105b08f 100644 --- a/pjsip/src/pjsua-lib/pjsua_media.c +++ b/pjsip/src/pjsua-lib/pjsua_media.c @@ -169,7 +169,7 @@ pj_status_t pjsua_media_subsys_init(const pjsua_media_config *cfg) /* Save additional conference bridge parameters for future * reference. */ - pjsua_var.mconf_cfg.channel_count = pjsua_var.media_cfg.channel_count; + pjsua_var.mconf_cfg.channel_count = 1; pjsua_var.mconf_cfg.bits_per_sample = 16; pjsua_var.mconf_cfg.samples_per_frame = pjsua_var.media_cfg.clock_rate * pjsua_var.mconf_cfg.channel_count * @@ -1834,10 +1834,8 @@ PJ_DEF(pj_status_t) pjsua_set_snd_dev( int capture_dev, fps = 1000 / pjsua_var.media_cfg.audio_frame_ptime; status = pjmedia_snd_port_create(pjsua_var.pool, capture_dev, playback_dev, - clock_rates[i], - pjsua_var.media_cfg.channel_count, - clock_rates[i]/fps * - pjsua_var.media_cfg.channel_count, + clock_rates[i], 1, + clock_rates[i]/fps, 16, 0, &pjsua_var.snd_port); if (status == PJ_SUCCESS) { |