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

Timestamp:

11/08/06 00:20:07 (17 years ago)

Author:

r2d

Message:

• can read sv7 & sv8
• seek broken (not implemented)
• added demuxer in API
• added access to decoder in API

File:

• libmpcdec/branches/zorg/src/decoder.h (modified) (2 diffs)

libmpcdec/branches/zorg/src/decoder.h

@@ -62 +62 @@
 
 struct mpc_decoder_t {
-    mpc_reader *r;
-
     /// @name internal state variables
     //@{
+    mpc_uint32_t  SampleRate;                 // Sample frequency
+    mpc_uint32_t  StreamVersion;              // version of bitstream
+    mpc_uint32_t  Max_Band;
+    mpc_uint32_t  MS_used;                    // MS-coding used ?
+        mpc_uint32_t  TrueGaplessPresent;
+        mpc_uint32_t  OverallFrames;              // number of frames in the stream, 0 = unknow
+        mpc_uint32_t  LastFrameSamples;           // number of samples in the last frame
 
-    mpc_uint32_t  dword; /// currently decoded 32bit-word
-    mpc_uint32_t  pos;   /// bit-position within dword
-    mpc_uint32_t  Speicher[MPC_DECODER_MEMSIZE]; /// read-buffer
-    mpc_uint32_t  Zaehler; /// actual index within read-buffer
-
-    mpc_uint32_t  samples_to_skip;
-
-    mpc_uint32_t  DecodedFrames;
-    mpc_uint32_t  OverallFrames;
-    mpc_int32_t   SampleRate;                 // Sample frequency
-
-    mpc_uint32_t  StreamVersion;              // version of bitstream
-    mpc_int32_t   Max_Band;
-    mpc_uint32_t  MPCHeaderPos;               // AB: needed to support ID3v2
-
-    mpc_uint32_t  FrameWasValid;
-    mpc_uint32_t  MS_used;                    // MS-coding used ?
-    mpc_uint32_t  TrueGaplessPresent;
-
-    mpc_uint32_t  WordsRead;                  // counts amount of decoded dwords
-        mpc_uint32_t  BlockBits;                  // block bits left to read
+        mpc_uint32_t  samples_to_skip;
+        mpc_uint32_t  DecodedFrames;
 
     // randomizer state variables
     mpc_uint32_t  __r1;
     mpc_uint32_t  __r2;
-
-    // seeking
-    mpc_uint32_t  seeking_table[SEEKING_TABLE_SIZE];
-    mpc_uint32_t  seeking_pwr;                // distance between 2 frames in seeking_table = 2^seeking_pwr
-    mpc_uint32_t  seeking_table_frames;       // last frame in seaking table
-    mpc_uint32_t  seeking_window;             // number of frames to look for scalefactors
 
     mpc_int32_t   SCF_Index_L [32] [3];
@@ -119 +99 @@
     MPC_SAMPLE_FORMAT SCF[256]; ///< holds adapted scalefactors (for clipping prevention)
     //@}
-
 };