Changeset 126 for libmpcdec/branches/zorg/src/mpc_decoder.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_decoder.c (modified) (3 diffs)

libmpcdec/branches/zorg/src/mpc_decoder.c

@@ -70 +70 @@
 static void mpc_decoder_requantisierung(mpc_decoder *d);
 
-static void mpc_decoder_reset_y(mpc_decoder *d)
-{
-        memset(d->Y_L, 0, sizeof d->Y_L);
-        memset(d->Y_R, 0, sizeof d->Y_R);
-}
+// static void mpc_decoder_reset_y(mpc_decoder *d)
+// {
+//      memset(d->Y_L, 0, sizeof d->Y_L);
+//      memset(d->Y_R, 0, sizeof d->Y_R);
+// }
 
 void mpc_decoder_setup(mpc_decoder *d)
@@ -92 +92 @@
         d->ms                 = si->ms;
         d->max_band           = si->max_band;
-        d->frames             = si->frames;
-        d->is_true_gapless    = si->is_true_gapless;
         d->channels           = si->channels;
-        d->last_frame_samples = si->last_frame_samples;
+
+        if (si->stream_version == 7 && si->is_true_gapless)
+                d->samples = ((si->samples + MPC_FRAME_LENGTH - 1) / MPC_FRAME_LENGTH) * MPC_FRAME_LENGTH;
+        else
+                d->samples = si->samples;
 }
 
@@ -119 +121 @@
                                                           mpc_frame_info * i)
 {
+        mpc_bits_reader r_sav = *r;
         mpc_int64_t samples_left;
-        if (d->decoded_frames >= d->frames && !d->is_true_gapless) {
-                mpc_decoder_reset_y(d);
-        } else {
-                mpc_decoder_read_bitstream_sv7(d, r);
-                mpc_decoder_requantisierung(d);
+
+        if (d->decoded_samples >= d->samples && d->samples != 0) {
+                i->samples = 0;
+                return;
         }
+
+        mpc_decoder_read_bitstream_sv7(d, r);
+        mpc_decoder_requantisierung(d);
         mpc_decoder_synthese_filter_float(d, i->buffer);
 
-        d->decoded_frames++;
-
-    // cut off first MPC_DECODER_SYNTH_DELAY zero-samples
+        d->decoded_samples += MPC_FRAME_LENGTH;
+
     // reconstruct exact filelength
-        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;
-
+        if (d->decoded_samples == d->samples && 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 = d->samples - d->decoded_samples + MPC_DECODER_SYNTH_DELAY;
         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;
+        i->bits = ((r->buff - r_sav.buff) << 3) + r_sav.count - r->count;
 
         if (d->samples_to_skip) {