[xiph-commits] r8492 - trunk/oggdsf/src/lib/core/ogg/libOOOgg

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2004-12-19 04:17:23 -0800 (Sun, 19 Dec 2004)
New Revision: 8492

Modified:
   trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp
   trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp
   trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h
Log:
* Unsigned != Signed
* 32 bits != 64 bits
* Fixed timing bug.

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp	2004-12-19 11:23:17 UTC (rev 8491)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp	2004-12-19 12:17:23 UTC (rev 8492)
@@ -109,8 +109,8 @@
 }
 
 LOOG_INT64 OggMuxStream::convertTime(LOOG_INT64 inGranulePos) {
-	LOOG_INT64 retTime = INT64_MAX;
-	if (inGranulePos != INT64_MAX) {
+	LOOG_INT64 retTime = -1;
+	if (inGranulePos != -1) {
 		if (mIsSensibleTime) {
 			retTime = (inGranulePos * mConvScaleFactor * mConvDenominator) / mConvNumerator;
 		} else {

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp	2004-12-19 11:23:17 UTC (rev 8491)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp	2004-12-19 12:17:23 UTC (rev 8492)
@@ -157,8 +157,9 @@
 							//(!locLowestStream->peekFront()->header()->isBOS()) ) ||
 							(mInputStreams[i]->packetsSent() < locLowestStream->packetsSent()) ) ||
 						
-							(locTestLowTime < locCurrLowTime)
-						) 
+						(
+							(locTestLowTime < locCurrLowTime))
+					   ) 
 					{
 						
 						//DeBUGGIN BLOCK

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h	2004-12-19 11:23:17 UTC (rev 8491)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.h	2004-12-19 12:17:23 UTC (rev 8492)
@@ -87,7 +87,7 @@
 	unsigned char* mHeaderBuff;
 	fstream debugLog;
 
-	unsigned long mLastGranulePos;
+	LOOG_INT64 mLastGranulePos;
 
 private:
 	OggPaginator& operator=(const OggPaginator& other);  /* Don't assign me */