[xiph-commits] r10274 - branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2

[illiminable at svn.xiph.org]

Author: illiminable
Date: 2005-10-23 07:20:44 -0700 (Sun, 23 Oct 2005)
New Revision: 10274

Modified:
   branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp
   branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourcePin.cpp
Log:
* Reset the internal demux state after setting up
* Make sure the filter HR is initialised to S_OK
* Pass end flush through
* Vorbis works again, no seeking yet

Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp	2005-10-23 12:53:01 UTC (rev 10273)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp	2005-10-23 14:20:44 UTC (rev 10274)
@@ -172,6 +172,11 @@
 void OggDemuxPacketSourceFilter::DeliverEndFlush() 
 {
 	CAutoLock locLock(m_pLock);
+	for (unsigned long i = 0; i < mStreamMapper->numPins(); i++) {
+		//mStreamMapper->getOggStream(i)->flush();
+		mStreamMapper->getPinByIndex(i)->DeliverEndFlush();
+	}
+
 	
 	//if (mSetIgnorePackets == true) {
 	//	mStreamMapper->toStartOfData();
@@ -304,7 +309,7 @@
 	//mStreamMapper->setAllowDispatch(true);
 	//mStreamMapper->();			//Flushes all streams and sets them to ignore the right number of headers.
 	mOggBuffer.clearData();
-	//mDataSource->seek(0);			//TODO::: This is bad for streams.
+	mDataSource->seek(0);			//TODO::: This is bad for streams.
 
 	//debugLog<<"COMPLETED SETUP"<<endl;
 	delete[] locBuff;

Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourcePin.cpp
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourcePin.cpp	2005-10-23 12:53:01 UTC (rev 10273)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourcePin.cpp	2005-10-23 14:20:44 UTC (rev 10274)
@@ -47,6 +47,7 @@
 	,	mAcceptingData(false)
 	,	mNumBuffers(0)
 	,	mDataQueue(NULL)
+	,	mFilterHR(S_OK)
 {