Changeset 156 for libmpc/branches/r2d/libmpcenc

Timestamp:

12/09/06 22:45:39 (18 years ago)

Author:

r2d

Message:

• removed slow builtin_ functions

File:

• libmpc/branches/r2d/libmpcenc/quant.c (modified) (7 diffs)

libmpc/branches/r2d/libmpcenc/quant.c

@@ -22 +22 @@
 #include "libmpcenc.h"
 #include <mpc/minimax.h>
+#include <mpc/mpcmath.h>
 
 /* V A R I A B L E S */
@@ -158 +159 @@
 {
     int    k;
-    float  fac    = A [res];
-    float  invfac = C [res];
-    float  Signal = 1.e-30f;
-    float  Fehler = 1.e-30f;
-    float  tmp ;
-    float  tmp2;
+    const float  fac    = A [res];
+        const float  invfac = C [res];
+    float  signal = 1.e-30f;
+    float  error = 1.e-30f;
+    float  sig, err;
 
     // Summation of the absolute power and the quadratic error
     for ( k = 0; k < 36; k++ ) {
-        tmp2    = input[k] * NoiseInjectionCompensation1D [res];
-                tmp  = __builtin_nearbyintf(tmp2 * fac) * invfac - tmp2;
-
-        Fehler += tmp * tmp;
-        Signal += tmp2 * tmp2;
+        err = input[k] * NoiseInjectionCompensation1D [res];
+                sig = mpc_nearbyintf(err * fac) * invfac - err;
+
+        error += sig * sig;
+        signal += err * err;
     }
 
     // Utilization of SNRcomp only if SNR > 1 !!!
-    return Signal > Fehler  ?  Fehler / (SNRcomp * Signal)  :  Fehler / Signal;
+    return signal > error  ?  error / (SNRcomp * signal)  :  error / signal;
 }
 
@@ -185 +185 @@
     float  fac    = A [res];
     float  invfac = C [res];
-    float  Signal;
-    float  Fehler;
-    float  ret ;
-    float  tmp ;
-    float  tmp2;
+        float  signal, error, ret, sig, err;
 
     // Summation of the absolute power and the quadratic error
-    k = 0;
-    Signal = Fehler = 1.e-30f;
+        k = 0;
+        signal = error = 1.e-30f;
     for ( ; k < 12; k++ ) {
-        tmp2    = input[k] * NoiseInjectionCompensation1D [res];
-                tmp  = __builtin_nearbyintf(tmp2 * fac) * invfac - tmp2;
-
-        Fehler += tmp * tmp;
-        Signal += tmp2 * tmp2;
-    }
-    tmp = Signal > Fehler  ?  Fehler / (SNRcomp * Signal)  :  Fehler / Signal;
-    ret = tmp;
-    Signal = Fehler = 1.e-30f;
+        err = input[k] * NoiseInjectionCompensation1D [res];
+                sig = mpc_nearbyintf(err * fac) * invfac - err;
+
+        error += sig * sig;
+        signal += err * err;
+    }
+    sig = signal > error  ?  error / (SNRcomp * signal)  :  error / signal;
+    ret = sig;
+    signal = error = 1.e-30f;
     for ( ; k < 24; k++ ) {
-        tmp2    = input[k] * NoiseInjectionCompensation1D [res];
-                tmp  = __builtin_nearbyintf(tmp2 * fac) * invfac - tmp2;
-
-        Fehler += tmp * tmp;
-        Signal += tmp2 * tmp2;
-    }
-    tmp = Signal > Fehler  ?  Fehler / (SNRcomp * Signal)  :  Fehler / Signal;
-    if ( tmp > ret ) ret = tmp;
-    //ret += tmp;
-    Signal = Fehler = 1.e-30f;
+        err = input[k] * NoiseInjectionCompensation1D [res];
+                sig = mpc_nearbyintf(err * fac) * invfac - err;
+
+        error += sig * sig;
+        signal += err * err;
+    }
+    sig = signal > error  ?  error / (SNRcomp * signal)  :  error / signal;
+        ret = maxf(ret, sig);
+
+    signal = error = 1.e-30f;
     for ( ; k < 36; k++ ) {
-        tmp2    = input[k] * NoiseInjectionCompensation1D [res];
-                tmp  = __builtin_nearbyintf(tmp2 * fac) * invfac - tmp2;
-
-        Fehler += tmp * tmp;
-        Signal += tmp2 * tmp2;
-    }
-    tmp = Signal > Fehler  ?  Fehler / (SNRcomp * Signal)  :  Fehler / Signal;
-    if ( tmp > ret ) ret = tmp;
-    //ret += tmp;
-    //ret *= 0.33333333333f;
+        err = input[k] * NoiseInjectionCompensation1D [res];
+                sig = mpc_nearbyintf(err * fac) * invfac - err;
+
+        error += sig * sig;
+        signal += err * err;
+    }
+    sig = signal > error  ?  error / (SNRcomp * signal)  :  error / signal;
+        ret = maxf(ret, sig);
 
     return ret;
@@ -235 +229 @@
 QuantizeSubband ( unsigned int* qu_output, const float* input, const int res, float* errors, const int maxNsOrder )
 {
-    int    n;
+        int    n, quant;
     int    offset  = D [res];
     float  mult    = A [res] * NoiseInjectionCompensation1D [res];
     float  invmult = C [res];
-    int    quant;
     float  signal;
 
-        for ( n = 0; n < 36 - maxNsOrder; n++, input++, qu_output++ ) {
-                quant = (unsigned int)(__builtin_lrintf(*input * mult) + offset);
+        for ( n = 0; n < 36 - maxNsOrder; n++) {
+                quant = (unsigned int)(mpc_lrintf(input[n] * mult) + offset);
 
         // limitation to 0...2D
-        if ((unsigned int)quant > (unsigned int)2*offset ) {
-            quant = mini ( quant, 2*offset );
-            quant = maxi ( quant,        0 );
+        if ((unsigned int)quant > (unsigned int)offset * 2 ) {
+            quant = mini ( quant, offset * 2 );
+            quant = maxi ( quant, 0 );
         }
-        *qu_output  = quant;
-    }
-
-    for ( ; n < 36; n++, input++, qu_output++ ) {
-        signal = *input * mult;
-                quant = (unsigned int)(__builtin_lrintf(signal) + offset);
+        qu_output[n] = quant;
+    }
+
+    for ( ; n < 36; n++) {
+        signal = input[n] * mult;
+                quant = (unsigned int)(mpc_lrintf(signal) + offset);
 
         // calculate the current error and save it for error refeeding
@@ -261 +254 @@
 
         // limitation to 0...2D
-        if ((unsigned int)quant > (unsigned int)2*offset ) {
-            quant = mini ( quant, 2*offset );
-            quant = maxi ( quant,        0 );
+        if ((unsigned int)quant > (unsigned int)offset * 2 ) {
+            quant = mini ( quant, offset * 2 );
+            quant = maxi ( quant, 0 );
         }
-        *qu_output  = quant;
+        qu_output[n] = quant;
     }
 }
@@ -274 +267 @@
 QuantizeSubbandWithNoiseShaping ( unsigned int* qu_output, const float* input, const int res, float* errors, const float* FIR )
 {
-#define E(x) *((int*)errors+(x))
-
     float  signal;
     float  mult    = A [res];
     float  invmult = C [res];
     int    offset  = D [res];
-    int    n;
-    int    quant;
-
-    E(0) = E(1) = E(2) = E(3) = E(4) = E(5) = 0;       // arghh, it produces pops on each frame boundary!
-
-    for ( n = 0; n < 36; n++, input++, qu_output++ ) {
-        signal = *input * NoiseInjectionCompensation1D [res] - (FIR[5]*errors[n+0] + FIR[4]*errors[n+1] + FIR[3]*errors[n+2] + FIR[2]*errors[n+3] + FIR[1]*errors[n+4] + FIR[0]*errors[n+5]);
-                quant = __builtin_lrintf(signal * mult);
+    int    n, quant;
+
+        memset(errors, 0, 6 * sizeof *errors);       // arghh, it produces pops on each frame boundary!
+
+    for ( n = 0; n < 36; n++) {
+        signal = input[n] * NoiseInjectionCompensation1D [res] - (FIR[5]*errors[n+0] + FIR[4]*errors[n+1] + FIR[3]*errors[n+2] + FIR[2]*errors[n+3] + FIR[1]*errors[n+4] + FIR[0]*errors[n+5]);
+                quant = mpc_lrintf(signal * mult);
 
         // calculate the current error and save it for error refeeding
@@ -296 +286 @@
         quant = maxf ( quant, -offset );
 
-        *qu_output = (unsigned int)(quant + offset);
+        qu_output[n] = (unsigned int)(quant + offset);
     }
 }