diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2013-01-29 08:15:02 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2013-01-29 08:15:02 +0000 |
| commit | 7c9af68e60b48c4761b033bf1824872e2c59b907 (patch) | |
| tree | 806d2ae80b41f10d3565b6c6cb6f8bea5e1ca4b6 | |
| parent | 064af246091c9d6475dcdd742b0abf0c3d1a07d8 (diff) | |
Re #1568: (PJSIP 2.x) Apply pjsua_media_config before detecting media change and fixed encoding name string duplication.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4336 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/src/pjmedia/stream.c | 1 | ||||
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_aud.c | 14 | ||||
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_media.c | 13 |
3 files changed, 14 insertions, 14 deletions
diff --git a/pjmedia/src/pjmedia/stream.c b/pjmedia/src/pjmedia/stream.c index 2414cf47..76f53890 100644 --- a/pjmedia/src/pjmedia/stream.c +++ b/pjmedia/src/pjmedia/stream.c @@ -2003,6 +2003,7 @@ PJ_DEF(pj_status_t) pjmedia_stream_create( pjmedia_endpt *endpt, stream->own_pool = own_pool; pj_memcpy(&stream->si, info, sizeof(*info)); stream->si.param = pjmedia_codec_param_clone(pool, info->param); + pj_strdup(pool, &stream->si.fmt.encoding_name, &info->fmt.encoding_name); /* Init stream/port name */ name.ptr = (char*) pj_pool_alloc(pool, M); diff --git a/pjsip/src/pjsua-lib/pjsua_aud.c b/pjsip/src/pjsua-lib/pjsua_aud.c index 480aea41..9150af49 100644 --- a/pjsip/src/pjsua-lib/pjsua_aud.c +++ b/pjsip/src/pjsua-lib/pjsua_aud.c @@ -589,20 +589,6 @@ pj_status_t pjsua_aud_channel_update(pjsua_call_media *call_med, /* Check if no media is active */ if (si->dir != PJMEDIA_DIR_NONE) { - /* Override ptime, if this option is specified. */ - if (pjsua_var.media_cfg.ptime != 0) { - si->param->setting.frm_per_pkt = (pj_uint8_t) - (pjsua_var.media_cfg.ptime / si->param->info.frm_ptime); - if (si->param->setting.frm_per_pkt == 0) - si->param->setting.frm_per_pkt = 1; - } - - /* Disable VAD, if this option is specified. */ - if (pjsua_var.media_cfg.no_vad) { - si->param->setting.vad = 0; - } - - /* Optionally, application may modify other stream settings here * (such as jitter buffer parameters, codec ptime, etc.) */ diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c index f795a5eb..b2bf2989 100644 --- a/pjsip/src/pjsua-lib/pjsua_media.c +++ b/pjsip/src/pjsua-lib/pjsua_media.c @@ -2566,6 +2566,19 @@ pj_status_t pjsua_media_channel_update(pjsua_call_id call_id, continue; } + /* Override ptime, if this option is specified. */ + if (pjsua_var.media_cfg.ptime != 0) { + si->param->setting.frm_per_pkt = (pj_uint8_t) + (pjsua_var.media_cfg.ptime / si->param->info.frm_ptime); + if (si->param->setting.frm_per_pkt == 0) + si->param->setting.frm_per_pkt = 1; + } + + /* Disable VAD, if this option is specified. */ + if (pjsua_var.media_cfg.no_vad) { + si->param->setting.vad = 0; + } + /* Check if this media is changed */ stream_info.type = PJMEDIA_TYPE_AUDIO; stream_info.info.aud = the_si; |