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

Timestamp:

11/09/06 13:44:00 (18 years ago)

Author:

r2d

Message:

• gapless playback should now be supported (not verified)

File:

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

libmpcdec/branches/zorg/src/mpc_decoder.c

@@ -89 +89 @@
 void mpc_decoder_set_streaminfo(mpc_decoder *d, mpc_streaminfo *si)
 {
-        d->StreamVersion      = si->stream_version;
-        d->MS_used            = si->ms;
-        d->Max_Band           = si->max_band;
-        d->OverallFrames      = si->frames;
-        d->TrueGaplessPresent = si->is_true_gapless;
-        d->SampleRate         = si->sample_freq;
+        d->stream_version     = si->stream_version;
+        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;
 }
 
@@ -118 +119 @@
                                                           mpc_frame_info * i)
 {
-        // FIXME : sauter décodage si d->samples_to_skip > MPC_FRAME_LENGTH pour sv7
-        switch (d->StreamVersion) {
-                case 0x07:
-                case 0x17:
-                case 0x08:
-                        i->channels = 2;
-                        i->sample_freq = d->SampleRate;
-                        i->samples = MPC_FRAME_LENGTH;
-                        mpc_decoder_read_bitstream_sv7(d, r);
-                        break;
+        d->decoded_frames++;
+
+        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);
         }
-
-        // synthesize signal
-        mpc_decoder_requantisierung(d);
         mpc_decoder_synthese_filter_float(d, i->buffer);
 
-        d->DecodedFrames++;
-
-//     // cut off first MPC_DECODER_SYNTH_DELAY zero-samples
-//      if (d->DecodedFrames == d->OverallFrames  && d->StreamVersion >= 6) {
-//         // reconstruct exact filelength
-//              mpc_int32_t  mod_block   = mpc_bits_read(r,  11);
-//              mpc_int32_t  FilterDecay;
-//
-//              if (mod_block == 0) {
-//             // Encoder bugfix
-//                      mod_block = 1152;
-//              }
-//              FilterDecay = (mod_block + MPC_DECODER_SYNTH_DELAY) % MPC_FRAME_LENGTH;
-//
-//         // additional FilterDecay samples are needed for decay of synthesis filter
-//              if (MPC_DECODER_SYNTH_DELAY + mod_block >= MPC_FRAME_LENGTH) {
-//                      if (!d->TrueGaplessPresent) {
-//                              mpc_decoder_reset_y(d);
-//                      } else {
-//                              mpc_bits_read(r, 20);
-//                              mpc_decoder_read_bitstream_sv7(d, FALSE);
-//                              mpc_decoder_requantisierung(d, d->Max_Band);
-//                      }
-//
-//                      mpc_decoder_synthese_filter_float(d, buffer + 2304);
-//
-//                      i->samples = MPC_FRAME_LENGTH + FilterDecay;
-//              }
-//              else {                              // there are only FilterDecay samples needed for this frame
-//                      i->samples = FilterDecay;
-//              }
-//      }
+    // 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;
+
+        i->samples = samples_left > MPC_FRAME_LENGTH ? MPC_FRAME_LENGTH : samples_left < 0 ? 0 : samples_left;
 
         if (d->samples_to_skip) {
@@ -173 +150 @@
                 } else {
                         i->samples -= d->samples_to_skip;
-                        memmove(i->buffer, i->buffer + d->samples_to_skip * i->channels,
-                                        i->samples * i->channels * sizeof (MPC_SAMPLE_FORMAT));
+                        memmove(i->buffer, i->buffer + d->samples_to_skip * d->channels,
+                                        i->samples * d->channels * sizeof (MPC_SAMPLE_FORMAT));
                         d->samples_to_skip = 0;
                 }
@@ -193 +170 @@
     mpc_int32_t*    L;
     mpc_int32_t*    R;
-        const mpc_int32_t Last_Band = d->Max_Band;
+        const mpc_int32_t Last_Band = d->max_band;
 
 #ifdef MPC_FIXED_POINT
@@ -363 +340 @@
     *ResL = mpc_bits_read(r, 4);
     *ResR = mpc_bits_read(r, 4);
-    if (d->MS_used && !(*ResL==0 && *ResR==0)) {
+        if (d->ms && !(*ResL==0 && *ResR==0)) {
         d->MS_Flag[0] = mpc_bits_read(r, 1);
     }
@@ -369 +346 @@
     // consecutive subbands
     ++ResL; ++ResR; // increase pointers
-    for (n=1; n <= d->Max_Band; ++n, ++ResL, ++ResR)
+        for (n=1; n <= d->max_band; ++n, ++ResL, ++ResR)
     {
                 idx   = mpc_bits_huff_dec(r, mpc_table_HuffHdr);
@@ -377 +354 @@
         *ResR = (idx!=4) ? *(ResR-1) + idx : (int) mpc_bits_read(r, 4);
 
-        if (d->MS_used && !(*ResL==0 && *ResR==0)) {
+                if (d->ms && !(*ResL==0 && *ResR==0)) {
             d->MS_Flag[n] = mpc_bits_read(r, 1);
         }