diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2012-04-12 13:41:50 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2012-04-12 13:41:50 +0000 |
commit | 64d1bed1542041370f054e693dcb131dac889618 (patch) | |
tree | 0f8cbd8452cb5bc88a5e9f07be9772ec7d2ff87d /pjsip/src/pjsua-lib | |
parent | e3cf311ea66955482cc6c8197c685456aa7f41cc (diff) |
Re #1476: Initial version of send rate control in video stream, added simple blocking method (block application thread to make send delay when delay is needed).
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4043 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsua-lib')
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_core.c | 1 | ||||
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_vid.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c index 89f2b13d..aeb85ebf 100644 --- a/pjsip/src/pjsua-lib/pjsua_core.c +++ b/pjsip/src/pjsua-lib/pjsua_core.c @@ -218,6 +218,7 @@ PJ_DEF(void) pjsua_acc_config_default(pjsua_acc_config *cfg) cfg->ka_data = pj_str("\r\n"); cfg->vid_cap_dev = PJMEDIA_VID_DEFAULT_CAPTURE_DEV; cfg->vid_rend_dev = PJMEDIA_VID_DEFAULT_RENDER_DEV; + pjmedia_vid_stream_rc_config_default(&cfg->vid_stream_rc_cfg); pjsua_transport_config_default(&cfg->rtp_cfg); cfg->use_srtp = pjsua_var.ua_cfg.use_srtp; cfg->srtp_secure_signaling = pjsua_var.ua_cfg.srtp_secure_signaling; diff --git a/pjsip/src/pjsua-lib/pjsua_vid.c b/pjsip/src/pjsua-lib/pjsua_vid.c index 24f0919f..b8ece7a8 100644 --- a/pjsip/src/pjsua-lib/pjsua_vid.c +++ b/pjsip/src/pjsua-lib/pjsua_vid.c @@ -747,6 +747,9 @@ pj_status_t pjsua_vid_channel_update(pjsua_call_media *call_med, si->rtp_seq = call_med->rtp_tx_seq; si->rtp_seq_ts_set = call_med->rtp_tx_seq_ts_set; + /* Set rate control config from account setting */ + si->rc_cfg = acc->cfg.vid_stream_rc_cfg; + #if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0 /* Enable/disable stream keep-alive and NAT hole punch. */ si->use_ka = pjsua_var.acc[call->acc_id].cfg.use_stream_ka; |