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

Timestamp:

11/08/06 00:20:07 (18 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/mpc_reader.c (modified) (1 diff)

libmpcdec/branches/zorg/src/mpc_reader.c

@@ -179 +179 @@
 }
 
-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);
-}
-