Changeset 373 for dsfilters/dec_mpc/src/mpc_filter.cpp

Timestamp:

12/15/07 19:09:12 (16 years ago)

Author:

radscorpion

Message:

Fixed seeking.

File:

• dsfilters/dec_mpc/src/mpc_filter.cpp (modified) (6 diffs)

dsfilters/dec_mpc/src/mpc_filter.cpp

@@ -7 +7 @@
 //-----------------------------------------------------------------------------
 #include "stdafx.h"
+
 
 
@@ -283 +284 @@
 HRESULT CMPCDecoder::Receive(IMediaSample *pSample)
 {
-        if (!m_pOutput->IsConnected()) return NOERROR;
+        if (!m_pOutput->IsConnected()) {
+                return E_FAIL;
+        }
+
+        // we don't accept data while flushing
+        if (m_pInput->IsFlushing()) {
+                return E_UNEXPECTED;
+        }
+
 
         // we receive whole AP packets so just decode the frames :D
@@ -295 +304 @@
         reader.AppendSE();
 
-        // manually clear the buffer for demuxer
-        demux->bytes_total = 0;
-        demux->bits_reader.buff = demux->buffer;
-        demux->bits_reader.count = 8;
-        demux->block_bits = 0;
-        demux->block_frames = 0;
-
         // TODO: use some more clever way of doing this.
         MPC_SAMPLE_FORMAT       samples[1152 * 8];
@@ -322 +324 @@
         }
 
+        // manually clear the buffer for demuxer
+        demux->bytes_total = reader.size; // 0
+        demux->bits_reader.buff = reader.buf; //d->buffer;
+        demux->bits_reader.count = 8;
+        demux->block_bits = 0;
+        demux->block_frames = 0;
+        demux->d->decoded_samples = 0;
+
         // now scan through the frames
-        while (true) {
+        int frame_cnt = 1 << stream_info.block_pwr;
+        for (int i=0; i<frame_cnt; i++) {
 
                 //---------------------------------------------------------------------
@@ -336 +347 @@
                 // decode one frame
                 err = mpc_demux_decode(demux, &frame);
-                if (err != MPC_STATUS_OK) break;
-                if (frame.bits == -1) break;                            // done.
+                if (err != MPC_STATUS_OK) {
+                        break;
+                }
+                if (frame.bits == -1) {
+                        break;                          // done.
+                }
+
 
                 //---------------------------------------------------------------------
@@ -352 +368 @@
                                 __int64 to_skip = min(frame.samples, samples_to_skip);
                                 decoded_time_samples -= to_skip;
+                                samples_to_skip          -= to_skip;
                                 current_sample           += to_skip;
                                 src_samples                      += (to_skip * stream_info.channels);