Changeset 68 for libmpcdec/branches/zorg/src/requant.c

Timestamp:

10/06/06 17:14:05 (18 years ago)

Author:

zorg

Message:

Separated public interface from private headers
Use opaque objects whenever possible
Some (useless?) cosmetics on libmpcdec
Remove sv5-6 outdated support
Added libwavformat for upcoming mpcdec
New layout
Work in progress...

File:

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

libmpcdec/branches/zorg/src/requant.c

@@ -32 +32 @@
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-
 /// \file requant.c
 /// Requantization function implementations.
 /// \todo document me
+#include <mpcdec/mpcdec.h>
 
-#include <mpcdec/mpcdec.h>
-#include <mpcdec/internal.h>
+#include "requant.h"
+#include "math.h"
+#include "decoder.h"
 
 /* C O N S T A N T S */
-// bits per sample for chosen quantizer
+// Bits per sample for chosen quantizer
 const mpc_uint32_t  Res_bit [18] = {
     0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16
 };
 
-// coefficients for requantization
+// Requantization coefficients
 // 65536/step bzw. 65536/(2*D+1)
 
@@ -52 +53 @@
 
 const MPC_SAMPLE_FORMAT  __Cc [1 + 18] = {
-      _(111.285962475327f),                                        // 32768/2/255*sqrt(3)
+    _(111.285962475327f),   // 32768/2/255*sqrt(3)
     _(65536.000000000000f), _(21845.333333333332f), _(13107.200000000001f), _(9362.285714285713f),
-    _(7281.777777777777f),  _(4369.066666666666f),  _(2114.064516129032f), _(1040.253968253968f),
-     _(516.031496062992f),  _(257.003921568627f),   _(128.250489236790f),   _(64.062561094819f),
-       _(32.015632633121f),    _(16.003907203907f),     _(8.000976681723f),    _(4.000244155527f),
-        _(2.000061037018f),     _(1.000015259021f)
+    _(7281.777777777777f),  _(4369.066666666666f),  _(2114.064516129032f),  _(1040.253968253968f),
+    _(516.031496062992f),   _(257.003921568627f),   _(128.250489236790f),   _(64.062561094819f),
+    _(32.015632633121f),    _(16.003907203907f),    _(8.000976681723f),     _(4.000244155527f),
+    _(2.000061037018f),     _(1.000015259021f)
 };
 
 #undef _
 
-// offset for requantization
+// Requantization offset
 // 2*D+1 = steps of quantizer
 const mpc_int32_t  __Dc [1 + 18] = {
@@ -73 +74 @@
 static mpc_uint32_t find_shift(double fval)
 {
-        mpc_int64_t  val = (mpc_int64_t)fval;
+        mpc_int64_t  val = (mpc_int64_t) fval;
         mpc_uint32_t ptr = 0;
-        if (val<0) val = -val;
-        while(val) {val>>=1;ptr++;}
-
+        if(val<0)
+        val = -val;
+        while(val)
+    {
+        val >>= 1;
+        ptr++;
+    }
         return ptr > 31 ? 0 : 31 - ptr;
 }
@@ -84 +89 @@
 /* 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] = (mpc_uint8_t) find_shift(X));
 
 void
 mpc_decoder_scale_output(mpc_decoder *d, double factor) 
 {
-    mpc_int32_t     n;
-    double  f1;
-    double  f2;
+    mpc_int32_t n; double f1, f2;
+
 #ifndef MPC_FIXED_POINT
-        factor *= 1.0 / (double)(1<<(MPC_FIXED_POINT_SHIFT-1));
+        factor *= 1.0 / (double) (1<<(MPC_FIXED_POINT_SHIFT-1));
 #else
-        factor *= 1.0 / (double)(1<<(16 - MPC_FIXED_POINT_SHIFT));
+        factor *= 1.0 / (double) (1<<(16-MPC_FIXED_POINT_SHIFT));
 #endif
     f1 = f2 = factor;
@@ -107 +111 @@
 
     for ( n = 1; n <= 128; n++ ) {
-                SET_SCF((unsigned char)(1+n),f1);
-                SET_SCF((unsigned char)(1-n),f2);
+                SET_SCF((mpc_uint8_t)(1+n),f1);
+                SET_SCF((mpc_uint8_t)(1-n),f2);
         f1 *=   0.83298066476582673961;
         f2 *= 1/0.83298066476582673961;