Changeset 23 for branches/zorg/include/mpcdec/decoder.h

Timestamp:

09/17/06 16:19:05 (18 years ago)

Author:

zorg

Message:

Revert broken changes from r21

File:

• branches/zorg/include/mpcdec/decoder.h (modified) (5 diffs)

branches/zorg/include/mpcdec/decoder.h

@@ -45 +45 @@
 
 #define MPC_SUPPORT_SV456
-#define SCF_HACK
 
 enum {
@@ -63 +62 @@
     //@{
 
-    mpc_uint32_t  next;
     mpc_uint32_t  dword; /// currently decoded 32bit-word
     mpc_uint32_t  pos;   /// bit-position within dword
-    mpc_uint32_t  *Speicher; /// read-buffer
+    mpc_uint32_t  Speicher[MPC_DECODER_MEMSIZE]; /// read-buffer
     mpc_uint32_t  Zaehler; /// actual index within read-buffer
-    mpc_uint32_t  Ring;
 
     mpc_uint32_t  samples_to_skip;
-    mpc_uint32_t  last_block_samples;
+
     mpc_uint32_t  FwdJumpInfo;
     mpc_uint32_t  ActDecodePos;
@@ -78 +75 @@
     mpc_uint32_t  DecodedFrames;
     mpc_uint32_t  OverallFrames;
-    mpc_uint32_t  MaxDecodedFrames;           // Maximum frames decoded (indicates usable seek table entries)
-    mpc_uint16_t  SeekTableIndex;
-    mpc_uint32_t  SeekTableCounter;
     mpc_int32_t   SampleRate;                 // Sample frequency
 
@@ -111 +105 @@
     //mpc_int32_t   DSCF_Reference_R [32];      // holds last frames SCF
     mpc_bool_t    MS_Flag[32];                // MS used?
-
-    mpc_uint32_t* SeekTable;
-    mpc_bool_t    Use_SeekTable;
-    mpc_bool_t    Use_FastSeek;
-    mpc_bool_t    Use_StaticSeekTable;
-    mpc_uint8_t   SeekTable_Step;
-    mpc_uint32_t  Max_SeekTable_Size;
-
 #ifdef MPC_FIXED_POINT
     mpc_uint8_t   SCF_shift[256];
@@ -125 +111 @@
     MPC_SAMPLE_FORMAT V_L[MPC_V_MEM + 960];
     MPC_SAMPLE_FORMAT V_R[MPC_V_MEM + 960];
-    MPC_SAMPLE_FORMAT (*Y_L)[32];
-    MPC_SAMPLE_FORMAT (*Y_R)[32];
+    MPC_SAMPLE_FORMAT Y_L[36][32];
+    MPC_SAMPLE_FORMAT Y_R[36][32];
     MPC_SAMPLE_FORMAT SCF[256]; ///< holds adapted scalefactors (for clipping prevention)
     //@}