updating directshow support with avifile/mplayer changes

CVS patchset: 1357
CVS date: 2002/01/06 18:56:19

1 files changed, 195 insertions, 224 deletions

diff --git a/src/libw32dll/DirectShow/interfaces.h b/src/libw32dll/DirectShow/interfaces.h
index 88ef7e4e9..23b02a509 100644
--- a/src/libw32dll/DirectShow/interfaces.h
+++ b/src/libw32dll/DirectShow/interfaces.h
@@ -9,122 +9,41 @@ Created using freely-available DirectX 8.0 SDK
 
 */
 
-#include "../wine/com.h"
-#include "guids.h"
 #include "iunk.h"
+#include "com.h"
 
-#ifndef STDCALL
-#define STDCALL __attribute__((__stdcall__))
-#endif
-
-/*typedef GUID& REFIID;*/
+//typedef GUID& REFIID;
 typedef GUID CLSID;
 typedef GUID IID;
 
 /*    Sh*t. MSVC++ and g++ use different methods of storing vtables.    */
 
-
-/*typedef struct _IBaseFilter IBaseFilter;*/
 typedef struct _IReferenceClock IReferenceClock;
-typedef struct _IEnumPins IEnumPins;
-typedef struct _IEnumMediaTypes IEnumMediaTypes;
-typedef struct _IPin IPin;
 typedef struct _IFilterGraph IFilterGraph;
-typedef struct _IMemInputPin IMemInputPin;
-typedef struct _IMemAllocator IMemAllocator;
-typedef struct _IMediaSample IMediaSample;
-typedef struct _IHidden IHidden;
-typedef struct _IHidden2 IHidden2;
-typedef struct _IDivxFilterInterface IDivxFilterInterface;
-
-typedef struct _IBaseFilter_vt IBaseFilter_vt;
-typedef struct _IReferenceClock_vt IReferenceClock_vt;
-typedef struct _IEnumPins_vt IEnumPins_vt;
-typedef struct _IEnumMediaTypes_vt IEnumMediaTypes_vt;
-typedef struct _IPin_vt IPin_vt;
-typedef struct _IFilterGraph_vt IFilterGraph_vt;
-typedef struct _IMemInputPin_vt IMemInputPin_vt;
-typedef struct _IMemAllocator_vt IMemAllocator_vt;
-typedef struct _IMediaSample_vt IMediaSample_vt;
-typedef struct _IHidden_vt IHidden_vt;
-typedef struct _IHidden2_vt IHidden2_vt;
-typedef struct _IDivxFilterInterface_vt IDivxFilterInterface_vt;
-
 
 enum PIN_DIRECTION;
 
-/*
-class IClassFactory2
-{
-public:
-    virtual long STDCALL QueryInterface(GUID* iid, void** ppv) =0;
-    virtual long STDCALL AddRef(void) =0;
-    virtual long STDCALL Release(void) =0;
-    virtual long STDCALL CreateInstance(IUnknown* pUnkOuter, GUID* riid, void** ppvObject) =0;
-};
-*/
-
-struct _IBaseFilter_vt
+typedef struct _IEnumMediaTypes IEnumMediaTypes;
+typedef struct IEnumMediaTypes_vt
 {
     INHERIT_IUNKNOWN();
-   
-    HRESULT STDCALL ( *GetClassID )(IBaseFilter * This,
-				    /* [out] */ CLSID *pClassID);
-    HRESULT STDCALL ( *Stop )(IBaseFilter * This);
-    HRESULT STDCALL ( *Pause )(IBaseFilter * This);
-    HRESULT STDCALL ( *Run )(IBaseFilter * This,
-			     REFERENCE_TIME tStart);
-    HRESULT STDCALL ( *GetState )(IBaseFilter * This,
-				  /* [in] */ unsigned long dwMilliSecsTimeout,
-				  ///* [out] */ FILTER_STATE *State);
-				  void* State);
-    HRESULT STDCALL ( *SetSyncSource )(IBaseFilter * This,
-				       /* [in] */ IReferenceClock *pClock);
-    HRESULT STDCALL ( *GetSyncSource )(IBaseFilter * This,
-				       /* [out] */ IReferenceClock **pClock);
-    HRESULT STDCALL ( *EnumPins )(IBaseFilter * This,
-				  /* [out] */ IEnumPins **ppEnum);
-    HRESULT STDCALL ( *FindPin )(IBaseFilter * This,
-				 /* [string][in] */ const unsigned short* Id,
-				 /* [out] */ IPin **ppPin);
-    HRESULT STDCALL ( *QueryFilterInfo )(IBaseFilter * This,
-					 // /* [out] */ FILTER_INFO *pInfo);
-					 void* pInfo);
-    HRESULT STDCALL ( *JoinFilterGraph )(IBaseFilter * This,
-					 /* [in] */ IFilterGraph *pGraph,
-					 /* [string][in] */ const unsigned short* pName);
-    HRESULT STDCALL ( *QueryVendorInfo )(IBaseFilter * This,
-					 /* [string][out] */ unsigned short* *pVendorInfo);
-};
 
-struct _IBaseFilter
-{
-    struct _IBaseFilter_vt *vt;
-};
-
-
-struct _IEnumPins_vt
-{
-    INHERIT_IUNKNOWN();
-    
-    HRESULT STDCALL ( *Next )(IEnumPins * This,
-			      /* [in] */ unsigned long cPins,
-			      /* [size_is][out] */ IPin **ppPins,
-			      /* [out] */ unsigned long *pcFetched);
-    HRESULT STDCALL ( *Skip )(IEnumPins * This,
-			      /* [in] */ unsigned long cPins);
-    HRESULT STDCALL ( *Reset )(IEnumPins * This);
-    HRESULT STDCALL ( *Clone )(IEnumPins * This,
-			       /* [out] */ IEnumPins **ppEnum);
-};
+    HRESULT STDCALL ( *Next )(IEnumMediaTypes* This,
+			      /* [in] */ unsigned long cMediaTypes,
+			      /* [size_is][out] */ AM_MEDIA_TYPE** ppMediaTypes,
+			      /* [out] */ unsigned long* pcFetched);
+    HRESULT STDCALL ( *Skip )(IEnumMediaTypes* This,
+			      /* [in] */ unsigned long cMediaTypes);
+    HRESULT STDCALL ( *Reset )(IEnumMediaTypes* This);
+    HRESULT STDCALL ( *Clone )(IEnumMediaTypes* This,
+			       /* [out] */ IEnumMediaTypes** ppEnum);
+} IEnumMediaTypes_vt;
+struct _IEnumMediaTypes { IEnumMediaTypes_vt* vt; };
 
-struct _IEnumPins
-{
-    struct _IEnumPins_vt *vt;
-};
 
 
-struct _IPin_vt
+typedef struct _IPin IPin;
+typedef struct IPin_vt
 {
     INHERIT_IUNKNOWN();
 
@@ -156,39 +75,166 @@ struct _IPin_vt
 				    /* [in] */ REFERENCE_TIME tStart,
 				    /* [in] */ REFERENCE_TIME tStop,
 				    /* [in] */ double dRate);
-};
+} IPin_vt;
+struct _IPin { IPin_vt *vt; };
+
 
-struct _IPin
+typedef struct _IEnumPins IEnumPins;
+typedef struct IEnumPins_vt
 {
-    IPin_vt *vt;
-};
+    INHERIT_IUNKNOWN();
+
+    // retrieves a specified number of pins in the enumeration sequence..
+    HRESULT STDCALL ( *Next )(IEnumPins* This,
+			      /* [in] */ unsigned long cPins,
+			      /* [size_is][out] */ IPin** ppPins,
+			      /* [out] */ unsigned long* pcFetched);
+    // skips over a specified number of pins.
+    HRESULT STDCALL ( *Skip )(IEnumPins* This,
+			      /* [in] */ unsigned long cPins);
+    // resets the enumeration sequence to the beginning.
+    HRESULT STDCALL ( *Reset )(IEnumPins* This);
+    // makes a copy of the enumerator with the same enumeration state.
+    HRESULT STDCALL ( *Clone )(IEnumPins* This,
+			       /* [out] */ IEnumPins** ppEnum);
+} IEnumPins_vt;
+struct _IEnumPins { struct IEnumPins_vt* vt; };
 
 
-struct _IEnumMediaTypes_vt
+typedef struct _IMediaSample IMediaSample;
+typedef struct IMediaSample_vt
 {
     INHERIT_IUNKNOWN();
-    
-    HRESULT STDCALL ( *Next )(IEnumMediaTypes * This,
-			      /* [in] */ unsigned long cMediaTypes,
-			      /* [size_is][out] */ AM_MEDIA_TYPE **ppMediaTypes,
-			      /* [out] */ unsigned long *pcFetched);
-    HRESULT STDCALL ( *Skip )(IEnumMediaTypes * This,
-			      /* [in] */ unsigned long cMediaTypes);
-    HRESULT STDCALL ( *Reset )(IEnumMediaTypes * This);
-    HRESULT STDCALL ( *Clone )(IEnumMediaTypes * This,
-			       /* [out] */ IEnumMediaTypes **ppEnum);
-};
 
-struct _IEnumMediaTypes
+    HRESULT STDCALL ( *GetPointer )(IMediaSample* This,
+				    /* [out] */ unsigned char** ppBuffer);
+    LONG    STDCALL ( *GetSize )(IMediaSample* This);
+    HRESULT STDCALL ( *GetTime )(IMediaSample* This,
+				 /* [out] */ REFERENCE_TIME* pTimeStart,
+				 /* [out] */ REFERENCE_TIME* pTimeEnd);
+    HRESULT STDCALL ( *SetTime )(IMediaSample* This,
+				 /* [in] */ REFERENCE_TIME* pTimeStart,
+				 /* [in] */ REFERENCE_TIME* pTimeEnd);
+
+    // sync-point property. If true, then the beginning of this
+    // sample is a sync-point. (note that if AM_MEDIA_TYPE.bTemporalCompression
+    // is false then all samples are sync points). A filter can start
+    // a stream at any sync point.  S_FALSE if not sync-point, S_OK if true.
+    HRESULT STDCALL ( *IsSyncPoint )(IMediaSample* This);
+    HRESULT STDCALL ( *SetSyncPoint )(IMediaSample* This,
+				      long bIsSyncPoint);
+
+    // preroll property.  If true, this sample is for preroll only and
+    // shouldn't be displayed.
+    HRESULT STDCALL ( *IsPreroll )(IMediaSample* This);
+    HRESULT STDCALL ( *SetPreroll )(IMediaSample* This,
+				    long bIsPreroll);
+
+    LONG    STDCALL ( *GetActualDataLength )(IMediaSample* This);
+    HRESULT STDCALL ( *SetActualDataLength )(IMediaSample* This,
+					     long __MIDL_0010);
+
+    // these allow for limited format changes in band - if no format change
+    // has been made when you receive a sample GetMediaType will return S_FALSE
+    HRESULT STDCALL ( *GetMediaType )(IMediaSample* This,
+				      AM_MEDIA_TYPE** ppMediaType);
+    HRESULT STDCALL ( *SetMediaType )(IMediaSample* This,
+				      AM_MEDIA_TYPE* pMediaType);
+
+    // returns S_OK if there is a discontinuity in the data (this frame is
+    // not a continuation of the previous stream of data
+    // - there has been a seek or some dropped samples).
+    HRESULT STDCALL ( *IsDiscontinuity )(IMediaSample* This);
+    HRESULT STDCALL ( *SetDiscontinuity )(IMediaSample* This,
+					  long bDiscontinuity);
+
+    // get the media times for this sample
+    HRESULT STDCALL ( *GetMediaTime )(IMediaSample* This,
+				      /* [out] */ long long* pTimeStart,
+				      /* [out] */ long long* pTimeEnd);
+    // Set the media times for this sample
+    // pTimeStart==pTimeEnd==NULL will invalidate the media time stamps in
+    // this sample
+    HRESULT STDCALL ( *SetMediaTime )(IMediaSample* This,
+				      /* [in] */ long long* pTimeStart,
+				      /* [in] */ long long* pTimeEnd);
+} IMediaSample_vt;
+struct _IMediaSample { struct IMediaSample_vt* vt; };
+
+
+
+//typedef struct _IBaseFilter IBaseFilter;
+typedef struct IBaseFilter_vt
 {
-    IEnumMediaTypes_vt *vt;
-};
+    INHERIT_IUNKNOWN();
+
+    HRESULT STDCALL ( *GetClassID )(IBaseFilter * This,
+				    /* [out] */ CLSID *pClassID);
+    HRESULT STDCALL ( *Stop )(IBaseFilter * This);
+    HRESULT STDCALL ( *Pause )(IBaseFilter * This);
+    HRESULT STDCALL ( *Run )(IBaseFilter * This,
+			     REFERENCE_TIME tStart);
+    HRESULT STDCALL ( *GetState )(IBaseFilter * This,
+				  /* [in] */ unsigned long dwMilliSecsTimeout,
+				  ///* [out] */ FILTER_STATE *State);
+				  void* State);
+    HRESULT STDCALL ( *SetSyncSource )(IBaseFilter* This,
+				       /* [in] */ IReferenceClock *pClock);
+    HRESULT STDCALL ( *GetSyncSource )(IBaseFilter* This,
+				       /* [out] */ IReferenceClock **pClock);
+    HRESULT STDCALL ( *EnumPins )(IBaseFilter* This,
+				  /* [out] */ IEnumPins **ppEnum);
+    HRESULT STDCALL ( *FindPin )(IBaseFilter* This,
+				 /* [string][in] */ const unsigned short* Id,
+				 /* [out] */ IPin** ppPin);
+    HRESULT STDCALL ( *QueryFilterInfo )(IBaseFilter* This,
+					 // /* [out] */ FILTER_INFO *pInfo);
+					 void* pInfo);
+    HRESULT STDCALL ( *JoinFilterGraph )(IBaseFilter* This,
+					 /* [in] */ IFilterGraph* pGraph,
+					 /* [string][in] */ const unsigned short* pName);
+    HRESULT STDCALL ( *QueryVendorInfo )(IBaseFilter* This,
+					 /* [string][out] */ unsigned short** pVendorInfo);
+} IBaseFilter_vt;
+struct _IBaseFilter { struct IBaseFilter_vt* vt; };
+
+
+
+typedef struct _IMemAllocator IMemAllocator;
+typedef struct IMemAllocator_vt
+{
+    INHERIT_IUNKNOWN();
+
+    // specifies the number of buffers to allocate and the size of each buffer.
+    HRESULT STDCALL ( *SetProperties )(IMemAllocator* This,
+				       /* [in] */ ALLOCATOR_PROPERTIES *pRequest,
+				       /* [out] */ ALLOCATOR_PROPERTIES *pActual);
+    // retrieves the number of buffers that the allocator will create, and the buffer properties.
+    HRESULT STDCALL ( *GetProperties )(IMemAllocator* This,
+				       /* [out] */ ALLOCATOR_PROPERTIES *pProps);
+    // allocates the buffer memory.
+    HRESULT STDCALL ( *Commit )(IMemAllocator* This);
+    // releases the memory for the buffers.
+    HRESULT STDCALL ( *Decommit )(IMemAllocator* This);
+    // retrieves a media sample that contains an empty buffer.
+    HRESULT STDCALL ( *GetBuffer )(IMemAllocator* This,
+				   /* [out] */ IMediaSample** ppBuffer,
+				   /* [in] */ REFERENCE_TIME* pStartTime,
+				   /* [in] */ REFERENCE_TIME* pEndTime,
+				   /* [in] */ unsigned long dwFlags);
+    // releases a media sample.
+    HRESULT STDCALL ( *ReleaseBuffer )(IMemAllocator* This,
+				       /* [in] */ IMediaSample* pBuffer);
+} IMemAllocator_vt;
+struct _IMemAllocator { IMemAllocator_vt* vt; };
 
 
-struct _IMemInputPin_vt
+
+typedef struct _IMemInputPin IMemInputPin;
+typedef struct IMemInputPin_vt
 {
     INHERIT_IUNKNOWN();
-    
+
     HRESULT STDCALL ( *GetAllocator )(IMemInputPin * This,
 				      /* [out] */ IMemAllocator **ppAllocator);
     HRESULT STDCALL ( *NotifyAllocator )(IMemInputPin * This,
@@ -203,108 +249,35 @@ struct _IMemInputPin_vt
 					 /* [in] */ long nSamples,
 					 /* [out] */ long *nSamplesProcessed);
     HRESULT STDCALL ( *ReceiveCanBlock )(IMemInputPin * This);
-};
-
-struct _IMemInputPin
-{
-    IMemInputPin_vt *vt;
-};
-
-
-struct _IMemAllocator_vt
-{
-    INHERIT_IUNKNOWN();
-
-    HRESULT STDCALL ( *SetProperties )(IMemAllocator * This,
-				       /* [in] */ ALLOCATOR_PROPERTIES *pRequest,
-				       /* [out] */ ALLOCATOR_PROPERTIES *pActual);
-    HRESULT STDCALL ( *GetProperties )(IMemAllocator * This,
-				       /* [out] */ ALLOCATOR_PROPERTIES *pProps);
-    HRESULT STDCALL ( *Commit )(IMemAllocator * This);
-    HRESULT STDCALL ( *Decommit )(IMemAllocator * This);
-    HRESULT STDCALL ( *GetBuffer )(IMemAllocator * This,
-				   /* [out] */ IMediaSample **ppBuffer,
-				   /* [in] */ REFERENCE_TIME *pStartTime,
-				   /* [in] */ REFERENCE_TIME *pEndTime,
-				   /* [in] */ unsigned long dwFlags);
-    HRESULT STDCALL ( *ReleaseBuffer )(IMemAllocator * This,
-				       /* [in] */ IMediaSample *pBuffer);
-};
-
-struct _IMemAllocator
-{
-    IMemAllocator_vt *vt;
-};
+} IMemInputPin_vt;
+struct _IMemInputPin { IMemInputPin_vt* vt; };
 
 
-struct _IMediaSample_vt
+typedef struct _IHidden IHidden;
+typedef struct IHidden_vt
 {
     INHERIT_IUNKNOWN();
 
-    HRESULT STDCALL ( *GetPointer )(IMediaSample * This,
-				    /* [out] */ unsigned char **ppBuffer);
-    LONG    STDCALL ( *GetSize )(IMediaSample * This);
-    HRESULT STDCALL ( *GetTime )(IMediaSample * This,
-				 /* [out] */ REFERENCE_TIME *pTimeStart,
-				 /* [out] */ REFERENCE_TIME *pTimeEnd);
-    HRESULT STDCALL ( *SetTime )(IMediaSample * This,
-				 /* [in] */ REFERENCE_TIME *pTimeStart,
-				 /* [in] */ REFERENCE_TIME *pTimeEnd);
-    HRESULT STDCALL ( *IsSyncPoint )(IMediaSample * This);
-    HRESULT STDCALL ( *SetSyncPoint )(IMediaSample * This,
-				      long bIsSyncPoint);
-    HRESULT STDCALL ( *IsPreroll )(IMediaSample * This);
-    HRESULT STDCALL ( *SetPreroll )(IMediaSample * This,
-				    long bIsPreroll);
-    LONG    STDCALL ( *GetActualDataLength )(IMediaSample * This);
-    HRESULT STDCALL ( *SetActualDataLength )(IMediaSample * This,
-					     long __MIDL_0010);
-    HRESULT STDCALL ( *GetMediaType )(IMediaSample * This,
-				      AM_MEDIA_TYPE **ppMediaType);
-    HRESULT STDCALL ( *SetMediaType )(IMediaSample * This,
-				      AM_MEDIA_TYPE *pMediaType);
-    HRESULT STDCALL ( *IsDiscontinuity )(IMediaSample * This);
-    HRESULT STDCALL ( *SetDiscontinuity )(IMediaSample * This,
-					  long bDiscontinuity);
-    HRESULT STDCALL ( *GetMediaTime )(IMediaSample * This,
-				      /* [out] */ long long *pTimeStart,
-				      /* [out] */ long long *pTimeEnd);
-    HRESULT STDCALL ( *SetMediaTime )(IMediaSample * This,
-				      /* [in] */ long long *pTimeStart,
-				      /* [in] */ long long *pTimeEnd);
-};
+    HRESULT STDCALL ( *GetSmth )(IHidden* This, int* pv);
+    HRESULT STDCALL ( *SetSmth )(IHidden* This, int v1, int v2);
+    HRESULT STDCALL ( *GetSmth2 )(IHidden* This, int* pv);
+    HRESULT STDCALL ( *SetSmth2 )(IHidden* This, int v1, int v2);
+    HRESULT STDCALL ( *GetSmth3 )(IHidden* This, int* pv);
+    HRESULT STDCALL ( *SetSmth3 )(IHidden* This, int v1, int v2);
+    HRESULT STDCALL ( *GetSmth4 )(IHidden* This, int* pv);
+    HRESULT STDCALL ( *SetSmth4 )(IHidden* This, int v1, int v2);
+    HRESULT STDCALL ( *GetSmth5 )(IHidden* This, int* pv);
+    HRESULT STDCALL ( *SetSmth5 )(IHidden* This, int v1, int v2);
+    HRESULT STDCALL ( *GetSmth6 )(IHidden* This, int* pv);
+} IHidden_vt;
+struct _IHidden { struct IHidden_vt* vt; };
 
-struct _IMediaSample
-{
-    struct _IMediaSample_vt *vt;
-};
 
-struct _IHidden_vt
+typedef struct _IHidden2 IHidden2;
+typedef struct IHidden2_vt
 {
     INHERIT_IUNKNOWN();
-    
-    HRESULT STDCALL ( *GetSmth )(IHidden * This, int* pv);
-    HRESULT STDCALL ( *SetSmth )(IHidden * This, int v1, int v2);
-    HRESULT STDCALL ( *GetSmth2 )(IHidden * This, int* pv);
-    HRESULT STDCALL ( *SetSmth2 )(IHidden * This, int v1, int v2);
-    HRESULT STDCALL ( *GetSmth3 )(IHidden * This, int* pv);
-    HRESULT STDCALL ( *SetSmth3 )(IHidden * This, int v1, int v2);
-    HRESULT STDCALL ( *GetSmth4 )(IHidden * This, int* pv);
-    HRESULT STDCALL ( *SetSmth4 )(IHidden * This, int v1, int v2);
-    HRESULT STDCALL ( *GetSmth5 )(IHidden * This, int* pv);
-    HRESULT STDCALL ( *SetSmth5 )(IHidden * This, int v1, int v2);
-    HRESULT STDCALL ( *GetSmth6 )(IHidden * This, int* pv);
-};
-
-struct _IHidden
-{
-    struct _IHidden_vt *vt;
-};
 
-struct _IHidden2_vt
-{
-    INHERIT_IUNKNOWN();
-    
     HRESULT STDCALL ( *unk1 )(void);
     HRESULT STDCALL ( *unk2 )(void);
     HRESULT STDCALL ( *unk3 )(void);
@@ -313,22 +286,19 @@ struct _IHidden2_vt
     HRESULT STDCALL ( *DecodeSet )(IHidden2* This, int* region);
     HRESULT STDCALL ( *unk7 )(void);
     HRESULT STDCALL ( *unk8 )(void);
-};
+} IHidden2_vt;
+struct _IHidden2 { struct IHidden2_vt* vt; };
 
-struct _IHidden2
-{
-    struct _IHidden2_vt *vt;
-};
 
-struct _IDivxFilterInterface
-{
-    struct _IDivxFilterInterface_vt* vt;
-};
+// fixme
+typedef struct IDivxFilterInterface {
+    struct IDivxFilterInterface_vt* vt;
+} IDivxFilterInterface;
 
-struct _IDivxFilterInterface_vt
+struct IDivxFilterInterface_vt
 {
     INHERIT_IUNKNOWN();
-    
+
     HRESULT STDCALL ( *get_PPLevel )(IDivxFilterInterface* This, int* PPLevel); // current postprocessing level
     HRESULT STDCALL ( *put_PPLevel )(IDivxFilterInterface* This, int PPLevel); // new postprocessing level
     HRESULT STDCALL ( *put_DefaultPPLevel )(IDivxFilterInterface* This);
@@ -340,7 +310,8 @@ struct _IDivxFilterInterface_vt
     HRESULT STDCALL ( *get_Brightness)(IDivxFilterInterface* This, int* brightness);
     HRESULT STDCALL ( *get_Contrast)(IDivxFilterInterface* This, int* contrast);
     HRESULT STDCALL ( *get_Saturation )(IDivxFilterInterface* This, int* saturation);
-    HRESULT STDCALL ( *put_AspectRatio )(IDivxFilterInterface* This, int x, IDivxFilterInterface* This2, int y);
-    HRESULT STDCALL ( *get_AspectRatio )(IDivxFilterInterface* This, int* x, IDivxFilterInterface* This2, int* y);
+    HRESULT STDCALL ( *put_AspectRatio )(IDivxFilterInterface* This, int x, IDivxFilterInterface* Thisit, int y);
+    HRESULT STDCALL ( *get_AspectRatio )(IDivxFilterInterface* This, int* x, IDivxFilterInterface* Thisit, int* y);
 };
+
 #endif  /* DS_INTERFACES_H */