Changeset 147 for libmpc/branches/r2d/include

Timestamp:

11/20/06 19:53:36 (18 years ago)

Author:

r2d

Message:

• added a first version of the seek table for sv8

Location:

libmpc/branches/r2d/include

Files:

• mpc/mpc_types.h (modified) (1 diff)
• mpcdec/mpcdec.h (modified) (4 diffs)
• mpcdec/streaminfo.h (modified) (1 diff)

libmpc/branches/r2d/include/mpc/mpc_types.h

@@ -72 +72 @@
 typedef unsigned int mpc_uint_t;
 // FIXME : must be the same size as a pointer
-typedef unsigned int mpc_size_t;
+typedef size_t mpc_size_t;
 
 /// Libmpcdec error codes

libmpc/branches/r2d/include/mpcdec/mpcdec.h

@@ -57 +57 @@
 
 typedef struct mpc_frame_info_t {
-        mpc_uint32_t samples;   // number of samples in the frame
-        mpc_uint32_t bits;      // number of bits consumed by this frame
-        MPC_SAMPLE_FORMAT * buffer;     // frame samples buffer (size = samples * channels * sizeof(MPC_SAMPLE_FORMAT)
+        mpc_uint32_t samples;   /// number of samples in the frame
+        mpc_int32_t bits;       /// number of bits consumed by this frame (-1) if end of stream
+        MPC_SAMPLE_FORMAT * buffer;     /// frame samples buffer (size = samples * channels * sizeof(MPC_SAMPLE_FORMAT)
 } mpc_frame_info;
 
@@ -75 +75 @@
 // void mpc_decoder_set_seeking(mpc_decoder *p_dec, mpc_streaminfo *si, mpc_bool_t fast_seeking);
 
-// void mpc_decoder_set_streaminfo(mpc_decoder *p_dec, mpc_streaminfo *si);
+/**
+ * set the scf indexes for seeking use
+ * needed only for sv7 seeking
+ * @param d
+ */
+void mpc_decoder_reset_scf(mpc_decoder * d);
 
 /// Sets decoder sample scaling factor.  All decoded samples will be multiplied
@@ -92 +97 @@
 void mpc_decoder_decode_frame(mpc_decoder * d, mpc_bits_reader * r, mpc_frame_info * i);
 
-/// Seeks to the specified sample in the source stream.
-// mpc_bool_t mpc_decoder_seek_sample(mpc_decoder *p_dec, mpc_int64_t destsample);
-
-/// Seeks to specified position in seconds in the source stream.
-// mpc_bool_t mpc_decoder_seek_seconds(mpc_decoder *p_dec, double seconds);
-
 // init demuxer
 mpc_demux * mpc_demux_init(mpc_reader * p_reader);
@@ -106 +105 @@
 // get streaminfo
 void mpc_demux_get_info(mpc_demux * d, mpc_streaminfo * i);
+// seek
+mpc_status mpc_demux_seek_sample(mpc_demux * d, mpc_int64_t destsample);
+mpc_status mpc_demux_seek_second(mpc_demux * d, double seconds);
+
 
 #ifdef __cplusplus

libmpc/branches/r2d/include/mpcdec/streaminfo.h

@@ -64 +64 @@
     mpc_uint32_t         ms;                 ///< Mid/side stereo (0: off, 1: on)
         mpc_uint32_t         fast_seek;          ///< True if stream supports fast-seeking (sv7)
-        mpc_uint32_t         frames_per_block;   ///< Number of frames in a block (sv8)
+        mpc_uint32_t         block_pwr;          ///< Number of frames in a block = 2^block_pwr (sv8)
     //@}