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

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2004-12-16 10:43:33 -0800 (Thu, 16 Dec 2004)
New Revision: 8474

Modified:
   trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.cpp
   trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp
Log:
* More changes to ensure no data before header

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.cpp	2004-12-16 18:04:16 UTC (rev 8473)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.cpp	2004-12-16 18:43:33 UTC (rev 8474)
@@ -76,6 +76,7 @@
 void AnxPageInterleaver::addAllAnxData_2_0_BOS() {
 	for (int i = 0; i < mInputStreams.size() - 1; i++) {
 		mFileWriter->acceptOggPage(mInputStreams[i]->popFront());
+		mInputStreams[i]->setNumHeaders(mInputStreams[i]->numHeaders() + 1);
 	}
 
 }

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp	2004-12-16 18:04:16 UTC (rev 8473)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp	2004-12-16 18:43:33 UTC (rev 8474)
@@ -139,7 +139,8 @@
 						(	(mInputStreams[i]->peekFront() != NULL) && 
 							((mInputStreams[i]->peekFront()->header()->GranulePos()) == -1) ) ||
 							
-							(	(mInputStreams[i]->sentAllHeaders()) ) ||
+						(	(mInputStreams[i]->peekFront() != NULL) && 
+							(!mInputStreams[i]->sentAllHeaders()) ) ||
 						
 							(locTestLowTime < locCurrLowTime)
 						) 
@@ -155,6 +156,8 @@
 			throw 0;
 		} else {
 			//debugLog<<"writeLowest : Writing..."<<endl;
+
+			//TODO::: Handle case where the popped page is a null pointer.
 			mFileWriter->acceptOggPage(locLowestStream->popFront());		//Gives away page
 		}