[xiph-commits] r8324 - trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder

illiminable at motherfish-iii.xiph.org illiminable at motherfish-iii.xiph.org
Tue Nov 30 23:00:45 PST 2004


Author: illiminable
Date: 2004-11-30 23:00:45 -0800 (Tue, 30 Nov 2004)
New Revision: 8324

Modified:
   trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.cpp
Log:
* Removed the subtitle rendering part from cmml decoder for now.

Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.cpp	2004-12-01 06:52:08 UTC (rev 8323)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.cpp	2004-12-01 07:00:45 UTC (rev 8324)
@@ -228,14 +228,21 @@
 			if (locParseOK) {
 				//debugLog<<"          : Parse OK"<<endl;
 
-				locHR = outSample->GetPointer(&locOutBuff);
-				locTextSize = mHeadTag->title()->text().size();
-				locTextStr = mHeadTag->title()->text();
+				//:::Comment out the subtitle sending for now.
+				//------------------------------------------------------------
+				//locHR = outSample->GetPointer(&locOutBuff);
+				//locTextSize = mHeadTag->title()->text().size();
+				//locTextStr = mHeadTag->title()->text();
+				//
+				////debugLog<<"            : Title Text = "<<locTextStr<<endl;
+				//memcpy((void*)locOutBuff, (const void*) locTextStr.c_str(), locTextSize);
+				//locOutBuff[locTextSize] = '\0';
+				//outSample->SetActualDataLength(locTextSize + 1);
+				//------------------------------------------------------------
+				outSample->SetActualDataLength(0);
+				//------------------------------------------------------------
 				
-				//debugLog<<"            : Title Text = "<<locTextStr<<endl;
-				memcpy((void*)locOutBuff, (const void*) locTextStr.c_str(), locTextSize);
-				locOutBuff[locTextSize] = '\0';
-				outSample->SetActualDataLength(locTextSize + 1);
+
 				if (mCMMLCallbacks != NULL) {
 					mCMMLCallbacks->headCallback(mHeadTag->clone());
 				}
@@ -251,23 +258,26 @@
 			if (locParseOK) {
 				//debugLog<<"          : Parse OK"<<endl;
 			
-
-				locHR = outSample->GetPointer(&locOutBuff);
-				locTextSize = locClipTag.anchor()->text().size();
-				locTextStr = locClipTag.anchor()->text();
-				memcpy((void*)locOutBuff, (const void*) locTextStr.c_str(), locTextSize);
-				
-				//debugLog << "               : Clip Text = "<<locTextStr<<endl;
-				locOutBuff[locTextSize] = '\0';
-				outSample->SetActualDataLength(locTextSize + 1);
-				//debugLog<<"Setting Sample time "<<locClipTag.start()<<endl;
-				//LONGLONG locSampleTime = ;
-				outSample->SetTime(&locSampleTime, &locSampleTime);
-				outSample->SetMediaTime(NULL, NULL);
-				outSample->SetSyncPoint(TRUE);
-				outSample->SetDiscontinuity(FALSE);
-				outSample->SetPreroll(FALSE);
-
+				//::: Comment out the subtitle part for now
+				//------------------------------------------------------------
+				//locHR = outSample->GetPointer(&locOutBuff);
+				//locTextSize = locClipTag.anchor()->text().size();
+				//locTextStr = locClipTag.anchor()->text();
+				//memcpy((void*)locOutBuff, (const void*) locTextStr.c_str(), locTextSize);
+				//
+				////debugLog << "               : Clip Text = "<<locTextStr<<endl;
+				//locOutBuff[locTextSize] = '\0';
+				//outSample->SetActualDataLength(locTextSize + 1);
+				////debugLog<<"Setting Sample time "<<locClipTag.start()<<endl;
+				////LONGLONG locSampleTime = ;
+				//outSample->SetTime(&locSampleTime, &locSampleTime);
+				//outSample->SetMediaTime(NULL, NULL);
+				//outSample->SetSyncPoint(TRUE);
+				//outSample->SetDiscontinuity(FALSE);
+				//outSample->SetPreroll(FALSE);
+				//------------------------------------------------------------
+				outSample->SetActualDataLength(0);
+				//------------------------------------------------------------
 				if (mCMMLCallbacks != NULL) {
 					mCMMLCallbacks->clipCallback(locClipTag.clone());
 				}



More information about the commits mailing list