[xiph-commits] r8494 - in trunk/oggdsf/src: lib/codecs/cmml/dsfCMMLRawSource lib/helper/libilliCore tools/OOOggPageInfo

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2004-12-19 07:39:01 -0800 (Sun, 19 Dec 2004)
New Revision: 8494

Modified:
   trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp
   trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.h
   trunk/oggdsf/src/lib/helper/libilliCore/iBE_Math.cpp
   trunk/oggdsf/src/tools/OOOggPageInfo/OOOggPageInfo.cpp
Log:
* Changed timestamp on CMML to 1000 based.
* removed a init but not ref warning.

Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp	2004-12-19 14:23:37 UTC (rev 8493)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp	2004-12-19 15:39:01 UTC (rev 8494)
@@ -9,10 +9,12 @@
 	mCMMLFormatBlock.granuleDenominator = 1;
 	mCMMLFormatBlock.granuleNumerator = 1000;
 
+	debugLog.open("G:\\logs\\cmmlrawsource.log", ios_base::out);
 }
 
 CMMLRawSourcePin::~CMMLRawSourcePin(void)
 {
+	debugLog.close();
 }
 
 STDMETHODIMP CMMLRawSourcePin::NonDelegatingQueryInterface(REFIID riid, void **ppv)
@@ -160,11 +162,12 @@
 
 	if (inTag->tagType() == C_CMMLTag::CLIP) {
 		C_ClipTag* locClip = (C_ClipTag*)inTag;
-		locStart = StringHelper::stringToNum(StringHelper::toNarrowStr(locClip->start())) * 10000000ULL;
+		locStart = StringHelper::stringToNum(StringHelper::toNarrowStr(locClip->start())) * 1000ULL;
 		
 		//TODO::: Do something better for handling of end times !!!!!!!!!!!!!!!!!!!!!!
 
-		locStop = StringHelper::stringToNum(StringHelper::toNarrowStr(locClip->start())) * 10000000ULL;
+		locStop = StringHelper::stringToNum(StringHelper::toNarrowStr(locClip->start())) * 1000ULL;
+		
 
 	}
 	locSample->SetActualDataLength(locNarrowStr.size());

Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.h	2004-12-19 14:23:37 UTC (rev 8493)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.h	2004-12-19 15:39:01 UTC (rev 8494)
@@ -71,7 +71,7 @@
 
 	virtual HRESULT deliverTag(C_CMMLTag* inTag);
 protected:
-	//fstream debugLog;
+	fstream debugLog;
 	HRESULT mFilterHR;
 	COutputQueue* mDataQueue;
 	sCMMLFormatBlock mCMMLFormatBlock;

Modified: trunk/oggdsf/src/lib/helper/libilliCore/iBE_Math.cpp
===================================================================
--- trunk/oggdsf/src/lib/helper/libilliCore/iBE_Math.cpp	2004-12-19 14:23:37 UTC (rev 8493)
+++ trunk/oggdsf/src/lib/helper/libilliCore/iBE_Math.cpp	2004-12-19 15:39:01 UTC (rev 8494)
@@ -53,7 +53,6 @@
 void iBE_Math::ULongToCharArr(unsigned long inLong, unsigned char* outCharArray)
 {
 	//Writes a long MSB (Most sig. byte first/leftmost) out to the char arr
-	unsigned long locLong = inLong;
 	outCharArray[0] = (unsigned char) (inLong >> 24);
 	outCharArray[1] = (unsigned char) ((inLong << 8) >> 24);
 	outCharArray[2] = (unsigned char) ((inLong << 16) >> 24);

Modified: trunk/oggdsf/src/tools/OOOggPageInfo/OOOggPageInfo.cpp
===================================================================
--- trunk/oggdsf/src/tools/OOOggPageInfo/OOOggPageInfo.cpp	2004-12-19 14:23:37 UTC (rev 8493)
+++ trunk/oggdsf/src/tools/OOOggPageInfo/OOOggPageInfo.cpp	2004-12-19 15:39:01 UTC (rev 8494)
@@ -123,7 +123,7 @@
 int main (int argc, char * argv[])
 #endif
 {
-	//This program just dumps the pages out of a file in ogg format.
+	//This program just gives some info about number of packets
 	// Currently does not error checking. Check your command line carefully !
 	// USAGE :: OOOggPageInfo <OggFile>
 	//