[xiph-commits] r7278 -

[illiminable at dactyl.lonelymoon.com]

trunk/oggdsf/src/lib/core/directshow/dsfOggMux
Message-ID: <20040723064102.B4FF89AAAB at dactyl.lonelymoon.com>

Author: illiminable
Date: Thu Jul 22 23:41:02 2004
New Revision: 7278

Modified:
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.cpp
Log:
* Update the muxer to accept flac.

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.cpp	2004-07-23 06:31:46 UTC (rev 7277)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.cpp	2004-07-23 06:41:00 UTC (rev 7278)
@@ -85,6 +85,9 @@
//Speex
sSpeexFormatBlock* locSpeex = (sSpeexFormatBlock*)inMediaType->pbFormat;
mMuxStream->setConversionParams(locSpeex->samplesPerSec, 1, 10000000);
+		} else if (inMediaType->subtype == MEDIASUBTYPE_FLAC) {
+			sFLACFormatBlock* locFLAC = (sFLACFormatBlock*)inMediaType->pbFormat;
+			mMuxStream->setConversionParams(locFLAC->samplesPerSec, 1, 10000000);
}
}
return S_OK;
@@ -104,6 +107,10 @@
outMediaType->majortype = MEDIATYPE_Audio;
outMediaType->subtype = MEDIASUBTYPE_Speex;
return S_OK;
+		case 3:
+			outMediaType->majortype = MEDIATYPE_Audio;
+			outMediaType->subtype = MEDIASUBTYPE_FLAC;
+			return S_OK;

default:
return VFW_S_NO_MORE_ITEMS;
@@ -122,6 +129,10 @@
(inMediaType->majortype == MEDIATYPE_Audio
&& inMediaType->subtype == MEDIASUBTYPE_Speex
&& inMediaType->formattype == FORMAT_Speex)
+			||
+			(inMediaType->majortype == MEDIATYPE_Audio
+				&&	inMediaType->subtype == MEDIASUBTYPE_FLAC
+				&&	inMediaType->formattype == FORMAT_FLAC)
) {
return S_OK;
} else {