[xiph-commits] r7146 - trunk/oggdsf/src/lib/core/ogg/libOOOggSeek

[illiminable at dactyl.lonelymoon.com]

Author: illiminable
Date: Thu Jul 15 16:10:32 2004
New Revision: 7146

Modified:
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoAnxSeekTable.cpp
Log:
* Seeking now in annodex... though something is not quite right... there are dead spots, where if you seek to them, the graph blocks. Something to do with the CMML filter... because without it, there is no problem.

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoAnxSeekTable.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoAnxSeekTable.cpp	2004-07-15 21:36:56 UTC (rev 7145)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoAnxSeekTable.cpp	2004-07-15 23:10:30 UTC (rev 7146)
@@ -17,10 +17,12 @@

//IOggCallback interface
bool AutoAnxSeekTable::acceptOggPage(OggPage* inOggPage) {
+	//FIX::: This is serious mess !
if (mSeenAnything == false) {
if (strncmp((const char*)inOggPage->getPacket(0)->packetData(), "Annodex", 7) == 0) {
mAnnodexSerialNo = inOggPage->header()->StreamSerialNo();
mSeenAnything = true;
+			mFilePos += inOggPage->pageSize();
return true;
//Need to grab other info here.
} else {
@@ -31,6 +33,7 @@
if ((mAnnodexSerialNo == inOggPage->header()->StreamSerialNo()) && ((inOggPage->header()->HeaderFlags() & 4) != 0)) {
//This is the EOS o the annodex section... everything that follows is ogg like
mReadyForOgg = true;
+		mFilePos += inOggPage->pageSize();
return true;
}

@@ -46,10 +49,13 @@
if (mReadyForOgg) {
if (mSkippedCMML == false) {
mSkippedCMML = true;
+			mFilePos += inOggPage->pageSize();
return true;
} else {
return AutoOggSeekTable::acceptOggPage(inOggPage);
}
+	} else {
+		mFilePos += inOggPage->pageSize();
}

return true;