Changeset 301

Timestamp:

04/27/07 22:37:57 (18 years ago)

Author:

r2d

Message:

corrected a bug when seeking after the last frame as been decoded

Location:

libmpc/trunk/libmpcdec

Files:

• mpc_decoder.c (modified) (1 diff)
• mpc_demux.c (modified) (1 diff)

libmpc/trunk/libmpcdec/mpc_decoder.c

@@ -169 +169 @@
 
     // reconstruct exact filelength
-        if (d->decoded_samples == d->samples && d->stream_version == 7) {
+        if (d->decoded_samples - d->samples < MPC_FRAME_LENGTH && d->stream_version == 7) {
                 int last_frame_samples = mpc_bits_read(r, 11);
-                if (last_frame_samples == 0) last_frame_samples = MPC_FRAME_LENGTH;
-                d->samples += last_frame_samples - MPC_FRAME_LENGTH;
-                samples_left += last_frame_samples - MPC_FRAME_LENGTH;
+                if (d->decoded_samples == d->samples) {
+                        if (last_frame_samples == 0) last_frame_samples = MPC_FRAME_LENGTH;
+                        d->samples += last_frame_samples - MPC_FRAME_LENGTH;
+                        samples_left += last_frame_samples - MPC_FRAME_LENGTH;
+                }
         }
 

libmpc/trunk/libmpcdec/mpc_demux.c

@@ -409 +409 @@
                 mpc_demux_fill(d, MAX_FRAME_SIZE, MPC_BUFFER_FULL | MPC_BUFFER_SWAP);
                 d->block_bits = (mpc_int_t) mpc_bits_read(&d->bits_reader, 20); // read frame size
-                if (d->d->decoded_samples + MPC_FRAME_LENGTH == d->d->samples) d->block_bits += 11; // we will read last frame size
+                if (MPC_FRAME_LENGTH > d->d->samples - d->d->decoded_samples - 1) d->block_bits += 11; // we will read last frame size
                 r = d->bits_reader;
                 mpc_decoder_decode_frame(d->d, &d->bits_reader, i);