[xiph-commits] r8652 - in trunk/oggdsf/src/lib: codecs/theora/libs/libOOTheora core/ogg/libOOOgg

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2005-01-07 05:54:08 -0800 (Fri, 07 Jan 2005)
New Revision: 8652

Modified:
   trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h
   trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp
Log:
* Make some functions protected in the ootheoradecoder... bad programmer, no cookie !
* Mark explicitly with a comment the 2 remaining warnings left in libOOOgg, that removing the warning needs verification.

Modified: trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h	2005-01-07 13:43:05 UTC (rev 8651)
+++ trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.h	2005-01-07 13:54:08 UTC (rev 8652)
@@ -42,19 +42,22 @@
 	TheoraDecoder(void);
 	~TheoraDecoder(void);
 
+	/// Initialise the internal theora decoder.
 	bool initCodec();
+
 	//bool resetPackCount();
 	//bool clearAll();
+
 	yuv_buffer* decodeTheora(StampedOggPacket* inPacket);
-	bool decodeHeader(StampedOggPacket* inHeaderPacket);
 
+	bool isKeyFrame(StampedOggPacket* inPacket);
+
+	theora_info mTheoraInfo;
+protected:
+
 	ogg_packet* simulateOldOggPacket(StampedOggPacket* inPacket);
 
-
-	bool isKeyFrame(StampedOggPacket* inPacket);
-	//unsigned char* convertYUV(yuv_buffer* inBuffer, unsigned long inFormat);
-		theora_info mTheoraInfo;
-protected:
+	bool decodeHeader(StampedOggPacket* inHeaderPacket);
 	//theora_info mTheoraInfo;
 	theora_comment mTheoraComment;
 	theora_state mTheoraState;

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp	2005-01-07 13:43:05 UTC (rev 8651)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp	2005-01-07 13:54:08 UTC (rev 8652)
@@ -319,7 +319,8 @@
 	// a) The (number of segments left * 255) take 1.
 	// b) The number of bytes less than the desired maximum page size.
 
-	//TODO::: What happens when mSegmentTableSize is 255 ?
+	
+	//***** WARNING 4018!!!!!! ::: TODO::: What happens when mSegmentTableSize is 255 ?
 
 	//Take 1 so when it adds the packet it doesn't try to consume one extra segment which doesn't exist.
     unsigned long locSpaceLeft =	MIN(((255 - mSegmentTableSize) * 255) - 1, mSettings->mMaxPageSize - mCurrentPageSize);
@@ -342,7 +343,7 @@
 	// a) How much space is left
 	// b) The amount of packet remaining.
 
-	//TODO::: Are we sure inRemaining can never be < 0
+	//**** WARING 4018 !!!! TODO::: Are we sure inRemaining can never be < 0
 	//If (a) is the minimum then we know that the how much we are adding is a multiple of 255.
 	unsigned long locHowMuchToAdd = MIN(locSpaceLeft, inRemaining);