[xiph-commits] r8462 - in trunk/oggdsf/src: lib/core/ogg/libOOOgg tests/testLibOOOgg

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2004-12-16 09:19:02 -0800 (Thu, 16 Dec 2004)
New Revision: 8462

Modified:
   trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp
   trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.h
   trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp
   trunk/oggdsf/src/tests/testLibOOOgg/TestPatternOggPacketChecker.cpp
Log:
* Start of a fix to make sure data never preceds header.

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp	2004-12-16 17:11:43 UTC (rev 8461)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp	2004-12-16 17:19:02 UTC (rev 8462)
@@ -40,6 +40,7 @@
 	,	mConvDenominator(1)
 	,	mConvScaleFactor(1)
 	,	mConvTheoraLogKeyFrameInterval(0)
+	,	mNumHeaders(0)
 {
 	//debugLog.open("G:\\logs\\oggmuxstream.log", ios_base::out);
 }
@@ -132,6 +133,14 @@
 	return true;
 }
 
+void OggMuxStream::setNumHeaders(unsigned long inNumHeaders) {
+	mNumHeaders = inNumHeaders;
+}
+unsigned long OggMuxStream::numHeaders() {
+	return 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:11:43 UTC (rev 8461)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.h	2004-12-16 17:19:02 UTC (rev 8462)
@@ -67,7 +67,9 @@
 	virtual void setIsActive(bool inIsActive);
 
 	virtual bool setConversionParams(LOOG_INT64 inNumerator, LOOG_INT64 inDenominator, LOOG_INT64 inScaleFactor, LOOG_INT64 inTheoraLogKFI);
-	bool setConversionParams(LOOG_INT64 inNumerator, LOOG_INT64 inDenominator, LOOG_INT64 inScaleFactor);
+	virtual bool setConversionParams(LOOG_INT64 inNumerator, LOOG_INT64 inDenominator, LOOG_INT64 inScaleFactor);
+	virtual void setNumHeaders(unsigned long inNumHeaders);
+	virtual unsigned long numHeaders();
 
 
 	LOOG_INT64 granuleNumerator();
@@ -86,6 +88,8 @@
 	LOOG_INT64 mConvScaleFactor;
 	LOOG_INT64 mConvTheoraLogKeyFrameInterval;
 
+	unsigned long mNumHeaders;
+
 	//fstream debugLog;
 	deque<OggPage*> mPageQueue;
 private:

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp	2004-12-16 17:11:43 UTC (rev 8461)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp	2004-12-16 17:19:02 UTC (rev 8462)
@@ -138,7 +138,8 @@
 						
 						(	(mInputStreams[i]->peekFront() != NULL) && 
 							((mInputStreams[i]->peekFront()->header()->GranulePos()) == -1) ) ||
-						(locTestLowTime < locCurrLowTime)
+						
+							(locTestLowTime < locCurrLowTime)
 						) 
 					{
 						

Modified: trunk/oggdsf/src/tests/testLibOOOgg/TestPatternOggPacketChecker.cpp
===================================================================
--- trunk/oggdsf/src/tests/testLibOOOgg/TestPatternOggPacketChecker.cpp	2004-12-16 17:11:43 UTC (rev 8461)
+++ trunk/oggdsf/src/tests/testLibOOOgg/TestPatternOggPacketChecker.cpp	2004-12-16 17:19:02 UTC (rev 8462)
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include ".\testpatternOggPacket.hecker.h"
+#include "TestPatternOggPacketChecker.h"
 
 TestPatternOggPacketChecker::TestPatternOggPacketChecker(void)
 {