Changeset 4112:215f5e16823a in roaraudio

Timestamp:

08/06/10 16:46:06 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

some fist cleanup

File:

• libroardsp/convert.c (modified) (3 diffs)

libroardsp/convert.c

@@ -1229 +1229 @@
 
    if ( (int)pos_in == 0 ) {
-    y[0] = ip[c];
-    y[1] = ip[channels + c];
+    y[0] = ip[0 * channels + c];
+    y[1] = ip[1 * channels + c];
     y[2] = ip[2 * channels + c];
     x_val = pos_in;
@@ -1237 +1237 @@
      * We will assume this value, by linearly extrapolating the two preceding values. From causual testing, this is not audible. */
     y[0] = ip[((int)pos_in - 1) * channels + c];
-    y[1] = ip[(int)pos_in * channels + c];
+    y[1] = ip[((int)pos_in    ) * channels + c];
     y[2] = y[1] * 2.0 - y[0];
-    /* We have to clip this value. */
-    if ( (int32_t)y[2] > 0x7FFE )
-     y[2] = 0x7FFE;
-    else if ( (int32_t)y[2] < -0x7FFE )
-     y[2] = -0x7FFE;
-
     x_val = pos_in - (int)pos_in + 1.0;
    } else {
     y[0] = ip[((int)pos_in - 1) * channels + c];
-    y[1] = ip[(int)pos_in * channels + c];
+    y[1] = ip[((int)pos_in    ) * channels + c];
     y[2] = ip[((int)pos_in + 1) * channels + c];
     x_val = pos_in - (int)pos_in + 1.0;
@@ -1257 +1251 @@
    int32_t temp = (int32_t)(poly[2]*x_val*x_val + poly[1]*x_val + poly[0] + 0.5);
    /* temp could be out of bounds, so need to check this */
-   if (temp > 0x7FFE )
-    out[x * channels + c] = 0x7FFE;
-   else if (temp < -0x7FFE)
+   if (temp > 0x7FFE ) {
+    out[x * channels + c] =  0x7FFE;
+   } else if (temp < -0x7FFE) {
     out[x * channels + c] = -0x7FFE;
-   else
+   } else {
     out[x * channels + c] = (int16_t)temp;
+   }
   }
  }