Changeset 73 for mppenc/branches/r2d/libmpcenc

Timestamp:

10/12/06 18:08:02 (18 years ago)

Author:

r2d

Message:

• modified quantization to use standard functions
• can now compile with -03

File:

• mppenc/branches/r2d/libmpcenc/quant.c (modified) (9 diffs)

mppenc/branches/r2d/libmpcenc/quant.c

@@ -161 +161 @@
     float  tmp ;
     float  tmp2;
-    float  tmp3;
 
     // Summation of the absolute power and the quadratic error
     for ( k = 0; k < 36; k++ ) {
         tmp2    = input[k] * NoiseInjectionCompensation1D [res];
-        // q = ftol(in), correct rounding
-        tmp  = tmp2 * fac + 0xFF8000;
-        tmp3 = (*(int*) & tmp - 0x4B7F8000) * invfac;
-        tmp  = tmp3 - tmp2;
+                tmp  = __builtin_nearbyintf(tmp2 * fac) * invfac - tmp2;
 
         Fehler += tmp * tmp;
@@ -191 +187 @@
     float  tmp ;
     float  tmp2;
-    float  tmp3;
 
     // Summation of the absolute power and the quadratic error
@@ -198 +193 @@
     for ( ; k < 12; k++ ) {
         tmp2    = input[k] * NoiseInjectionCompensation1D [res];
-        // q = ftol(in), correct rounding
-        tmp  = tmp2 * fac + 0xFF8000;
-        tmp3 = (*(int*) & tmp - 0x4B7F8000) * invfac;
-        tmp  = tmp3 - tmp2;
+                tmp  = __builtin_nearbyintf(tmp2 * fac) * invfac - tmp2;
 
         Fehler += tmp * tmp;
@@ -211 +203 @@
     for ( ; k < 24; k++ ) {
         tmp2    = input[k] * NoiseInjectionCompensation1D [res];
-        // q = ftol(in), correct rounding
-        tmp  = tmp2 * fac + 0xFF8000;
-        tmp3 = (*(int*) & tmp - 0x4B7F8000) * invfac;
-        tmp  = tmp3 - tmp2;
+                tmp  = __builtin_nearbyintf(tmp2 * fac) * invfac - tmp2;
 
         Fehler += tmp * tmp;
@@ -225 +214 @@
     for ( ; k < 36; k++ ) {
         tmp2    = input[k] * NoiseInjectionCompensation1D [res];
-        // q = ftol(in), correct rounding
-        tmp  = tmp2 * fac + 0xFF8000;
-        tmp3 = (*(int*) & tmp - 0x4B7F8000) * invfac;
-        tmp  = tmp3 - tmp2;
+                tmp  = __builtin_nearbyintf(tmp2 * fac) * invfac - tmp2;
 
         Fehler += tmp * tmp;
@@ -250 +236 @@
     float  mult    = A [res] * NoiseInjectionCompensation1D [res];
     float  invmult = C [res];
-    float  tmp;
     int    quant;
     float  signal;
 
         for ( n = 0; n < 36 - maxNsOrder; n++, input++, qu_output++ ) {
-        // q = ftol(in), correct rounding
-        tmp   = *input * mult + 0xFF8000;
-        quant = (unsigned int)(*(int*) & tmp - 0x4B7F8000 + offset);
+                quant = (unsigned int)(__builtin_lrintf(*input * mult) + offset);
 
         // limitation to 0...2D
@@ -268 +251 @@
 
     for ( ; n < 36; n++, input++, qu_output++ ) {
-        // q = ftol(in), correct rounding
         signal = *input * mult;
-        tmp   =  signal + 0xFF8000;
-        quant = (unsigned int)(*(int*) & tmp - 0x4B7F8000 + offset);
+                quant = (unsigned int)(__builtin_lrintf(signal) + offset);
 
         // calculate the current error and save it for error refeeding
@@ -293 +274 @@
 
     float  signal;
-    float  tmp;
     float  mult    = A [res];
     float  invmult = C [res];
@@ -304 +284 @@
     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 = ftol(signal), correct rounding
-        tmp   = signal * mult + 0xFF8000;
-        quant = *(int*) & tmp - 0x4B7F8000;
+                quant = __builtin_lrintf(signal * mult);
 
         // calculate the current error and save it for error refeeding