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

Timestamp:

12/14/07 00:22:01 (16 years ago)

Author:

radscorpion

Message:

MPC Demux works. Right now it can only be used with Dump filter, because
it accepts any mediatype.

File:

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

dsfilters/demux_mpc/src/mpc_pin.cpp

@@ -131 +131 @@
         ev_can_write.Set();
         ev_abort.Reset();
+
+        // up to 5 seconds
+        buffer_time_ms = 5000;
 }
 
@@ -141 +144 @@
 {
         CheckPointer(ppv, E_POINTER);
-        /*
         if (riid == IID_IMediaSeeking) {
                 return GetInterface((IMediaSeeking*)this, ppv);
         } else {
-        */
                 return CBaseOutputPin::NonDelegatingQueryInterface(riid, ppv);
-        //}
+        }
 }
 
@@ -292 +293 @@
 }
 
-/*
 // IMediaSeeking
 STDMETHODIMP CMPCOutputPin::GetCapabilities(DWORD* pCapabilities)                                       { return demux->GetCapabilities(pCapabilities); }
@@ -315 +315 @@
 STDMETHODIMP CMPCOutputPin::SetPositions(LONGLONG* pCurrent, DWORD dwCurrentFlags, LONGLONG* pStop, DWORD dwStopFlags)
 {
-        return demux->SetPositionsInternal(stream_index, pCurrent, dwCurrentFlags, pStop, dwStopFlags);
-}
-*/
+        return demux->SetPositionsInternal(0, pCurrent, dwCurrentFlags, pStop, dwStopFlags);
+}
 
 int CMPCOutputPin::GetDataPacket(DataPacket **packet)
@@ -342 +341 @@
 }
 
-/*
-// dorucenie packetu
-HRESULT CMPCOutputPin::DeliverPacket(MP4::Packet &packet)
+HRESULT CMPCOutputPin::DeliverPacket(CMPCPacket &packet)
 {
         // ziskame novy packet na vystup
@@ -356 +353 @@
 
         // spocitame casy
-        outp->rtStart = (packet.pts_100mhz / 10) - rtStart;
-        outp->rtStop  = outp->rtStart + 1;
+        outp->rtStart = packet.tStart;
+        outp->rtStop  = packet.tStop;
         
-        outp->size        = packet.size;
+        outp->size        = packet.packet_size;
         outp->buf         = (BYTE*)malloc(outp->size);
-        memcpy(outp->buf, packet.data, packet.size);
-
-        // sync point ?
-        if (packet.flags & PACKET_FLAG_KEYFRAME) {
-                outp->sync_point = TRUE;
-        } else {
-                outp->sync_point = FALSE;
-        }
+        memcpy(outp->buf, packet.packet, packet.packet_size);
+
+        // each packet is sync point
+        outp->sync_point = TRUE;
 
         // discontinuity ?
@@ -379 +372 @@
 
         {
-                // strcime do queue
-                MonoBase::AutoLock              lck(&lock_queue);
+                // insert into queue
+                CAutoLock               lck(&lock_queue);
                 queue.AddTail(outp);
                 ev_can_read.Set();
 
-                // zakazeme dalsie bufferovanie
-                // toto mozeme robit iba pre seekovaci pin
-                if (stream_index == demux->buf_index) {
-                        if (GetBufferTime_MS() >= buffer_time_ms) {
-                                ev_can_write.Reset();
-                        }
+                // we allow buffering for a few seconds (might be usefull for network playback)
+                if (GetBufferTime_MS() >= buffer_time_ms) {
+                        ev_can_write.Reset();
                 }
         }
@@ -395 +385 @@
         return NOERROR;
 }
-*/
 
 HRESULT CMPCOutputPin::DoEndOfStream()
@@ -441 +430 @@
 
         // we should have enough space in there
-        ASSERT(sample->GetSize() >= packet.size);
+        long lsize = sample->GetSize();
+        ASSERT(lsize >= packet.size);
 
         BYTE                    *buf;