Changeset 81 for libmpcdec/branches/zorg/src/mpc_reader.c

Timestamp:

10/31/06 11:47:09 (17 years ago)

Author:

r2d

Message:

• first SV8 decoding, it's VERY BADLY implemented. To enable decoding, MPC_LITTLE_ENDIAN must NOT be defined on 386 (so sv7 doesn't work in the same time). Was just to verify that there is no bug in encoding (found 1 !)

File:

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

libmpcdec/branches/zorg/src/mpc_reader.c

@@ -88 +88 @@
 
 mpc_status
-mpc_reader_init_stdio(mpc_reader *p_reader, char *filename)
+mpc_reader_init_stdio(mpc_reader *p_reader, const char *filename)
 {
     mpc_reader tmp_reader; mpc_reader_stdio *p_stdio; int err;
@@ -149 +149 @@
     ret = p_reader->seek(p_reader, 0);
     if(!ret) return 0;
-    
+
     p_reader->read(p_reader, tmp, sizeof tmp);
 
@@ -178 +178 @@
     return ret;
 }
+
+mpc_status mpc_get_block(mpc_reader * p_reader, mpc_block_t * p_block)
+{
+        unsigned char tmp;
+        unsigned int size = 2;
+
+        p_block->size = 0;
+        p_reader->read(p_reader, p_block->key, 2);
+        do {
+                p_reader->read(p_reader, &tmp, 1);
+                p_block->size = (p_block->size << 7) | (tmp & 0x7F);
+                size++;
+        } while((tmp & 0x80));
+
+        if (size > p_block->size)
+                return MPC_STATUS_FILE;
+
+        p_block->size -= size;
+
+        return MPC_STATUS_OK;
+}
+
+mpc_status mpc_find_block(mpc_reader * p_reader, mpc_block_t * p_block,
+                                                  char * find_key, char * stop_key)
+{
+        while (1) {
+                mpc_get_block(p_reader, p_block);
+                if (memcmp(p_block->key, find_key, 2) != 0 &&
+                                  memcmp(p_block->key, stop_key, 2) != 0)
+                        p_reader->seek(p_reader, p_block->size);
+                else
+                        break;
+        }
+
+        if (memcmp(p_block->key, find_key, 2) != 0)
+                return MPC_STATUS_FILE;
+
+        return MPC_STATUS_OK;
+}
+
+mpc_uint32_t mpc_read_bits(mpc_reader * p_reader, mpc_bits_reader * p_bits,
+                                                   int nb_bits)
+{
+        mpc_uint32_t ret = p_bits->buff;
+        unsigned char tmp = 0;
+
+        while(nb_bits > p_bits->bitsCount){
+                p_reader->read(p_reader, &tmp, 1);
+                ret = (ret << 8) | tmp;
+                p_bits->bitsCount += 8;
+        }
+
+        p_bits->buff = (unsigned int) ret;
+        p_bits->bitsCount -= nb_bits;
+        ret >>= p_bits->bitsCount;
+
+        if (nb_bits == 32)
+                return ret;
+        else
+                return ret & ((1 << nb_bits) - 1);
+}
+