Changeset 107 for libmpcdec/branches/zorg/src/mpc_demux.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_demux.c (modified) (3 diffs)

libmpcdec/branches/zorg/src/mpc_demux.c

@@ -172 +172 @@
 void mpc_demux_decode(mpc_demux * d, mpc_frame_info * i)
 {
-        i->samples = 0;
-        if (d->d->OverallFrames != 0 && d->d->DecodedFrames == d->d->OverallFrames)
-                return;
         if (d->si.stream_version == 8) {
                 mpc_bits_reader r;
-                if (d->block_bits < 8){
+                if (d->block_bits < 8 && (d->d->decoded_frames < d->d->frames || d->d->frames == 0)){
                         mpc_block b;
                         d->bits_reader.count &= -8;
@@ -195 +192 @@
                 d->block_bits -= (d->bits_reader.buff - r.buff) * 8 + r.count - d->bits_reader.count;
         } else {
-                int frame_size;
                 mpc_bits_reader r;
                 mpc_demux_fill(d, MAX_FRAME_SIZE, MPC_BUFFER_FULL | MPC_BUFFER_SWAP);
-                frame_size = mpc_bits_read(&d->bits_reader, 20); // read frame size
+                mpc_bits_read(&d->bits_reader, 20); // read frame size
                 r = d->bits_reader;
                 mpc_decoder_decode_frame(d->d, &d->bits_reader, i);
-                if ((d->bits_reader.buff - r.buff) * 8 + r.count - d->bits_reader.count != frame_size){
-                        frame_size--;
-                        frame_size += 1;
-                }
         }
 }
@@ -215 +207 @@
 //      mpc_uint32_t  FrameBitCnt = 0;
 //
-//      if (d->DecodedFrames >= d->OverallFrames) {
+//      if (d->decoded_frames >= d->OverallFrames) {
 //              return (mpc_uint32_t)(-1);                           // end of file -> abort decoding
 //      }
 //
 //     // add seeking info
-//      if (d->seeking_table_frames < d->DecodedFrames &&
-//                 (d->DecodedFrames & ((1 << d->seeking_pwr) - 1)) == 0) {
-//              d->seeking_table[d->DecodedFrames >> d->seeking_pwr] = mpc_decoder_bits_read(d);
-//              d->seeking_table_frames = d->DecodedFrames;
+//      if (d->seeking_table_frames < d->decoded_frames &&
+//                 (d->decoded_frames & ((1 << d->seeking_pwr) - 1)) == 0) {
+//              d->seeking_table[d->decoded_frames >> d->seeking_pwr] = mpc_decoder_bits_read(d);
+//              d->seeking_table_frames = d->decoded_frames;
 //                 }
 //