Changeset 18 for branches/zorg/src/requant.c

Timestamp:

09/16/06 16:33:17 (18 years ago)

Author:

zorg

Message:

Various type size reductions
Removed some type warnings
Replaced char, uchar with mpc_int8_t and mpc_uint8_t

File:

• branches/zorg/src/requant.c (modified) (4 diffs)

branches/zorg/src/requant.c

@@ -71 +71 @@
 
 #ifdef MPC_FIXED_POINT
-static mpc_uint32_t find_shift(double fval)
+static mpc_uint8_t find_shift(double fval)
 {
         mpc_int64_t  val = (mpc_int64_t)fval;
@@ -78 +78 @@
         while(val) {val>>=1;ptr++;}
 
-        return ptr > 31 ? 0 : 31 - ptr;
+        return ptr > 31 ? 0 : (mpc_uint8_t) 31 - ptr;
 }
 #endif
@@ -84 +84 @@
 /* F U N C T I O N S */
 
-#define SET_SCF(N,X) d->SCF[N] = MAKE_MPC_SAMPLE_EX(X,d->SCF_shift[N] = (unsigned char)find_shift(X));
+#define SET_SCF(N,X) d->SCF[N] = MAKE_MPC_SAMPLE_EX(X,d->SCF_shift[N] = find_shift(X));
 
 void
 mpc_decoder_scale_output(mpc_decoder *d, double factor) 
 {
-    mpc_int32_t     n;
-    double  f1;
-    double  f2;
+    mpc_uint8_t n;
+    double      f1;
+    double      f2;
 #ifndef MPC_FIXED_POINT
         factor *= 1.0 / (double)(1<<(MPC_FIXED_POINT_SHIFT-1));
@@ -107 +107 @@
 
     for ( n = 1; n <= 128; n++ ) {
-                SET_SCF((unsigned char)(1+n),f1);
-                SET_SCF((unsigned char)(1-n),f2);
+                SET_SCF(1+n,f1);
+                SET_SCF(1-n,f2);
         f1 *=   0.83298066476582673961;
         f2 *= 1/0.83298066476582673961;