Changeset 3085 for pjproject/trunk

Timestamp:

Feb 1, 2010 11:23:54 AM (15 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.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/conference.c (modified) (4 diffs)
• pjmedia/src/pjmedia/resample_resample.c (modified) (2 diffs)
• third_party/resample/src/resamplesubs.c (modified) (3 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.

pjproject/trunk/pjmedia/src/pjmedia/resample_resample.c

@@ -124 +124 @@
         /* Allocate temporary output buffer */
         size = (unsigned) (resample->frame_size * sizeof(pj_int16_t) * 
-                           resample->factor / channel_count);
+                           resample->factor / channel_count + 0.5);
         resample->tmp_buffer = (pj_int16_t*) pj_pool_alloc(pool, size);
         PJ_ASSERT_RETURN(resample->tmp_buffer, PJ_ENOMEM);
@@ -246 +246 @@
         
             mono_frm_sz_in  = resample->frame_size / resample->channel_cnt;
-            mono_frm_sz_out = (unsigned)(mono_frm_sz_in * resample->factor);
+            mono_frm_sz_out = (unsigned)(mono_frm_sz_in * resample->factor + 0.5);
 
             /* Deinterleave input */

pjproject/trunk/third_party/resample/src/resamplesubs.c

@@ -119 +119 @@
     
     Ystart = Y;
-    Yend = Ystart + (unsigned)(nx * pFactor);
+    Yend = Ystart + (unsigned)(nx * pFactor + 0.5);
     endTime = time + (1<<Np)*(RES_WORD)nx;
-    while (time < endTime)
+    
+    // Integer round down in dtb calculation may cause (endTime % dtb > 0), 
+    // so it may cause resample write pass the output buffer (Y >= Yend).
+    // while (time < endTime)
+    while (Y < Yend)
     {
         iconst = (time) & Pmask;
@@ -258 +262 @@
     
     Ystart = Y;
-    Yend = Ystart + (unsigned)(nx * pFactor);
+    Yend = Ystart + (unsigned)(nx * pFactor + 0.5);
     endTime = time + (1<<Np)*(RES_WORD)nx;
 
@@ -306 +310 @@
     
     Ystart = Y;
-    Yend = Ystart + (unsigned)(nx * pFactor);
+    Yend = Ystart + (unsigned)(nx * pFactor + 0.5);
     endTime = time + (1<<Np)*(RES_WORD)nx;