[xiph-commits] r8466 - in trunk/oggdsf/src/lib/core: directshow/dsfAnxMux ogg/libOOOgg

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2004-12-16 09:29:16 -0800 (Thu, 16 Dec 2004)
New Revision: 8466

Modified:
   trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp
   trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp
   trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.h
Log:
* More of the no data before header fix.

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp	2004-12-16 17:29:04 UTC (rev 8465)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp	2004-12-16 17:29:16 UTC (rev 8466)
@@ -165,47 +165,4 @@
 	} else {
 		return S_FALSE;
 	}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-	////This pushes an anxdata packet into the stream.
-	//HRESULT locHR = OggMuxInputPin::SetMediaType(inMediaType);
-
-	//if (locHR == S_OK) {
-	//	debugLog<<"Set media type ok in base class"<<endl;
-	//	mPaginator.acceptStampedOggPacket(AnxPacketMaker::makeAnxData_2_0(mMuxStream, &mPaginator));
-	//}
-
-	//return locHR;
-
-
 }
\ No newline at end of file

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp	2004-12-16 17:29:04 UTC (rev 8465)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp	2004-12-16 17:29:16 UTC (rev 8466)
@@ -41,6 +41,7 @@
 	,	mConvScaleFactor(1)
 	,	mConvTheoraLogKeyFrameInterval(0)
 	,	mNumHeaders(0)
+	,	mPacketsSent(0)
 {
 	//debugLog.open("G:\\logs\\oggmuxstream.log", ios_base::out);
 }
@@ -78,6 +79,7 @@
 	if (!mPageQueue.empty()) {
 		retPage = mPageQueue.front();
 		mPageQueue.pop_front();
+		mPacketsSent++;
 	}
 	return retPage;
 }
@@ -140,7 +142,14 @@
 	return mNumHeaders;
 }
 
+unsigned long OggMuxStream::packetsSent() {
+	return mPacketsSent;
+}
+bool OggMuxStream::sentAllHeaders() {
+	return (mPacketsSent >= mNumHeaders);
+}
 
+
 bool OggMuxStream::setConversionParams(LOOG_INT64 inNumerator, LOOG_INT64 inDenominator, LOOG_INT64 inScaleFactor, LOOG_INT64 inTheoraLogKFI) {
 	mConvNumerator = inNumerator;
 	mConvDenominator = inDenominator;

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.h	2004-12-16 17:29:04 UTC (rev 8465)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.h	2004-12-16 17:29:16 UTC (rev 8466)
@@ -68,10 +68,14 @@
 
 	virtual bool setConversionParams(LOOG_INT64 inNumerator, LOOG_INT64 inDenominator, LOOG_INT64 inScaleFactor, LOOG_INT64 inTheoraLogKFI);
 	virtual bool setConversionParams(LOOG_INT64 inNumerator, LOOG_INT64 inDenominator, LOOG_INT64 inScaleFactor);
+	
 	virtual void setNumHeaders(unsigned long inNumHeaders);
 	virtual unsigned long numHeaders();
 
+	virtual unsigned long packetsSent();
+	virtual bool sentAllHeaders();
 
+
 	LOOG_INT64 granuleNumerator();
 	LOOG_INT64 granuleDenominator();
 	
@@ -89,6 +93,7 @@
 	LOOG_INT64 mConvTheoraLogKeyFrameInterval;
 
 	unsigned long mNumHeaders;
+	unsigned long mPacketsSent;
 
 	//fstream debugLog;
 	deque<OggPage*> mPageQueue;