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

libmpcdec/branches/zorg/src/streaminfo.c

@@ -99 +99 @@
 {
     mpc_uint16_t Estimatedpeak_title = 0;
+        mpc_uint32_t frames, last_frame_samples;
 
         si->bitrate            = 0;
-        si->frames             = mpc_bits_read(r, 32);
+        frames                 = mpc_bits_read(r, 32);
         mpc_bits_read(r, 1); // intensity stereo : should be 0
         si->ms                 = mpc_bits_read(r, 1);
@@ -115 +116 @@
         si->peak_album         = (mpc_uint16_t) mpc_bits_read(r, 16);
         si->is_true_gapless    = mpc_bits_read(r, 1); // true gapless: used?
-        si->last_frame_samples = mpc_bits_read(r, 11); // true gapless: valid samples for last frame
+        last_frame_samples     = mpc_bits_read(r, 11); // true gapless: valid samples for last frame
         si->fast_seek          = mpc_bits_read(r, 1); // fast seeking
         mpc_bits_read(r, 19); // unused
@@ -123 +124 @@
         mpc_get_encoder_string(si);
 
-        // estimation, exact value needs too much time
-        si->pcm_samples     = 1152 * si->frames - 576;
-        si->average_bitrate = 0;
-        if (si->pcm_samples > 0)
-                si->average_bitrate = (si->tag_offset  - si->header_position) * 8.0
-                                *  si->sample_freq / si->pcm_samples;
+        if (last_frame_samples == 0) last_frame_samples = MPC_FRAME_LENGTH;
+        si->samples = (mpc_int64_t) frames * MPC_FRAME_LENGTH;
+        if (si->is_true_gapless)
+                si->samples -= (MPC_FRAME_LENGTH - last_frame_samples);
+        else
+                si->samples -= MPC_DECODER_SYNTH_DELAY;
+
+        si->average_bitrate = (si->tag_offset  - si->header_position) * 8.0
+                        *  si->sample_freq / si->samples;
 
     return MPC_STATUS_OK;
@@ -138 +142 @@
 {
         mpc_uint32_t CRC;
-        mpc_uint64_t sampleCount = 0;
         mpc_bits_reader r = *r_in;
 
@@ -144 +147 @@
         CRC = mpc_bits_read(&r, 32);
         si->stream_version = mpc_bits_read(&r, 8);
-        mpc_bits_get_size(&r, &sampleCount);
-        si->frames = (sampleCount + MPC_FRAME_LENGTH - 1) / MPC_FRAME_LENGTH;
+        mpc_bits_get_size(&r, &si->samples);
         si->is_true_gapless = 1;
-        si->last_frame_samples = sampleCount - (si->frames - 1) * MPC_FRAME_LENGTH;
         si->sample_freq = samplefreqs[mpc_bits_read(&r, 4)];
         si->channels = mpc_bits_read(&r, 4) + 1;
@@ -156 +157 @@
         si->bitrate = 0;
 
-        si->pcm_samples     = sampleCount;
-        si->average_bitrate = 0;
-        if (si->pcm_samples > 0)
-                si->average_bitrate = (si->tag_offset - si->header_position) * 8.0
-                                *  si->sample_freq / si->pcm_samples;
+        si->average_bitrate = (si->tag_offset - si->header_position) * 8.0
+                        *  si->sample_freq / si->samples;
 
         return MPC_STATUS_OK;
@@ -198 +196 @@
 mpc_streaminfo_get_length(mpc_streaminfo * si)
 {
-    return (double) mpc_streaminfo_get_length_samples(si) / si->sample_freq;
-}
-
-mpc_int64_t
-mpc_streaminfo_get_length_samples(mpc_streaminfo * si)
-{
-    mpc_int64_t samples = (mpc_int64_t) si->frames * MPC_FRAME_LENGTH;
-    if (si->is_true_gapless)
-        samples -= (MPC_FRAME_LENGTH - si->last_frame_samples);
-    else
-        samples -= MPC_DECODER_SYNTH_DELAY;
-    return samples;
-}
+    return (double) si->samples / si->sample_freq;
+}
+
+mpc_int64_t mpc_streaminfo_get_length_samples(mpc_streaminfo *si)
+{
+        return si->samples;
+}