Changeset 70 for libmpcdec/branches/zorg/src/mpc_decoder.c

Timestamp:

10/06/06 18:51:07 (18 years ago)

Author:

zorg

Message:

Added primitive mpcdec

File:

• libmpcdec/branches/zorg/src/mpc_decoder.c (modified) (3 diffs)

libmpcdec/branches/zorg/src/mpc_decoder.c

@@ -79 +79 @@
 static mpc_int32_t f_read(mpc_decoder *d, void *ptr, mpc_int32_t size) 
 { 
-    return d->r->read(d->r->data, ptr, size); 
+    return d->r->read(d->r, ptr, size); 
 }
 
 static mpc_bool_t f_seek(mpc_decoder *d, mpc_int32_t offset) 
 { 
-    return d->r->seek(d->r->data, offset); 
+    return d->r->seek(d->r, offset); 
 }
 
@@ -861 +861 @@
   mpc_decoder_reset_bitstream_decode(d);
   mpc_decoder_initialisiere_quantisierungstabellen(d, 1.0f);
-#if 0
-  mpc_decoder_init_huffman_sv6(d);
-  mpc_decoder_init_huffman_sv7(d);
-#endif
 }
 
@@ -896 +892 @@
 }
 
-mpc_bool_t mpc_decoder_initialize(mpc_decoder *d, mpc_streaminfo *si) 
-{
-    mpc_decoder_set_streaminfo(d, si);
+mpc_status mpc_decoder_init(mpc_decoder **d, mpc_reader *r, mpc_streaminfo *si) 
+{
+    mpc_decoder* p_tmp;
+    
+    p_tmp = malloc(sizeof *p_tmp);
+    memset(p_tmp, 0, sizeof *p_tmp);
+    mpc_decoder_setup(p_tmp, r);
+
+    mpc_decoder_set_streaminfo(p_tmp, si);
 
     // AB: setting position to the beginning of the data-bitstream
-    mpc_decoder_seek(d, get_initial_fpos(d));
-
-    d->seeking_pwr = 0;
-    while (d->OverallFrames > (SEEKING_TABLE_SIZE << d->seeking_pwr))
-        d->seeking_pwr++;
-    d->seeking_table_frames = 0;
-    d->seeking_table[0] = get_initial_fpos(d);
-
-    return TRUE;
+    mpc_decoder_seek(p_tmp, get_initial_fpos(p_tmp));
+
+    p_tmp->seeking_pwr = 0;
+    while (p_tmp->OverallFrames > (SEEKING_TABLE_SIZE << p_tmp->seeking_pwr))
+        p_tmp->seeking_pwr++;
+    p_tmp->seeking_table_frames = 0;
+    p_tmp->seeking_table[0] = get_initial_fpos(p_tmp);
+
+    *d = p_tmp;
+    return MPC_STATUS_OK;
+}
+
+void mpc_decoder_exit(mpc_decoder *d)
+{
+    free(d);
 }