diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2009-02-24 11:29:40 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2009-02-24 11:29:40 +0000 |
| commit | 33e9dc9f2613a86b0fcfea7d669d1b83934d45fd (patch) | |
| tree | e9ae7ecef765308c63318a3eddf3efd84ad16a4a /pjmedia | |
| parent | 5b3605af27264b54156feb106402f132986c1558 (diff) | |
Ticket #730: Fixed stream to convert units of jitter buffer params, from msecs (in stream info) to frame counts (for jitter buffer).
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2477 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/src/pjmedia/stream.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pjmedia/src/pjmedia/stream.c b/pjmedia/src/pjmedia/stream.c index b7869354..f1d01c27 100644 --- a/pjmedia/src/pjmedia/stream.c +++ b/pjmedia/src/pjmedia/stream.c @@ -1659,25 +1659,26 @@ PJ_DEF(pj_status_t) pjmedia_stream_create( pjmedia_endpt *endpt, #endif /* Init jitter buffer parameters: */ - if (info->jb_max > 0) - jb_max = info->jb_max; + if (info->jb_max >= stream->codec_param.info.frm_ptime) + jb_max = (info->jb_max + stream->codec_param.info.frm_ptime - 1) / + stream->codec_param.info.frm_ptime; else jb_max = 500 / stream->codec_param.info.frm_ptime; - if (info->jb_min_pre > 0) - jb_min_pre = info->jb_min_pre; + if (info->jb_min_pre >= stream->codec_param.info.frm_ptime) + jb_min_pre = info->jb_min_pre / stream->codec_param.info.frm_ptime; else //jb_min_pre = 60 / stream->codec_param.info.frm_ptime; jb_min_pre = 1; - if (info->jb_max_pre > 0) - jb_max_pre = info->jb_max_pre; + if (info->jb_max_pre >= stream->codec_param.info.frm_ptime) + jb_max_pre = info->jb_max_pre / stream->codec_param.info.frm_ptime; else //jb_max_pre = 240 / stream->codec_param.info.frm_ptime; jb_max_pre = jb_max * 4 / 5; - if (info->jb_init > 0) - jb_init = info->jb_init; + if (info->jb_init >= stream->codec_param.info.frm_ptime) + jb_init = info->jb_init / stream->codec_param.info.frm_ptime; else //jb_init = (jb_min_pre + jb_max_pre) / 2; jb_init = 0; |