diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2008-06-06 11:13:36 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2008-06-06 11:13:36 +0000 |
| commit | 98065b76fa28cd414b122f3623cbc9d93b898d42 (patch) | |
| tree | 16ddce9d21b41a20da69038777b72320c4e95ad8 /pjmedia | |
| parent | 5f1ff63b18fbf86eaa27798a35ae8979e3a01b11 (diff) | |
Cleaned up warnings of [u]char-[u]int conversions
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1984 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/src/pjmedia/rtcp_xr.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/pjmedia/src/pjmedia/rtcp_xr.c b/pjmedia/src/pjmedia/rtcp_xr.c index 6c49999c..8b109a28 100644 --- a/pjmedia/src/pjmedia/rtcp_xr.c +++ b/pjmedia/src/pjmedia/rtcp_xr.c @@ -351,12 +351,14 @@ PJ_DEF(void) pjmedia_rtcp_build_rtcp_xr( pjmedia_rtcp_xr_session *sess, r->rnd_trip_delay = pj_htons(sess->stat.rx.voip_mtc.rnd_trip_delay); r->end_sys_delay = pj_htons(sess->stat.rx.voip_mtc.end_sys_delay); /* signal & noise level encoded in two's complement form */ - r->signal_lvl = (sess->stat.rx.voip_mtc.signal_lvl >= 0)? - sess->stat.rx.voip_mtc.signal_lvl : - (sess->stat.rx.voip_mtc.signal_lvl + 256); - r->noise_lvl = (sess->stat.rx.voip_mtc.noise_lvl >= 0)? - sess->stat.rx.voip_mtc.noise_lvl : - (sess->stat.rx.voip_mtc.noise_lvl + 256); + r->signal_lvl = (pj_uint8_t) + ((sess->stat.rx.voip_mtc.signal_lvl >= 0)? + sess->stat.rx.voip_mtc.signal_lvl : + (sess->stat.rx.voip_mtc.signal_lvl + 256)); + r->noise_lvl = (pj_uint8_t) + ((sess->stat.rx.voip_mtc.noise_lvl >= 0)? + sess->stat.rx.voip_mtc.noise_lvl : + (sess->stat.rx.voip_mtc.noise_lvl + 256)); r->rerl = sess->stat.rx.voip_mtc.rerl; r->gmin = sess->stat.rx.voip_mtc.gmin; r->r_factor = sess->stat.rx.voip_mtc.r_factor; @@ -577,10 +579,14 @@ void pjmedia_rtcp_xr_rx_rtcp_xr( pjmedia_rtcp_xr_session *sess, sess->stat.tx.voip_mtc.end_sys_delay = pj_ntohs(rb_voip_mtc->end_sys_delay); /* signal & noise level encoded in two's complement form */ - sess->stat.tx.voip_mtc.signal_lvl = (rb_voip_mtc->signal_lvl > 127)? - (rb_voip_mtc->signal_lvl - 256) : rb_voip_mtc->signal_lvl; - sess->stat.tx.voip_mtc.noise_lvl = (rb_voip_mtc->noise_lvl > 127)? - (rb_voip_mtc->noise_lvl - 256) : rb_voip_mtc->noise_lvl; + sess->stat.tx.voip_mtc.signal_lvl = (pj_int8_t) + ((rb_voip_mtc->signal_lvl > 127)? + ((int)rb_voip_mtc->signal_lvl - 256) : + rb_voip_mtc->signal_lvl); + sess->stat.tx.voip_mtc.noise_lvl = (pj_int8_t) + ((rb_voip_mtc->noise_lvl > 127)? + ((int)rb_voip_mtc->noise_lvl - 256) : + rb_voip_mtc->noise_lvl); sess->stat.tx.voip_mtc.rerl = rb_voip_mtc->rerl; sess->stat.tx.voip_mtc.gmin = rb_voip_mtc->gmin; sess->stat.tx.voip_mtc.r_factor = rb_voip_mtc->r_factor; |