[xiph-commits] r11847 - in trunk/oggdsf: . src/lib/codecs/vorbis/filters/dsfVorbisDecoder

[illiminable at svn.xiph.org]

Author: illiminable
Date: 2006-09-21 03:11:21 -0700 (Thu, 21 Sep 2006)
New Revision: 11847

Modified:
   trunk/oggdsf/README
   trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.cpp
   trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.h
   trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h
Log:
* Implementation of IWMPTranscodePolicy... which doesn't actually exist despite being in the documentation. So it's commented out for now.

Modified: trunk/oggdsf/README
===================================================================
--- trunk/oggdsf/README	2006-09-20 15:33:37 UTC (rev 11846)
+++ trunk/oggdsf/README	2006-09-21 10:11:21 UTC (rev 11847)
@@ -145,13 +145,18 @@
     So you need to add to the include list (as you did above)
     $(DXSDK_DIR)include
 
- * WMP 10 SDK - At this time not required, but may be by
-    the time you read this if i forget to update this doc.
-    I'll try to remember!
+ * WMP 10 SDK - Need after 0.72 release.
 
    You can download from here
    http://msdn.microsoft.com/windowsmedia/downloads/default.aspx
 
+   You need to add the include path to visual studio. In
+   tools->options->projects and solutions->vC++ dirs
+ 
+
+   Add the WMP include path to the include list (drop down at top)
+   default install path will be c:\WMSDK\WMPSDK10\include
+
  * NASM 0.98.38/0.98.39 - This is required for flac. Best to
     install it to it's default at C:\NASM. Where "best to"
     means if you don't want to be screwing around.

Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.cpp	2006-09-20 15:33:37 UTC (rev 11846)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.cpp	2006-09-21 10:11:21 UTC (rev 11847)
@@ -78,6 +78,22 @@
 	//TODO::: Error check !
 }
 
+STDMETHODIMP VorbisDecodeFilter::NonDelegatingQueryInterface(REFIID riid, void **ppv)
+{
+	//if (riid == IID_IWMPTranscodePolicy) {
+	//	*ppv = (IWMPTranscodePolicy*)this;
+	//	((IUnknown*)*ppv)->AddRef();
+	//	return NOERROR;
+	//}
+
+	return AbstractTransformFilter::NonDelegatingQueryInterface(riid, ppv); 
+}
+
+//HRESULT VorbisDecodeFilter::allowTranscode(VARIANT_BOOL* outAllowTranscode)
+//{
+//    *outAllowTranscode = VARIANT_TRUE;
+//    return S_OK;
+//}
 bool VorbisDecodeFilter::ConstructPins() 
 {
 	//Vector to hold our set of media types we want to accept.

Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.h	2006-09-20 15:33:37 UTC (rev 11846)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeFilter.h	2006-09-21 10:11:21 UTC (rev 11847)
@@ -35,6 +35,8 @@
 #include "vorbisdecoderdllstuff.h"
 #include "AbstractTransformFilter.h"
 
+//#include "wmpservices.h"
+
 //Forward Declarations
 struct sVorbisFormatBlock;
 class VorbisDecodeInputPin;
@@ -44,6 +46,7 @@
 class VorbisDecodeFilter
 	//Base Classes
 	:	public AbstractTransformFilter
+    //,   public IWMPTranscodePolicy
 {
 public:
 	//Friends
@@ -54,6 +57,14 @@
 	VorbisDecodeFilter(void);
 	virtual ~VorbisDecodeFilter(void);
 
+
+	DECLARE_IUNKNOWN
+	STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void **ppv);
+
+    //IWMPTranscodePolicy interface -- it's documented... but it doesn't really exist.
+    //HRESULT allowTranscode(VARIANT_BOOL* outAllowTranscode);
+
+
 	///COM CreateInstance Function
 	static CUnknown* WINAPI CreateInstance(LPUNKNOWN pUnk, HRESULT *pHr);
 

Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h	2006-09-20 15:33:37 UTC (rev 11846)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisDecoder/VorbisDecodeInputPin.h	2006-09-21 10:11:21 UTC (rev 11847)
@@ -41,6 +41,8 @@
 #include "VorbisDecodeInputPin.h"
 #include "VorbisDecodeFilter.h"
 
+
+
 #ifdef USING_TREMOR
 #include "TremorDecoder.h"
 #define VorbisDecoder TremorDecoder