[xiph-commits] r10271 - in branches/oggdsf_new_demux/src/lib: codecs/vorbis/filters/dsfVorbisDecoder core/directshow/dsfOggDemux2

[illiminable at svn.xiph.org]

Author: illiminable
Date: 2005-10-23 04:56:06 -0700 (Sun, 23 Oct 2005)
New Revision: 10271

Modified:
   branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeOutputPin.cpp
   branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/vorbisdecoderdllstuff.h
   branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp
Log:
* Expose IOggDecoder through vorbis decoders queryinterface

Modified: branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeOutputPin.cpp
===================================================================
--- branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeOutputPin.cpp	2005-10-23 11:44:05 UTC (rev 10270)
+++ branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeOutputPin.cpp	2005-10-23 11:56:06 UTC (rev 10271)
@@ -50,6 +50,11 @@
 		*ppv = (IMediaSeeking*)this;
 		((IUnknown*)*ppv)->AddRef();
 		return NOERROR;
+	} else if (riid == IID_IOggDecoder) {
+		*ppv = (IOggDecoder*)this;
+		((IUnknown*)*ppv)->AddRef();
+		return NOERROR;
+
 	}
 
 	return CBaseOutputPin::NonDelegatingQueryInterface(riid, ppv); 

Modified: branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/vorbisdecoderdllstuff.h
===================================================================
--- branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/vorbisdecoderdllstuff.h	2005-10-23 11:44:05 UTC (rev 10270)
+++ branches/oggdsf_new_demux/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/vorbisdecoderdllstuff.h	2005-10-23 11:56:06 UTC (rev 10271)
@@ -79,6 +79,10 @@
 DEFINE_GUID(FORMAT_OggIdentHeader, 
 0x95388704, 0x162c, 0x42a9, 0x81, 0x49, 0xc3, 0x57, 0x7c, 0x12, 0xaa, 0xf9);
 
+// {43F0F818-10B0-4c86-B9F1-F6B6E2D33462}
+DEFINE_GUID(IID_IOggDecoder, 
+0x43f0f818, 0x10b0, 0x4c86, 0xb9, 0xf1, 0xf6, 0xb6, 0xe2, 0xd3, 0x34, 0x62);
+
 const REGPINTYPES VorbisDecodeOutputTypes = {
     &MEDIATYPE_Audio,
 	&MEDIASUBTYPE_PCM

Modified: branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp
===================================================================
--- branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp	2005-10-23 11:44:05 UTC (rev 10270)
+++ branches/oggdsf_new_demux/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp	2005-10-23 11:56:06 UTC (rev 10271)
@@ -302,8 +302,8 @@
 	}
 	
 	//mStreamMapper->setAllowDispatch(true);
-	//mStreamMapper->toStartOfData();			//Flushes all streams and sets them to ignore the right number of headers.
-	//mOggBuffer.clearData();
+	//mStreamMapper->();			//Flushes all streams and sets them to ignore the right number of headers.
+	mOggBuffer.clearData();
 	//mDataSource->seek(0);			//TODO::: This is bad for streams.
 
 	//debugLog<<"COMPLETED SETUP"<<endl;