Changeset 3085 for pjproject/trunk/third_party/resample/src/resamplesubs.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/third_party/resample/src/resamplesubs.c (modified) (3 diffs)

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;