Changeset 64 for mppenc/branches/r2d/libmpcenc/quant.c

Timestamp:

09/29/06 16:55:39 (18 years ago)

Author:

r2d

Message:

• added libmpcenc and a common directory
• can compile libmpcenc and libmpcpsy don't know about linking

Location:

mppenc/branches/r2d/libmpcenc

Files:

• . (added)
• quant.c (moved) (moved from mppenc/branches/r2d/src/quant.c) (3 diffs)

mppenc/branches/r2d/libmpcenc/quant.c

@@ -18 +18 @@
  */
 
-#include "mppenc.h"
+#include "libmpcenc.h"
+
+#include <math.h>
 
 /* V A R I A B L E S */
 float  __SCF    [128 + 6];   // tabulated scalefactors
+#define SCF             ( __SCF + 6 )
 float  __invSCF [128 + 6];   // inverted scalefactors
+#define invSCF  (__invSCF + 6)
 
 
@@ -239 +243 @@
 // Linear quantizer for a subband
 void
-QuantizeSubband ( unsigned int* qu_output, const float* input, const int res, float* errors )
+QuantizeSubband ( unsigned int* qu_output, const float* input, const int res, float* errors, const int maxNsOrder )
 {
     int    n;
@@ -249 +253 @@
     float  signal;
 
-    for ( n = 0; n < 36 - MAX_NS_ORDER; n++, input++, qu_output++ ) {
+        for ( n = 0; n < 36 - maxNsOrder; n++, input++, qu_output++ ) {
         // q = ftol(in), correct rounding
         tmp   = *input * mult + 0xFF8000;