Changeset 68 for libmpcdec/branches/zorg/src/decoder.h

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/decoder.h (moved) (moved from libmpcdec/branches/zorg/include/mpcdec/decoder.h) (5 diffs)

libmpcdec/branches/zorg/src/decoder.h

@@ -32 +32 @@
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+/// \file decoder.h
+#ifndef _MPCDEC_DECODER_H_
+#define _MPCDEC_DECODER_H_
+#ifdef WIN32
+#pragma once
+#endif
 
-/// \file decoder.h
+#include <mpcdec/reader.h>
 
-#ifndef _mpcdec_decoder_h_
-#define _mpcdec_decoder_h_
-
-#include "huffman.h"
-#include "math.h"
-#include "mpcdec.h"
-#include "reader.h"
-#include "streaminfo.h"
-
-#define MPC_SUPPORT_SV456
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #define SEEKING_TABLE_SIZE  256u
@@ -53 +52 @@
 
 enum {
-    MPC_V_MEM = 2304,
+    MPC_V_MEM           = 2304,
     MPC_DECODER_MEMSIZE = 16384,  // overall buffer size
 };
 
-typedef struct {
+typedef struct mpc_quantizer {
     mpc_int32_t  L [36];
     mpc_int32_t  R [36];
-} QuantTyp;
+} mpc_quantizer;
 
-typedef struct mpc_decoder_t {
+struct mpc_decoder_t {
     mpc_reader *r;
 
@@ -101 +100 @@
     mpc_int32_t   SCF_Index_L [32] [3];
     mpc_int32_t   SCF_Index_R [32] [3];       // holds scalefactor-indices
-    QuantTyp      Q [32];                     // holds quantized samples
+    mpc_quantizer Q [32];                     // holds quantized samples
     mpc_int32_t   Res_L [32];
     mpc_int32_t   Res_R [32];                 // holds the chosen quantizer for each subband
@@ -110 +109 @@
     mpc_bool_t    MS_Flag[32];                // MS used?
 #ifdef MPC_FIXED_POINT
-    unsigned char SCF_shift[256];
+    mpc_uint8_t   SCF_shift[256];
 #endif
 
@@ -120 +119 @@
     //@}
 
-} mpc_decoder;
+};
 
-#endif // _mpc_decoder_h
+#ifdef __cplusplus
+}
+#endif
+#endif