[xiph-commits] r8464 - in trunk/oggdsf/src/lib/core/directshow: dsfAnxMux dsfOggMux

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2004-12-16 09:24:06 -0800 (Thu, 16 Dec 2004)
New Revision: 8464

Modified:
   trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.cpp
Log:
* More of the fix to avoid data preceding header.

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp	2004-12-16 17:19:33 UTC (rev 8463)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxMuxInputPin.cpp	2004-12-16 17:24:06 UTC (rev 8464)
@@ -82,6 +82,7 @@
 		//debugLog<<"Theo sample rate = "<<locTheora->frameRateNumerator<<" / "<<locTheora->frameRateDenominator<<endl;
 		//debugLog<<"Theo KFI = "<<locTheora->maxKeyframeInterval<<endl;
 		mMuxStream->setConversionParams(locTheora->frameRateNumerator, locTheora->frameRateDenominator, 10000000, locTheora->maxKeyframeInterval);
+		mMuxStream->setNumHeaders(3);
 		mPaginator.setNumHeaders(3);
 
 		locWasOK = true;
@@ -96,6 +97,7 @@
 			sVorbisFormatBlock* locVorbis = (sVorbisFormatBlock*)inMediaType->pbFormat;
 			//debugLog<<"Vorbis sample rate = "<<locVorbis->samplesPerSec<<endl;
 			mMuxStream->setConversionParams(locVorbis->samplesPerSec, 1, 10000000);
+			mMuxStream->setNumHeaders(3);
 			mPaginator.setNumHeaders(3);
 
 			locWasOK = true;
@@ -110,6 +112,7 @@
 			//Speex
 			sSpeexFormatBlock* locSpeex = (sSpeexFormatBlock*)inMediaType->pbFormat;
 			mMuxStream->setConversionParams(locSpeex->samplesPerSec, 1, 10000000);
+			mMuxStream->setNumHeaders(2);
 			mPaginator.setNumHeaders(2);
 
 
@@ -145,6 +148,7 @@
 			sCMMLFormatBlock* locCMML = (sCMMLFormatBlock*)inMediaType->pbFormat;
 			mMuxStream->setConversionParams(locCMML->granuleNumerator, locCMML->granuleDenominator, 10000000);
 			mPaginator.setNumHeaders(1);
+			mPaginator.setNumHeaders(1);
 
 
 			locWasOK = true;

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.cpp	2004-12-16 17:19:33 UTC (rev 8463)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.cpp	2004-12-16 17:24:06 UTC (rev 8464)
@@ -91,6 +91,7 @@
 		//debugLog<<"Theo sample rate = "<<locTheora->frameRateNumerator<<" / "<<locTheora->frameRateDenominator<<endl;
 		//debugLog<<"Theo KFI = "<<locTheora->maxKeyframeInterval<<endl;
 		mMuxStream->setConversionParams(locTheora->frameRateNumerator, locTheora->frameRateDenominator, 10000000, locTheora->maxKeyframeInterval);
+		mMuxStream->setNumHeaders(3);
 		mPaginator.setNumHeaders(3);
 	} else if (inMediaType->majortype == MEDIATYPE_Audio) {
 		if (inMediaType->subtype == MEDIASUBTYPE_Vorbis) {
@@ -98,12 +99,14 @@
 			sVorbisFormatBlock* locVorbis = (sVorbisFormatBlock*)inMediaType->pbFormat;
 			//debugLog<<"Vorbis sample rate = "<<locVorbis->samplesPerSec<<endl;
 			mMuxStream->setConversionParams(locVorbis->samplesPerSec, 1, 10000000);
+			mMuxStream->setNumHeaders(3);
 			mPaginator.setNumHeaders(3);
 			
 		} else if (inMediaType->subtype == MEDIASUBTYPE_Speex) {
 			//Speex
 			sSpeexFormatBlock* locSpeex = (sSpeexFormatBlock*)inMediaType->pbFormat;
 			mMuxStream->setConversionParams(locSpeex->samplesPerSec, 1, 10000000);
+			mMuxStream->setNumHeaders(2);
 			mPaginator.setNumHeaders(2);
 		} else if (inMediaType->subtype == MEDIASUBTYPE_OggFLAC_1_0) {
 			//We are connected to the encoder nd getting individual metadata packets.
@@ -126,6 +129,7 @@
 		if (inMediaType->subtype == MEDIASUBTYPE_CMML) {
 			sCMMLFormatBlock* locCMML = (sCMMLFormatBlock*)inMediaType->pbFormat;
 			mMuxStream->setConversionParams(locCMML->granuleNumerator,locCMML->granuleDenominator, 10000000);
+			mMuxStream->setNumHeaders(1);
 			mPaginator.setNumHeaders(1);
 
 		}