Ignore:
Timestamp:
09/17/06 16:19:05 (16 years ago)
Author:
zorg
Message:

Revert broken changes from r21

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/zorg/include/mpcdec/decoder.h

    r21 r23  
    4545
    4646#define MPC_SUPPORT_SV456
    47 #define SCF_HACK
    4847
    4948enum {
     
    6362    //@{
    6463
    65     mpc_uint32_t  next;
    6664    mpc_uint32_t  dword; /// currently decoded 32bit-word
    6765    mpc_uint32_t  pos;   /// bit-position within dword
    68     mpc_uint32_t  *Speicher; /// read-buffer
     66    mpc_uint32_t  Speicher[MPC_DECODER_MEMSIZE]; /// read-buffer
    6967    mpc_uint32_t  Zaehler; /// actual index within read-buffer
    70     mpc_uint32_t  Ring;
    7168
    7269    mpc_uint32_t  samples_to_skip;
    73     mpc_uint32_t  last_block_samples;
     70
    7471    mpc_uint32_t  FwdJumpInfo;
    7572    mpc_uint32_t  ActDecodePos;
     
    7875    mpc_uint32_t  DecodedFrames;
    7976    mpc_uint32_t  OverallFrames;
    80     mpc_uint32_t  MaxDecodedFrames;           // Maximum frames decoded (indicates usable seek table entries)
    81     mpc_uint16_t  SeekTableIndex;
    82     mpc_uint32_t  SeekTableCounter;
    8377    mpc_int32_t   SampleRate;                 // Sample frequency
    8478
     
    111105    //mpc_int32_t   DSCF_Reference_R [32];      // holds last frames SCF
    112106    mpc_bool_t    MS_Flag[32];                // MS used?
    113 
    114     mpc_uint32_t* SeekTable;
    115     mpc_bool_t    Use_SeekTable;
    116     mpc_bool_t    Use_FastSeek;
    117     mpc_bool_t    Use_StaticSeekTable;
    118     mpc_uint8_t   SeekTable_Step;
    119     mpc_uint32_t  Max_SeekTable_Size;
    120 
    121107#ifdef MPC_FIXED_POINT
    122108    mpc_uint8_t   SCF_shift[256];
     
    125111    MPC_SAMPLE_FORMAT V_L[MPC_V_MEM + 960];
    126112    MPC_SAMPLE_FORMAT V_R[MPC_V_MEM + 960];
    127     MPC_SAMPLE_FORMAT (*Y_L)[32];
    128     MPC_SAMPLE_FORMAT (*Y_R)[32];
     113    MPC_SAMPLE_FORMAT Y_L[36][32];
     114    MPC_SAMPLE_FORMAT Y_R[36][32];
    129115    MPC_SAMPLE_FORMAT SCF[256]; ///< holds adapted scalefactors (for clipping prevention)
    130116    //@}
Note: See TracChangeset for help on using the changeset viewer.