Changeset 104 for libmpcdec/branches/zorg/src/internal.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/internal.h (modified) (2 diffs)

libmpcdec/branches/zorg/src/internal.h

@@ -52 +52 @@
 }
 
-typedef struct  {
+typedef struct mpc_block_t {
         char key[2];    // block key
         mpc_uint64_t size;      // block size minus the block header size
-} mpc_block_t;
+} mpc_block;
 
+// mpc_bits_reader.c
+struct mpc_bits_reader_t {
+        unsigned char * buff; /// pointer on current byte
+        unsigned int count; /// unread bits in current byte
+};
 
-/// read a block header and fills the mpc_block_t struct.
-///
-/// \param p_reader supplying raw stream data
-/// \param p_block returned block header
-/// \return MPC_STATUS_FILE on errors of any kind
-mpc_status mpc_get_block(mpc_reader * p_reader, mpc_block_t * p_block);
+#define DEMUX_BUFFER_SIZE 65536
 
-/// find a block with key == find_key, stop search if key == stop_key;
-///
-/// \param p_reader supplying raw stream data
-/// \param p_block returned block header
-/// \param find_key key to find
-/// \param stop_key key to stop on
-/// \return MPC_STATUS_FILE on errors of any kind
-mpc_status mpc_find_block(mpc_reader * p_reader, mpc_block_t * p_block,
-                                                  char * find_key, char * stop_key);
-
-typedef struct  {
-        unsigned int buff;
-        unsigned int bitsCount;
-} mpc_bits_reader;
-
-mpc_uint32_t mpc_read_bits(mpc_reader * p_reader, mpc_bits_reader * p_bits,
-                                                   int nb_bits);
+struct mpc_demux_t {
+        mpc_reader * r;
+        mpc_decoder * d;
+        mpc_streaminfo si;
+        mpc_uint8_t buffer[DEMUX_BUFFER_SIZE];
+        mpc_uint32_t bytes_total;
+        mpc_bits_reader bits_reader;
+        mpc_uint32_t block_bits;        // bits remaining in current audio block
+};
 
 /// Searches for a ID3v2-tag and reads the length (in bytes) of it.
@@ -92 +84 @@
 /// helper functions used by multiple files
 mpc_uint32_t mpc_random_int(mpc_decoder *d); // in synth_filter.c
-void mpc_decoder_initialisiere_quantisierungstabellen(mpc_decoder *d, double scale_factor);
+void mpc_decoder_init_quant(mpc_decoder *d, double scale_factor);
 void mpc_decoder_synthese_filter_float(mpc_decoder *d, MPC_SAMPLE_FORMAT* OutData);