Changeset 126 for libmpcdec/branches/zorg/src/mpc_demux.c

Timestamp:

11/13/06 20:13:18 (18 years ago)

Author:

r2d

Message:

• changed decoder struct and length computations

File:

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

libmpcdec/branches/zorg/src/mpc_demux.c

@@ -119 +119 @@
 
         if (memcmp(magic, "MP+", 3) == 0) {
-                d->si.stream_version = magic[3];
-                if ((d->si.stream_version & 15) == 7) {
+                d->si.stream_version = magic[3] & 15;
+                d->si.pns = magic[3] >> 4;
+                if (d->si.stream_version == 7) {
                         mpc_demux_fill(d, 6 * 4, MPC_BUFFER_SWAP); // header block size + endian convertion
                         streaminfo_read_header_sv7(&d->si, &d->bits_reader);
@@ -183 +184 @@
         if (d->si.stream_version == 8) {
                 mpc_bits_reader r;
-                if (d->block_bits < 8 && (d->d->decoded_frames < d->d->frames || d->d->frames == 0)){
+                if (d->block_bits < 8 && (d->d->decoded_samples < d->d->samples || d->d->samples == 0)){
                         mpc_block b;
                         d->bits_reader.count &= -8;
@@ -199 +200 @@
                 r = d->bits_reader;
                 mpc_decoder_decode_frame(d->d, &d->bits_reader, i);
-                d->block_bits -= (d->bits_reader.buff - r.buff) * 8 + r.count - d->bits_reader.count;
+                d->block_bits -= ((d->bits_reader.buff - r.buff) << 3) + r.count - d->bits_reader.count;
         } else {
                 mpc_bits_reader r;