Changeset 373 for dsfilters/demux_mpc/src/mpc_pin.cpp

Timestamp:

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

Author:

radscorpion

Message:

Fixed seeking.

File:

• dsfilters/demux_mpc/src/mpc_pin.cpp (modified) (8 diffs)

dsfilters/demux_mpc/src/mpc_pin.cpp

@@ -270 +270 @@
 HRESULT CMPCOutputPin::DoNewSegment(REFERENCE_TIME rtStart, REFERENCE_TIME rtStop, double dRate)
 {
-        DataPacket      *packet;
-        int ret = GetDataPacket(&packet);
-        if (ret < 0 || !packet) return E_FAIL;
 
         // queue the EOS packet
@@ -280 +277 @@
         eos_delivered = false;
 
-        {
-                CAutoLock       lck(&lock_queue);
-                packet->type = DataPacket::PACKET_TYPE_NEW_SEGMENT;
-                packet->rtStart = rtStart;
-                packet->rtStop = rtStop;
-                packet->rate = rate;
-                queue.AddTail(packet);
-                ev_can_read.Set();
+
+        if (1) {
+                return DeliverNewSegment(rtStart, rtStop, rate);
                 discontinuity = true;
-        }
-
+
+        } else {
+                DataPacket      *packet = new DataPacket();
+                {
+                        CAutoLock       lck(&lock_queue);
+                        packet->type = DataPacket::PACKET_TYPE_NEW_SEGMENT;
+                        packet->rtStart = rtStart;
+                        packet->rtStop = rtStop;
+                        packet->rate = rate;
+                        queue.AddTail(packet);
+                        ev_can_read.Set();
+                        discontinuity = true;
+                }
+        }
         return NOERROR;
 }
@@ -352 +356 @@
         if (ret < 0 || !outp) return E_FAIL;
 
-        REFERENCE_TIME start, stop;
-
         outp->type        = DataPacket::PACKET_TYPE_DATA;
 
@@ -421 +423 @@
         IMediaSample    *sample;
         HRESULT hr = GetDeliveryBuffer(&sample, NULL, NULL, 0);
-        if (FAILED(hr)) return E_FAIL;
+        if (FAILED(hr)) {
+                return E_FAIL;
+        }
 
         // we should have enough space in there
@@ -496 +500 @@
                 switch (cmd) {
                 case CMD_EXIT:          Reply(0); return 0; break;
-                case CMD_STOP:          Reply(0); break;
+                case CMD_STOP:
+                        {
+                                Reply(0); 
+                        }
+                        break;
                 case CMD_RUN:
                         {
@@ -530 +538 @@
                                                         DeliverEndOfStream();
                                                 } else 
+                                                if (packet->type == DataPacket::PACKET_TYPE_NEW_SEGMENT) {
+                                                        hr = DeliverNewSegment(packet->rtStart, packet->rtStop, packet->rate);
+                                                } else
                                                 if (packet->type == DataPacket::PACKET_TYPE_DATA) {
                                                         hr = DeliverDataPacket(*packet);
@@ -541 +552 @@
                                         }
                                 } while (!CheckRequest(&cmd2));
+
                         }
                         break;
@@ -614 +626 @@
 
         // TODO: Caching here !!!!
+        //TRACE("    - read, %I64d, %d\n", position, size);
 
         HRESULT hr = reader->SyncRead(position, size, (BYTE*)buf);