Changeset 159 for libmpc/branches/r2d/libmpcenc/quant.c

Timestamp:

12/10/06 19:48:05 (18 years ago)

Author:

r2d

Message:

• variable name correction

File:

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

libmpc/branches/r2d/libmpcenc/quant.c

@@ -163 +163 @@
     float  signal = 1.e-30f;
     float  error = 1.e-30f;
-    float  sig, err;
+    float  err, sig;
 
     // Summation of the absolute power and the quadratic error
     for ( k = 0; k < 36; k++ ) {
-        err = input[k] * NoiseInjectionCompensation1D [res];
-                sig = mpc_nearbyintf(err * fac) * invfac - err;
-
-        error += sig * sig;
-        signal += err * err;
+        sig = input[k] * NoiseInjectionCompensation1D [res];
+                err = mpc_nearbyintf(sig * fac) * invfac - sig;
+
+        error += err * err;
+        signal += sig * sig;
     }
 
@@ -185 +185 @@
     float  fac    = A [res];
     float  invfac = C [res];
-        float  signal, error, ret, sig, err;
+        float  signal, error, ret, err, sig;
 
     // Summation of the absolute power and the quadratic error
@@ -191 +191 @@
         signal = error = 1.e-30f;
     for ( ; k < 12; k++ ) {
-        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;
+        sig = input[k] * NoiseInjectionCompensation1D [res];
+                err = mpc_nearbyintf(sig * fac) * invfac - sig;
+
+        error += err * err;
+        signal += sig * sig;
+    }
+    err = signal > error  ?  error / (SNRcomp * signal)  :  error / signal;
+    ret = err;
     signal = error = 1.e-30f;
     for ( ; k < 24; k++ ) {
-        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);
+        sig = input[k] * NoiseInjectionCompensation1D [res];
+                err = mpc_nearbyintf(sig * fac) * invfac - sig;
+
+        error += err * err;
+        signal += sig * sig;
+    }
+    err = signal > error  ?  error / (SNRcomp * signal)  :  error / signal;
+        ret = maxf(ret, err);
 
     signal = error = 1.e-30f;
     for ( ; k < 36; k++ ) {
-        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);
+        sig = input[k] * NoiseInjectionCompensation1D [res];
+                err = mpc_nearbyintf(sig * fac) * invfac - sig;
+
+        error += err * err;
+        signal += sig * sig;
+    }
+    err = signal > error  ?  error / (SNRcomp * signal)  :  error / signal;
+        ret = maxf(ret, err);
 
     return ret;