Changeset 1984 for pjproject/trunk/pjmedia/src/pjmedia/rtcp_xr.c

Timestamp:

Jun 6, 2008 11:13:36 AM (16 years ago)

Author:

nanang

Message:

Cleaned up warnings of [u]char-[u]int conversions

File:

• pjproject/trunk/pjmedia/src/pjmedia/rtcp_xr.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/rtcp_xr.c

@@ -352 +352 @@
         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;
@@ -578 +580 @@
                                         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;