Changeset 37 for libmpcdec/trunk/include

Timestamp:

09/22/06 22:00:44 (18 years ago)

Author:

zorg

Message:

Added optional fast seeking, seek table index & various code cleanup. Patch by Nicolas BOTTI

Location:

libmpcdec/trunk/include/mpcdec

Files:

• decoder.h (modified) (4 diffs)
• mpcdec.h (modified) (1 diff)
• streaminfo.h (modified) (1 diff)

libmpcdec/trunk/include/mpcdec/decoder.h

@@ -46 +46 @@
 #define MPC_SUPPORT_SV456
 
+#define SEEKING_TABLE_SIZE  256
+// set it to SLOW_SEEKING_WINDOW to not use fast seeking
+#define FAST_SEEKING_WINDOW 32
+// set it to FAST_SEEKING_WINDOW to only use fast seeking
+#define SLOW_SEEKING_WINDOW 0x80000000
+
 enum {
     MPC_V_MEM = 2304,
@@ -69 +75 @@
     mpc_uint32_t  samples_to_skip;
 
-    mpc_uint32_t  FwdJumpInfo;
-    mpc_uint32_t  ActDecodePos;
-    
-
     mpc_uint32_t  DecodedFrames;
     mpc_uint32_t  OverallFrames;
@@ -91 +93 @@
     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];
     mpc_int32_t   SCF_Index_R [32] [3];       // holds scalefactor-indices
@@ -100 +108 @@
     mpc_int32_t   SCFI_L [32];
     mpc_int32_t   SCFI_R [32];                // describes order of transmitted SCF
-    mpc_int32_t   DSCF_Reference_L [32];
-    mpc_int32_t   DSCF_Reference_R [32];      // holds last frames SCF
     mpc_bool_t    MS_Flag[32];                // MS used?
 #ifdef MPC_FIXED_POINT

libmpcdec/trunk/include/mpcdec/mpcdec.h

@@ -101 +101 @@
 mpc_bool_t mpc_decoder_initialize(mpc_decoder *d, mpc_streaminfo *si);
 
+/// Call this next after calling mpc_decoder_setup.
+/// \param si streaminfo structure indicating format of source stream
+/// \param fast_seeking boolean 0 = use fast seeking if safe, 1 = force fast seeking
+void mpc_decoder_set_seeking(mpc_decoder *d, mpc_streaminfo *si, mpc_bool_t fast_seeking);
+
 void mpc_decoder_set_streaminfo(mpc_decoder *d, mpc_streaminfo *si);
 

libmpcdec/trunk/include/mpcdec/streaminfo.h

@@ -82 +82 @@
     mpc_streaminfo_off_t total_file_length;  ///< total length of underlying file
     //@}
+
+    /// @name fast seeking support
+    //@{
+    mpc_uint32_t        fast_seek;           ///< support fast seeking ? (0: no, 1: yes)
+    //@}
 } mpc_streaminfo;