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

Timestamp:

12/15/07 17:04:51 (16 years ago)

Author:

radscorpion

Message:

Seeking fixes. Splitter now registers mediatypes

File:

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

dsfilters/demux_mpc/src/mpc_pin.cpp

@@ -248 +248 @@
         ev_abort.Reset();
 
+        HRESULT hr = CBaseOutputPin::Active();
+        if (FAILED(hr)) {
+                active = FALSE;
+                return hr;
+        }
+
+        // new segment
+        DoNewSegment(rtStart, rtStop, rate);
+
         // vytvorime novu queue
         if (!ThreadExists()) {
@@ -254 +263 @@
         }
 
-        HRESULT hr = CBaseOutputPin::Active();
-        if (FAILED(hr)) {
-                active = FALSE;
-                return hr;
-        }
-
-        // new segment
-        DoNewSegment(rtStart, rtStop, rate);
         active = TRUE;
         return hr;
@@ -343 +344 @@
 HRESULT CMPCOutputPin::DeliverPacket(CMPCPacket &packet)
 {
+        // we don't accept packets while aborting...
+        if (ev_abort.Check()) return E_FAIL;
+
         // ziskame novy packet na vystup
         DataPacket      *outp = NULL;
@@ -388 +392 @@
 HRESULT CMPCOutputPin::DoEndOfStream()
 {
-        DataPacket      *packet;
-        int ret = GetDataPacket(&packet);
-        if (ret < 0 || !packet) return E_FAIL;
+        DataPacket      *packet = new DataPacket();
 
         // naqueueujeme EOS
@@ -413 +415 @@
         ev_can_read.Reset();
         ev_can_write.Set();
-
-        // we return buffer level only for the first pin
-        /*
-        if (stream_index == demux->buf_index) {
-                //MonoBase::AutoLock    lck2(&demux->lock_info);
-                demux->buf_size_ms = GetBufferTime_MS();
-        }
-        */
 }
 
@@ -538 +532 @@
                                                 if (packet->type == DataPacket::PACKET_TYPE_DATA) {
                                                         hr = DeliverDataPacket(*packet);
-                                                        if (SUCCEEDED(hr)) {
-
-                                                                /*
-                                                                if (stream_index == demux->buf_index) {
-                                                                        int     size = GetBufferTime_MS();
-                                                                        {
-                                                                                MonoBase::AutoLock      lck2(&demux->lock_info);
-                                                                                demux->buf_size_ms = size;
-                                                                                demux->NotifyEvent(EC_BUFFER_STATE, size, demux->internal_buffer_size);         // v milisekundach
-                                                                        }
-                                                                        demux->UpdatePage(1);
-
-                                                                        // posleme notifikaciu, ze data boli dorucene
-                                                                        if (is_first) {
-                                                                                is_first = false;
-                                                                                demux->NotifyEvent(EC_FRAME_READY, 0, 0);
-                                                                        }
-
-                                                                        // starvation
-                                                                        if (size < 0.05*demux->internal_buffer_size && !eos_delivered &&
-                                                                                demux->ev_ready.Check() == TRUE
-                                                                                ) {
-                                                                                demux->NotifyStarvation();
-                                                                        }
-                                                                }
-                                                                */
-                                                        }
                                                 }                                       
 
@@ -596 +563 @@
         reader = rd;
         reader->AddRef();
-        pos = 0;
+        position = 0;
 }
 
@@ -623 +590 @@
 
         // aktualna pozicia
-        if (pos) *pos = this->pos;
+        if (pos) *pos = position;
         return 0;
 }
@@ -634 +601 @@
 
         // seekneme
-        this->pos = pos;
+        position = pos;
         return 0;
 }
@@ -642 +609 @@
         __int64 avail, total;
         GetSize(&avail, &total);
-        if (pos + size > avail) return -1;
+        if (position + size > avail) {
+                return -1;
+        }
 
         // TODO: Caching here !!!!
 
-        HRESULT hr = reader->SyncRead(pos, size, (BYTE*)buf);
-        if (FAILED(hr)) return -2;
+        HRESULT hr = reader->SyncRead(position, size, (BYTE*)buf);
+        if (FAILED(hr)) {
+                return -1;
+        }
 
         // update position
-        pos += size;
+        position += size;
         return 0;
 }