[xiph-commits] r8530 - in trunk/oggdsf: docs/doxygen src/lib/core/ogg/libOOOggSeek src/lib/helper/libilliCore unix

ozone at motherfish-iii.xiph.org ozone at motherfish-iii.xiph.org
Fri Dec 24 10:51:32 PST 2004


Author: ozone
Date: 2004-12-24 10:51:31 -0800 (Fri, 24 Dec 2004)
New Revision: 8530

Modified:
   trunk/oggdsf/docs/doxygen/oggdsf.doxy
   trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp
   trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.h
   trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.cpp
   trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.h
   trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.h
   trunk/oggdsf/unix/Makefile.am
   trunk/oggdsf/unix/configure.ac
Log:
oggdsf:

 * Doxygen can be quiet unless it has something to whine abuot
 * Very tiny attempt at documentation ;)
 * Unix stuff:
   * Make automake 1.9 happy
   * Make Makefile.am a bit more maintainable
   * Build AnxCutter tool (untested, apart from autoreconf succeeding ...)


Modified: trunk/oggdsf/docs/doxygen/oggdsf.doxy
===================================================================
--- trunk/oggdsf/docs/doxygen/oggdsf.doxy	2004-12-23 10:18:20 UTC (rev 8529)
+++ trunk/oggdsf/docs/doxygen/oggdsf.doxy	2004-12-24 18:51:31 UTC (rev 8530)
@@ -70,7 +70,7 @@
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
-QUIET                  = NO
+QUIET                  = YES
 WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = NO
 WARN_IF_DOC_ERROR      = YES

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp	2004-12-23 10:18:20 UTC (rev 8529)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp	2004-12-24 18:51:31 UTC (rev 8530)
@@ -245,10 +245,13 @@
 	}
 }
 
-LOOG_INT64 AutoOggSeekTable::fileDuration() {
+LOOG_INT64 AutoOggSeekTable::fileDuration()
+{
 	return mFileDuration;
 }
-bool AutoOggSeekTable::buildTable() {
+
+bool AutoOggSeekTable::buildTable()
+{
 	//HACK::: To ensure we don't try and build a table on the network file.
 	//debugLog<<"Anx Build table : "<<mFileName<<endl;
 	if (mFileName.find("http") != 0) {

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.h	2004-12-23 10:18:20 UTC (rev 8529)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.h	2004-12-24 18:51:31 UTC (rev 8530)
@@ -57,14 +57,18 @@
 	static const LOOG_INT64 DS_UNITS = 10000000;
 	static const unsigned long LINT_MAX = 4294967295UL;
 
+	/// Builds the actual seek table: only works if we have random access to the file
 	virtual bool buildTable();
 
 	//IOggCallback interface
 	virtual bool acceptOggPage(OggPage* inOggPage);
 
+	/// The duration of the file, in DirectShow time units
 	LOOG_INT64 fileDuration();
 
 	unsigned long serialisedSize();
+
+	/// Serialise the seek table into a memory buffer, which may be useful for e.g. caching
 	bool serialiseInto(unsigned char* inBuff, unsigned long inBuffSize);
 
 protected:

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.cpp	2004-12-23 10:18:20 UTC (rev 8529)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.cpp	2004-12-24 18:51:31 UTC (rev 8530)
@@ -62,10 +62,15 @@
 //	return mRealStartPos;
 //
 //}
+/** Returns a tSeekPair whose first element is the
+    actual closest possible time that can be seeked to (which will always be either before or at
+    the requested seek position).  The second element is the number of bytes into the stream where
+    the first page of the actual seek time occurs. */
 OggSeekTable::tSeekPair OggSeekTable::getStartPos(LOOG_INT64 inTime) {
-	 return *(--(mSeekMap.upper_bound(inTime)));
+	// Finds the upper bound of the requested time in mSeekMap, which will always be in the range
+	// (0, maxItems], and return the element _before_ the upper bound
+    return *(--(mSeekMap.upper_bound(inTime)));
 	 //mRealStartPos = locValue.first;
 	 //stDebug<<"Get Point : Time Req = "<<inTime<<"   --   Time Given = "<<mRealStartPos<<"   --   Byte Pos : "<<locValue.second<<endl;
 	 //return locValue.second;
-	
 }

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.h	2004-12-23 10:18:20 UTC (rev 8529)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/OggSeekTable.h	2004-12-24 18:51:31 UTC (rev 8530)
@@ -48,6 +48,8 @@
 	typedef pair<LOOG_INT64, unsigned long> tSeekPair;
 
 	bool addSeekPoint(LOOG_INT64 inTime, unsigned long mStartPos);
+
+	/// Given a requested seek time in nanoseconds, returns the closest time and byte to the seek time.
 	tSeekPair getStartPos(LOOG_INT64 inTime);
 	//LOOG_INT64 getRealStartPos();
 

Modified: trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.h
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.h	2004-12-23 10:18:20 UTC (rev 8529)
+++ trunk/oggdsf/src/lib/helper/libilliCore/StringHelper.h	2004-12-24 18:51:31 UTC (rev 8530)
@@ -32,7 +32,9 @@
 #pragma once
 
 #include "illicoreconfig.h"
+
 #include <string>
+
 using namespace std;
 
 class StringHelper

Modified: trunk/oggdsf/unix/Makefile.am
===================================================================
--- trunk/oggdsf/unix/Makefile.am	2004-12-23 10:18:20 UTC (rev 8529)
+++ trunk/oggdsf/unix/Makefile.am	2004-12-24 18:51:31 UTC (rev 8530)
@@ -2,15 +2,32 @@
 
 AM_CXXFLAGS = -w
 
-bin_PROGRAMS = OOOggDump OOOggValidate OOOggStat OOOggChainSplitter OOOggCommentDump OOOggSeekFileMaker OOOggSeekFileReader
+NULL =
 
-lib_LTLIBRARIES = libilliCore.la libOOOgg.la libVorbisComment.la libOOOggSeek.la
+bin_PROGRAMS = \
+	OOOggDump \
+	OOOggValidate \
+	OOOggStat \
+	OOOggChainSplitter \
+	OOOggCommentDump \
+	OOOggSeekFileMaker \
+	OOOggSeekFileReader \
+	AnxCutter \
+	$(NULL)
 
+lib_LTLIBRARIES = \
+	libilliCore.la \
+	libOOOgg.la \
+	libOOOggSeek.la \
+	libVorbisComment.la \
+	$(NULL)
+
 INCLUDES = \
 	   -I at top_srcdir@/../src/lib/helper/libilliCore \
 	   -I at top_srcdir@/../src/lib/core/ogg/libOOOgg \
 	   -I at top_srcdir@/../src/lib/core/ogg/libOOOggSeek \
-	   -I at top_srcdir@/../src/lib/core/ogg/libVorbisComment
+	   -I at top_srcdir@/../src/lib/core/ogg/libVorbisComment \
+	   $(NULL)
 
 libOOOggSeek_la_LIBADD = libOOOgg.la
 libOOOggSeek_la_SOURCES = \
@@ -19,19 +36,22 @@
 	../src/lib/core/ogg/libOOOggSeek/OggBinarySeeker.cpp \
 	../src/lib/core/ogg/libOOOggSeek/OggSeekPoint.cpp \
 	../src/lib/core/ogg/libOOOggSeek/OggSeekTable.cpp \
-	../src/lib/core/ogg/libOOOggSeek/OGGSRecogniser.cpp
+	../src/lib/core/ogg/libOOOggSeek/OGGSRecogniser.cpp \
+	$(NULL)
 
 libVorbisComment_la_LIBADD = libOOOgg.la
 libVorbisComment_la_SOURCES = \
 	../src/lib/core/ogg/libVorbisComment/FileComments.cpp \
 	../src/lib/core/ogg/libVorbisComment/SingleVorbisComment.cpp \
 	../src/lib/core/ogg/libVorbisComment/StreamCommentInfo.cpp \
-	../src/lib/core/ogg/libVorbisComment/VorbisComments.cpp
+	../src/lib/core/ogg/libVorbisComment/VorbisComments.cpp \
+	$(NULL)
 	
 libilliCore_la_SOURCES = \
 	../src/lib/helper/libilliCore/StringHelper.cpp \
 	../src/lib/helper/libilliCore/iBE_Math.cpp \
-	../src/lib/helper/libilliCore/iLE_Math.cpp
+	../src/lib/helper/libilliCore/iLE_Math.cpp \
+	$(NULL)
 
 libOOOgg_la_LIBADD = libilliCore.la
 libOOOgg_la_SOURCES = \
@@ -45,36 +65,48 @@
 	../src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp \
 	../src/lib/core/ogg/libOOOgg/OggPaginator.cpp \
 	../src/lib/core/ogg/libOOOgg/OggPaginatorSettings.cpp \
-	../src/lib/core/ogg/libOOOgg/StampedOggPacket.cpp
+	../src/lib/core/ogg/libOOOgg/StampedOggPacket.cpp \
+	$(NULL)
 
 OOOggDump_LDADD = libOOOgg.la
 OOOggDump_SOURCES = \
-	../src/tools/OOOggDump/OOOggDump.cpp
+	../src/tools/OOOggDump/OOOggDump.cpp \
+	$(NULL)
 
 OOOggValidate_LDADD = libOOOgg.la
 OOOggValidate_SOURCES = \
 	../src/tools/OOOggValidate/OOOggValidate.cpp \
 	../src/tools/OOOggValidate/OggStreamValidationState.cpp \
-	../src/tools/OOOggValidate/OggValidationState.cpp
+	../src/tools/OOOggValidate/OggValidationState.cpp \
+	$(NULL)
 
 OOOggStat_LDADD = libOOOgg.la
 OOOggStat_SOURCES = \
-	../src/tools/OOOggStat/OOOggStat.cpp
+	../src/tools/OOOggStat/OOOggStat.cpp \
+	$(NULL)
 
 OOOggChainSplitter_LDADD = libOOOgg.la libVorbisComment.la
 OOOggChainSplitter_SOURCES = \
-	../src/tools/oggChainSplitter/oggChainSplitter.cpp
+	../src/tools/oggChainSplitter/oggChainSplitter.cpp \
+	$(NULL)
 
 OOOggCommentDump_LDADD = libOOOgg.la libVorbisComment.la
 OOOggCommentDump_SOURCES = \
-	../src/tools/OOOggCommentDump/OOOggCommentDump.cpp
+	../src/tools/OOOggCommentDump/OOOggCommentDump.cpp \
+	$(NULL)
 
 OOOggSeekFileMaker_LDADD = libOOOgg.la libOOOggSeek.la
 OOOggSeekFileMaker_SOURCES = \
-	../src/tools/OOOggSeekFileMaker/OOOggSeekFileMaker.cpp
+	../src/tools/OOOggSeekFileMaker/OOOggSeekFileMaker.cpp \
+	$(NULL)
 
 OOOggSeekFileReader_LDADD = libOOOgg.la libOOOggSeek.la
 OOOggSeekFileReader_SOURCES = \
-	../src/tools/OOOggSeekFileReader/OOOggSeekFileReader.cpp
+	../src/tools/OOOggSeekFileReader/OOOggSeekFileReader.cpp \
+	$(NULL)
 
+AnxCutter_LDADD = libOOOgg.la libOOOggSeek.la
+AnxCutter_SOURCES = \
+	../src/tools/AnxCutter/AnxCutter.cpp \
+	$(NULL)
 

Modified: trunk/oggdsf/unix/configure.ac
===================================================================
--- trunk/oggdsf/unix/configure.ac	2004-12-23 10:18:20 UTC (rev 8529)
+++ trunk/oggdsf/unix/configure.ac	2004-12-24 18:51:31 UTC (rev 8530)
@@ -1,6 +1,6 @@
 AC_INIT(../src/lib/core/ogg/libOOOgg/OggPacket.cpp)
+AC_CONFIG_AUX_DIR(autotools)
 AM_INIT_AUTOMAKE(libOOOgg,0.1)
-AC_CONFIG_AUX_DIR(autotools)
 AC_PROG_CXX
 AC_PROG_INSTALL
 AM_PROG_LIBTOOL



More information about the commits mailing list