Changeset 206

Timestamp:

02/09/07 18:57:23 (18 years ago)

Author:

r2d

Message:

• corrected a bug where very short frames ( < 1 byte, generally silence) were skiped at the end of a block.

Location:

libmpc/branches/r2d

Files:

• libmpcdec/internal.h (modified) (1 diff)
• libmpcdec/mpc_demux.c (modified) (5 diffs)
• mpc2sv8/mpc2sv8.c (modified) (3 diffs)

libmpc/branches/r2d/libmpcdec/internal.h

@@ -74 +74 @@
         mpc_size_t bytes_total;
         mpc_bits_reader bits_reader;
-        mpc_uint32_t block_bits; /// bits remaining in current audio block
-        mpc_bool_t end; /// end of stream flag
+        mpc_int32_t block_bits; /// bits remaining in current audio block
+        mpc_uint_t block_frames; /// frames remaining in current audio block
 
         // seeking

libmpc/branches/r2d/libmpcdec/mpc_demux.c

@@ -66 +66 @@
         d->bits_reader.count = 8;
         d->block_bits = 0;
-        d->end = MPC_FALSE;
+        d->block_frames = 0;
 }
 
@@ -361 +361 @@
                 mpc_bits_reader r;
                 i->is_key_frame = MPC_FALSE;
-                if (d->block_bits < 8 && d->end == MPC_FALSE) {
+
+                if (d->block_frames == 0) {
                         mpc_block b = {{0,0},0};
                         d->bits_reader.count &= -8;
@@ -372 +373 @@
                         while( memcmp(b.key, "AD", 2) != 0 ) { // scan all blocks until audio
                                 if (memcmp(b.key, "SE", 2) == 0) { // end block
-                                        d->end = MPC_TRUE;
-                                        break;
+                                        i->bits = -1;
+                                        return;
                                 }
                                 mpc_demux_fill(d, 11 + (mpc_uint32_t) b.size, 0);
@@ -380 +381 @@
                         }
                         d->block_bits = (mpc_uint32_t) b.size * 8;
+                        d->block_frames = 1 << d->si.block_pwr;
                         i->is_key_frame = MPC_TRUE;
                 }
@@ -387 +389 @@
                 mpc_decoder_decode_frame(d->d, &d->bits_reader, i);
                 d->block_bits -= ((d->bits_reader.buff - r.buff) << 3) + r.count - d->bits_reader.count;
+                d->block_frames--;
+                if (d->block_bits < 0) i->bits = -1;
         } else {
                 mpc_bits_reader r;

libmpc/branches/r2d/mpc2sv8/mpc2sv8.c

@@ -57 +57 @@
                 mpc_int32_t * q_d = d->Q[i].L, * q_e = e->Q[i].L, Res = d->Res_L[i];
 
-                if (Res != 0)
+                if (Res > 0)
                         for( j = 0; j < 36; j++)
                                 q_e[j] = q_d[j] + offset[Res];
@@ -63 +63 @@
                 q_d = d->Q[i].R, q_e = e->Q[i].R, Res = d->Res_R[i];
 
-                if (Res != 0)
+                if (Res > 0)
                         for( j = 0; j < 36; j++)
                                 q_e[j] = q_d[j] + offset[Res];
@@ -137 +137 @@
 
                 demux->d->samples_to_skip = MPC_FRAME_LENGTH + MPC_DECODER_SYNTH_DELAY;
-                frame.buffer = 0;
                 mpc_demux_decode(demux, &frame);