Changeset 108 for libmpcdec/branches/zorg/src/mpc_decoder.c

Timestamp:

11/09/06 21:39:12 (17 years ago)

Author:

r2d

Message:

• report file size

File:

• libmpcdec/branches/zorg/src/mpc_decoder.c (modified) (2 diffs)

libmpcdec/branches/zorg/src/mpc_decoder.c

@@ -119 +119 @@
                                                           mpc_frame_info * i)
 {
-        d->decoded_frames++;
-
-        if (d->decoded_frames > d->frames && !d->is_true_gapless) {
+        mpc_int64_t samples_left;
+        if (d->decoded_frames >= d->frames && !d->is_true_gapless) {
                 mpc_decoder_reset_y(d);
         } else {
@@ -129 +128 @@
         mpc_decoder_synthese_filter_float(d, i->buffer);
 
+        d->decoded_frames++;
+
     // cut off first MPC_DECODER_SYNTH_DELAY zero-samples
     // reconstruct exact filelength
-        if (d->decoded_frames == d->frames && (d->stream_version & 15) == 7) {
-                d->last_frame_samples = mpc_bits_read(r, 11);
-                if (d->last_frame_samples == 0) {
-            // Encoder bugfix
-                        d->last_frame_samples = MPC_FRAME_LENGTH;
-                }
-        }
-
-        mpc_int32_t samples_left = d->last_frame_samples + MPC_DECODER_SYNTH_DELAY
-                        + (d->frames - d->decoded_frames) * MPC_FRAME_LENGTH;
+        if (d->decoded_frames == d->frames && (d->stream_version & 15) == 7 &&
+                (d->last_frame_samples = mpc_bits_read(r, 11)) == 0)
+                // Encoder bugfix
+                d->last_frame_samples = MPC_FRAME_LENGTH;
+
+        samples_left = d->last_frame_samples + MPC_DECODER_SYNTH_DELAY
+                        + ((mpc_int64_t)d->frames - d->decoded_frames) * MPC_FRAME_LENGTH;
 
         i->samples = samples_left > MPC_FRAME_LENGTH ? MPC_FRAME_LENGTH : samples_left < 0 ? 0 : samples_left;
+
+        if (samples_left <= MPC_FRAME_LENGTH) d->is_true_gapless = 0;
 
         if (d->samples_to_skip) {