Removes trailing spaces. Removes tabs.

[vlc] / modules / codec / dmo / dmo.h

diff --git a/modules/codec/dmo/dmo.h b/modules/codec/dmo/dmo.h
index 1333b60137ced9d7426a27ddbb447f65752a217b..658b2eab843ab19b284ea908a3720787c86ea8ca 100644 (file)
--- a/modules/codec/dmo/dmo.h
+++ b/modules/codec/dmo/dmo.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * dmo.h : DirectMedia Object codec module for vlc
  *****************************************************************************
- * Copyright (C) 2002, 2003 VideoLAN
+ * Copyright (C) 2002, 2003 the VideoLAN team
  * $Id$
  *
  * Author: Gildas Bazin <gbazin@videolan.org>
@@ -18,11 +18,12 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 static const GUID IID_IUnknown = {0x00000000, 0x0000, 0x0000, {0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46}};
 static const GUID IID_IClassFactory = {0x00000001, 0x0000, 0x0000, {0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}};
+static const GUID IID_IWMCodecPrivateData = {0x73f0be8e, 0x57f7, 0x4f01, {0xaa, 0x66, 0x9f, 0x57, 0x34, 0xc, 0xfe, 0xe}};
 static const GUID IID_IMediaObject = {0xd8ad0f58, 0x5494, 0x4102, {0x97, 0xc5, 0xec, 0x79, 0x8e, 0x59, 0xbc, 0xf4}};
 static const GUID IID_IMediaBuffer = {0x59eff8b9, 0x938c, 0x4a26, {0x82, 0xf2, 0x95, 0xcb, 0x84, 0xcd, 0xc8, 0x37}};
 static const GUID MEDIATYPE_Video = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
@@ -36,10 +37,17 @@ static const GUID MEDIASUBTYPE_YV12 = {0x32315659, 0x0000, 0x0010, {0x80, 0x00,
 static const GUID MEDIASUBTYPE_RGB24 = {0xe436eb7d, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}};
 static const GUID MEDIASUBTYPE_RGB565 = {0xe436eb7b, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}};
 
+
+#ifndef WIN32
+void* CoTaskMemAlloc(unsigned long cb);
+void CoTaskMemFree(void* cb);
+#endif
+
 #define IUnknown IUnknownHack
 #define IClassFactory IClassFactoryHack
 typedef struct _IUnknown IUnknown;
 typedef struct _IClassFactory IClassFactory;
+typedef struct _IWMCodecPrivateData IWMCodecPrivateData;
 typedef struct _IEnumDMO IEnumDMO;
 typedef struct _IMediaBuffer IMediaBuffer;
 typedef struct _IMediaObject IMediaObject;
@@ -48,10 +56,10 @@ typedef struct _IMediaObject IMediaObject;
 #define STDCALL __stdcall
 #endif
 
-#define DMO_INPUT_DATA_BUFFER_SYNCPOINT 1
+#define DMO_INPUT_DATA_BUFFERF_SYNCPOINT 1
 #define DMO_INPUT_DATA_BUFFERF_TIME 2
 #define DMO_INPUT_DATA_BUFFERF_TIMELENGTH 4
-#define DMO_OUTPUT_DATA_BUFFER_SYNCPOINT 1
+#define DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT 1
 #define DMO_OUTPUT_DATA_BUFFERF_TIME 2
 #define DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH 4
 #define DMO_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER 1
@@ -131,6 +139,26 @@ typedef struct IClassFactory_vt
 
 struct _IClassFactory { IClassFactory_vt* vt; };
 
+/*
+ * IWMCodecPrivateData interface
+ */
+typedef struct IWMCodecPrivateData_vt
+{
+    long (STDCALL *QueryInterface)(IUnknown *This, const GUID* riid,
+                                   void **ppvObject);
+    long (STDCALL *AddRef)(IUnknown *This) ;
+    long (STDCALL *Release)(IUnknown *This) ;
+
+ 
+    long (STDCALL *SetPartialOutputType)(IWMCodecPrivateData * This,
+                                         DMO_MEDIA_TYPE *pmt);
+
+    long (STDCALL *GetPrivateData )(IWMCodecPrivateData * This,
+                                    uint8_t *pbData, uint32_t *pcbData);
+} IWMCodecPrivateData_vt;
+
+struct _IWMCodecPrivateData { IWMCodecPrivateData_vt* vt; };
+
 /*
  * IEnumDMO interface
  */
@@ -167,7 +195,7 @@ typedef struct IMediaBuffer_vt
     long (STDCALL *SetLength)(IMediaBuffer* This, uint32_t cbLength);
     long (STDCALL *GetMaxLength)(IMediaBuffer* This, uint32_t *pcbMaxLength);
     long (STDCALL *GetBufferAndLength)(IMediaBuffer* This,
-                                       char** ppBuffer, uint32_t* pcbLength);
+                                       char **ppBuffer, uint32_t *pcbLength);
 
 } IMediaBuffer_vt;
 struct _IMediaBuffer { IMediaBuffer_vt* vt; };