[xiph-commits] r8416 - in trunk/oggdsf/src/lib: codecs/cmml/dsfCMMLRawSource core/directshow/dsfAnxMux

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2004-12-15 09:01:09 -0800 (Wed, 15 Dec 2004)
New Revision: 8416

Modified:
   trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPacketMaker.cpp
Log:
* Fix annodex muxer, so it makes anxdata headers for CMML.

Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.cpp	2004-12-15 16:40:32 UTC (rev 8415)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.cpp	2004-12-15 17:01:09 UTC (rev 8416)
@@ -147,6 +147,7 @@
 			mCMMLSourcePin->deliverTag(mCMMLDoc->root()->clipList()->getTag(mUptoTag));
 		} else {
 			mCMMLSourcePin->DeliverEndOfStream();
+			return S_OK;
 		}
 		mUptoTag++;
 

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp	2004-12-15 16:40:32 UTC (rev 8415)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp	2004-12-15 17:01:09 UTC (rev 8416)
@@ -106,6 +106,20 @@
 		//} 
 
 		
+	} else if(inMediaType->majortype == MEDIATYPE_Text) {
+		if (inMediaType->subtype == MEDIASUBTYPE_CMML) {
+			//CMML
+			sCMMLFormatBlock* locCMML = (sCMMLFormatBlock*)inMediaType->pbFormat;
+			mMuxStream->setConversionParams(locCMML->granuleNumerator, locCMML->granuleDenominator, 10000000);
+			mPaginator.setNumHeaders(1);
+
+
+			locWasOK = true;
+			locGranRateNum = locCMML->granuleNumerator;
+			locGranRateDenom = locCMML->granuleDenominator;
+			locNumHeaders = 1;
+			locCodecID = StreamHeaders::CMML;			
+		}
 	}
 	if (locWasOK) {
 		//Save the packet, we'll push it into the stream when the connection is established

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPacketMaker.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPacketMaker.cpp	2004-12-15 16:40:32 UTC (rev 8415)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPacketMaker.cpp	2004-12-15 17:01:09 UTC (rev 8416)
@@ -232,6 +232,10 @@
 			locTempString = "Content-type: video/x-ogm";
 			retVector.push_back(locTempString);
 			break;
+		case StreamHeaders::CMML:
+			locTempString = "Content-type: text/x-cmml";
+			retVector.push_back(locTempString);
+			break;
 		case StreamHeaders::NONE:
 		default:
 			break;