Changeset 3085 for pjproject/trunk/pjmedia/src/pjmedia/conference.c

Timestamp:

Feb 1, 2010 11:23:54 AM (14 years ago)

Author:

nanang

Message:

Ticket #766:

• Applied patch provided by Bram Kuijvenhoven related to truncation issue in floating-point to integer type-casts in pjmedia components.
• Original patch proposal and description can be found here: ​http://lists.pjsip.org/pipermail/pjsip_lists.pjsip.org/2010-January/010258.html.

File:

• pjproject/trunk/pjmedia/src/pjmedia/conference.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia/conference.c

@@ -373 +373 @@
         //                                 conf->samples_per_frame * 
         //                                 conf_port->clock_rate * 1.0 /
-        //                                 conf->clock_rate);
+        //                                 conf->clock_rate + 0.5);
         conf_port->rx_buf_cap = conf_port->clock_rate * buff_ptime / 1000;
         if (conf_port->channel_count > conf->channel_count)
@@ -1438 +1438 @@
 
         samples_req = (unsigned) (count * 1.0 * 
-                      cport->clock_rate / conf->clock_rate);
+                      cport->clock_rate / conf->clock_rate + 0.5);
 
         while (cport->rx_buf_count < samples_req) {
@@ -1510 +1510 @@
 
             src_count = (unsigned)(count * 1.0 * cport->clock_rate / 
-                                   conf->clock_rate);
+                                   conf->clock_rate + 0.5);
             cport->rx_buf_count -= src_count;
             if (cport->rx_buf_count) {
@@ -1694 +1694 @@
                               cport->tx_buf + cport->tx_buf_count );
         dst_count = (unsigned)(conf->samples_per_frame * 1.0 *
-                               cport->clock_rate / conf->clock_rate);
+                               cport->clock_rate / conf->clock_rate + 0.5);
     } else {
         /* Same clock rate.