[xiph-commits] r8798 - in trunk/oggdsf: sln/oggdsf_all src/lib/codecs/cmml/dsfCMMLRawSource

illiminable at motherfish-iii.xiph.org illiminable at motherfish-iii.xiph.org
Thu Jan 27 07:59:40 PST 2005


Author: illiminable
Date: 2005-01-27 07:59:28 -0800 (Thu, 27 Jan 2005)
New Revision: 8798

Modified:
   trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
   trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.cpp
   trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.h
   trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp
   trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/dsfCMMLRawSource.vcproj
Log:
* Add CMML parsing to raw source.

Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2005-01-27 15:07:06 UTC (rev 8797)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2005-01-27 15:59:28 UTC (rev 8798)
@@ -988,6 +988,7 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfCMMLRawSource", "..\..\src\lib\codecs\cmml\dsfCMMLRawSource\dsfCMMLRawSource.vcproj", "{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}"
 	ProjectSection(ProjectDependencies) = postProject
+		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
 		{899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
 		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}

Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.cpp	2005-01-27 15:07:06 UTC (rev 8797)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.cpp	2005-01-27 15:59:28 UTC (rev 8798)
@@ -159,8 +159,16 @@
 			tTrackMap::iterator locIt = mTrackMap.find(locTrackName);
 			if (locIt != mTrackMap.end()) {
 				//There's an entry for this track in the map.
-				__int64 locStartTime = StringHelper::stringToNum(StringHelper::toNarrowStr(locClip->start()));
 				
+				
+				//__int64 locStartTime = StringHelper::stringToNum(StringHelper::toNarrowStr(locClip->start()));
+				//Temporal URI Changes :::
+				
+				C_TimeStamp locStamp;
+				locStamp.parseTimeStamp(StringHelper::toNarrowStr(locClip->start()));
+				__int64 locStartTime = locStamp.toHunNanos();
+				//
+
 				if (locStartTime <= locIt->second) {
 					//The start time of this clip is before the potential end time we saved.
 					// This means the end time means nothing, and we can ignore it and remove from the map.
@@ -183,7 +191,14 @@
 			//If this clip has an end time we can add it's end time to the map
 			if (locClip->end() != L"") {
 				//There's a specified end time on this clip, so hold on to it
-				__int64 locEndTime = StringHelper::stringToNum(StringHelper::toNarrowStr(locClip->end()));
+				
+				//Temporal changes...
+				//__int64 locEndTime = StringHelper::stringToNum(StringHelper::toNarrowStr(locClip->end()));
+				C_TimeStamp locStamp;
+				locStamp.parseTimeStamp(StringHelper::toNarrowStr(locClip->end()));
+				__int64 locEndTime = locStamp.toHunNanos();
+				//
+
 				mTrackMap.insert(tTrackMap::value_type(locTrackName, locEndTime));
 			}
 			

Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.h	2005-01-27 15:07:06 UTC (rev 8797)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.h	2005-01-27 15:59:28 UTC (rev 8798)
@@ -4,6 +4,7 @@
 #include <map>
 #include <libCMMLParse/libCMMLParse.h>
 #include <libCMMLParse/CMMLParser.h>
+#include <libTemporalURI/C_TimeStamp.h>
 #include "CMMLRawSourcePin.h"
 using namespace std;
 

Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp	2005-01-27 15:07:06 UTC (rev 8797)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp	2005-01-27 15:59:28 UTC (rev 8798)
@@ -165,11 +165,17 @@
 
 	if (inTag->tagType() == C_CMMLTag::CLIP) {
 		C_ClipTag* locClip = (C_ClipTag*)inTag;
-		locStart = StringHelper::stringToNum(StringHelper::toNarrowStr(locClip->start())) * 1000ULL;
+		C_TimeStamp locStartStamp;
+		locStartStamp.parseTimeStamp(StringHelper::toNarrowStr(locClip->start()));
+		//locStart = StringHelper::stringToNum(StringHelper::toNarrowStr(locClip->start())) * 1000ULL;
+		locStart = locStartStamp.toHunNanos() / 10000;
 		
 		//TODO::: Do something better for handling of end times !!!!!!!!!!!!!!!!!!!!!!
 
-		locStop = StringHelper::stringToNum(StringHelper::toNarrowStr(locClip->start())) * 1000ULL;
+		C_TimeStamp locEndStamp;
+		locEndStamp.parseTimeStamp(StringHelper::toNarrowStr(locClip->start()));
+		locStop = locEndStamp.toHunNanos() / 10000;
+		//locStop = StringHelper::stringToNum(StringHelper::toNarrowStr(locClip->start())) * 1000ULL;
 		
 
 	}

Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/dsfCMMLRawSource.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/dsfCMMLRawSource.vcproj	2005-01-27 15:07:06 UTC (rev 8797)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/dsfCMMLRawSource.vcproj	2005-01-27 15:59:28 UTC (rev 8798)
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses&quot;;C:\DXSDK\Include;..\..\..\helper;..\..\cmml;..\..\cmml"
+				AdditionalIncludeDirectories="&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses&quot;;C:\DXSDK\Include;..\..\..\helper;..\..\cmml"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSFCMMLRAWSOURCE_EXPORTS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -73,7 +73,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses&quot;;C:\DXSDK\Include;..\..\..\helper;..\..\cmml;..\..\cmml"
+				AdditionalIncludeDirectories="&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses&quot;;C:\DXSDK\Include;..\..\..\helper;..\..\cmml"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFCMMLRAWSOURCE_EXPORTS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="3"
@@ -127,7 +127,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				OptimizeForProcessor="3"
-				AdditionalIncludeDirectories="&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses&quot;;C:\DXSDK\Include;..\..\..\helper;..\..\cmml;..\..\cmml"
+				AdditionalIncludeDirectories="&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses&quot;;C:\DXSDK\Include;..\..\..\helper;..\..\cmml"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFCMMLRAWSOURCE_EXPORTS"
 				RuntimeLibrary="2"
 				EnableEnhancedInstructionSet="2"
@@ -182,7 +182,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				OptimizeForProcessor="3"
-				AdditionalIncludeDirectories="&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses&quot;;C:\DXSDK\Include;..\..\..\helper;..\..\cmml;..\..\cmml"
+				AdditionalIncludeDirectories="&quot;C:\DXSDK\Samples\C++\DirectShow\BaseClasses&quot;;C:\DXSDK\Include;..\..\..\helper;..\..\cmml"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSFCMMLRAWSOURCE_EXPORTS"
 				RuntimeLibrary="2"
 				EnableEnhancedInstructionSet="1"



More information about the commits mailing list