[Mplayer-cvslog] CVS: main/loader/dshow DS_Filter.c,1.11,1.12 allocator.h,1.4,1.5 cmediasample.h,1.4,1.5 inputpin.c,1.4,1.5 inputpin.h,1.3,1.4 outputpin.c,1.7,1.8 outputpin.h,1.4,1.5
Arpi of Ize
arpi at mplayer.dev.hu
Mon Nov 26 01:56:14 CET 2001
Update of /cvsroot/mplayer/main/loader/dshow
In directory mplayer:/var/tmp.root/cvs-serv9349
Modified Files:
DS_Filter.c allocator.h cmediasample.h inputpin.c inputpin.h
outputpin.c outputpin.h
Log Message:
avifile sync. seems to some bugs fixed...
Index: DS_Filter.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/dshow/DS_Filter.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DS_Filter.c 21 Nov 2001 19:12:39 -0000 1.11
+++ DS_Filter.c 26 Nov 2001 00:56:11 -0000 1.12
@@ -76,7 +76,7 @@
if (This->m_pOurOutput)
This->m_pOurOutput->vt->Release((IUnknown*)This->m_pOurOutput);
if (This->m_pParentFilter)
- This->m_pSrcFilter->vt->Release((IUnknown*)This->m_pParentFilter);
+ This->m_pParentFilter->vt->Release((IUnknown*)This->m_pParentFilter);
if (This->m_pSrcFilter)
This->m_pSrcFilter->vt->Release((IUnknown*)This->m_pSrcFilter);
Index: allocator.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/dshow/allocator.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- allocator.h 21 Nov 2001 19:12:39 -0000 1.4
+++ allocator.h 26 Nov 2001 00:56:11 -0000 1.5
@@ -15,13 +15,13 @@
struct _MemAllocator
{
IMemAllocator_vt* vt;
+ DECLARE_IUNKNOWN();
ALLOCATOR_PROPERTIES props;
avm_list_t* used_list;
avm_list_t* free_list;
char* new_pointer;
CMediaSample* modified_sample;
GUID interfaces[2];
- DECLARE_IUNKNOWN();
void ( *SetPointer )(MemAllocator* This, char* pointer);
void ( *ResetPointer )(MemAllocator* This);
Index: cmediasample.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/dshow/cmediasample.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cmediasample.h 21 Nov 2001 19:12:39 -0000 1.4
+++ cmediasample.h 26 Nov 2001 00:56:11 -0000 1.5
@@ -8,12 +8,12 @@
struct _CMediaSample
{
IMediaSample_vt* vt;
+ DECLARE_IUNKNOWN();
IMemAllocator* all;
int size;
int actual_size;
char* block;
char* own_block;
- int refcount;
int isPreroll;
int isSyncPoint;
AM_MEDIA_TYPE media_type;
Index: inputpin.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/dshow/inputpin.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- inputpin.c 21 Nov 2001 19:12:39 -0000 1.4
+++ inputpin.c 26 Nov 2001 00:56:11 -0000 1.5
@@ -26,8 +26,8 @@
static long STDCALL CEnumPins_Next(IEnumPins* This,
/* [in] */ unsigned long cMediaTypes,
- /* [size_is][out] */ IPin **ppMediaTypes,
- /* [out] */ unsigned long *pcFetched)
+ /* [size_is][out] */ IPin** ppMediaTypes,
+ /* [out] */ unsigned long* pcFetched)
{
CEnumPins* pin = (CEnumPins*)This;
@@ -127,9 +127,9 @@
* InputPin
***********/
-static long STDCALL CInputPin_Connect(IPin * This,
- /* [in] */ IPin *pReceivePin,
- /* [in] */ AM_MEDIA_TYPE *pmt)
+static long STDCALL CInputPin_Connect(IPin* This,
+ /* [in] */ IPin* pReceivePin,
+ /* [in] */ AM_MEDIA_TYPE* pmt)
{
Debug unimplemented("CInputPin_Connect", This);
return E_NOTIMPL;
@@ -199,21 +199,21 @@
}
static long STDCALL CInputPin_QueryAccept(IPin* This,
- /* [in] */ const AM_MEDIA_TYPE *pmt)
+ /* [in] */ const AM_MEDIA_TYPE* pmt)
{
Debug unimplemented("CInputPin_QueryAccept", This);
return E_NOTIMPL;
}
static long STDCALL CInputPin_EnumMediaTypes(IPin* This,
- /* [out] */ IEnumMediaTypes **ppEnum)
+ /* [out] */ IEnumMediaTypes** ppEnum)
{
Debug unimplemented("CInputPin_EnumMediaTypes", This);
return E_NOTIMPL;
}
static long STDCALL CInputPin_QueryInternalConnections(IPin* This,
- /* [out] */ IPin **apPin,
+ /* [out] */ IPin** apPin,
/* [out][in] */ unsigned long *nPin)
{
Debug unimplemented("CInputPin_QueryInternalConnections", This);
@@ -234,13 +234,13 @@
}
-static long STDCALL CInputPin_EndFlush(IPin * This)
+static long STDCALL CInputPin_EndFlush(IPin* This)
{
Debug unimplemented("CInputPin_EndFlush", This);
return E_NOTIMPL;
}
-static long STDCALL CInputPin_NewSegment(IPin * This,
+static long STDCALL CInputPin_NewSegment(IPin* This,
/* [in] */ REFERENCE_TIME tStart,
/* [in] */ REFERENCE_TIME tStop,
/* [in] */ double dRate)
@@ -360,7 +360,7 @@
return E_NOTIMPL;
}
-static long STDCALL CBaseFilter_QueryFilterInfo(IBaseFilter * This,
+static long STDCALL CBaseFilter_QueryFilterInfo(IBaseFilter* This,
// /* [out] */ FILTER_INFO *pInfo)
void* pInfo)
{
@@ -368,16 +368,16 @@
return E_NOTIMPL;
}
-static long STDCALL CBaseFilter_JoinFilterGraph(IBaseFilter * This,
- /* [in] */ IFilterGraph *pGraph,
+static long STDCALL CBaseFilter_JoinFilterGraph(IBaseFilter* This,
+ /* [in] */ IFilterGraph* pGraph,
/* [string][in] */ const unsigned short* pName)
{
Debug unimplemented("CBaseFilter_JoinFilterGraph", This);
return E_NOTIMPL;
}
-static long STDCALL CBaseFilter_QueryVendorInfo(IBaseFilter * This,
- /* [string][out] */ unsigned short* *pVendorInfo)
+static long STDCALL CBaseFilter_QueryVendorInfo(IBaseFilter* This,
+ /* [string][out] */ unsigned short** pVendorInfo)
{
Debug unimplemented("CBaseFilter_QueryVendorInfo", This);
return E_NOTIMPL;
@@ -443,26 +443,26 @@
**************/
-static long STDCALL CBaseFilter2_GetClassID(IBaseFilter * This,
- /* [out] */ CLSID *pClassID)
+static long STDCALL CBaseFilter2_GetClassID(IBaseFilter* This,
+ /* [out] */ CLSID* pClassID)
{
Debug unimplemented("CBaseFilter2_GetClassID", This);
return E_NOTIMPL;
}
-static long STDCALL CBaseFilter2_Stop(IBaseFilter * This)
+static long STDCALL CBaseFilter2_Stop(IBaseFilter* This)
{
Debug unimplemented("CBaseFilter2_Stop", This);
return E_NOTIMPL;
}
-static long STDCALL CBaseFilter2_Pause(IBaseFilter * This)
+static long STDCALL CBaseFilter2_Pause(IBaseFilter* This)
{
Debug unimplemented("CBaseFilter2_Pause", This);
return E_NOTIMPL;
}
-static long STDCALL CBaseFilter2_Run(IBaseFilter * This, REFERENCE_TIME tStart)
+static long STDCALL CBaseFilter2_Run(IBaseFilter* This, REFERENCE_TIME tStart)
{
Debug unimplemented("CBaseFilter2_Run", This);
return E_NOTIMPL;
@@ -540,6 +540,7 @@
static void CBaseFilter2_Destroy(CBaseFilter2* This)
{
+ Debug printf("CBaseFilter2_Destroy(%p) called\n", This);
This->pin->vt->Release((IUnknown*) This->pin);
free(This->vt);
free(This);
@@ -607,7 +608,7 @@
}
static long STDCALL CRemotePin_QueryDirection(IPin* This,
- /* [out] */ PIN_DIRECTION *pPinDir)
+ /* [out] */ PIN_DIRECTION* pPinDir)
{
Debug printf("CRemotePin_QueryDirection(%p) called\n", This);
if (!pPinDir)
@@ -668,12 +669,12 @@
/*************
- * CRemotePin
+ * CRemotePin2
*************/
-static long STDCALL CRemotePin2_QueryPinInfo(IPin * This,
- /* [out] */ PIN_INFO *pInfo)
+static long STDCALL CRemotePin2_QueryPinInfo(IPin* This,
+ /* [out] */ PIN_INFO* pInfo)
{
CBaseFilter2* lparent=((CRemotePin2*)This)->parent;
Debug printf("CRemotePin2_QueryPinInfo(%p) called\n", This);
@@ -684,6 +685,7 @@
return 0;
}
+// FIXME - not being released!
static void CRemotePin2_Destroy(CRemotePin2* This)
{
Debug printf("CRemotePin2_Destroy(%p) called\n", This);
Index: inputpin.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/dshow/inputpin.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- inputpin.h 21 Nov 2001 19:12:39 -0000 1.3
+++ inputpin.h 26 Nov 2001 00:56:11 -0000 1.4
@@ -7,9 +7,9 @@
struct _CBaseFilter2
{
IBaseFilter_vt* vt;
+ DECLARE_IUNKNOWN();
IPin* pin;
GUID interfaces[5];
- DECLARE_IUNKNOWN();
IPin* ( *GetPin )(CBaseFilter2* This);
};
@@ -21,10 +21,10 @@
struct _CBaseFilter
{
IBaseFilter_vt* vt;
+ DECLARE_IUNKNOWN(); // has to match CBaseFilter2 - INHERITANCE!!
IPin* pin;
IPin* unused_pin;
GUID interfaces[2];
- DECLARE_IUNKNOWN();
IPin* ( *GetPin )(CBaseFilter* This);
IPin* ( *GetUnusedPin )(CBaseFilter* This);
@@ -37,10 +37,10 @@
struct _CInputPin
{
IPin_vt* vt;
+ DECLARE_IUNKNOWN();
AM_MEDIA_TYPE type;
CBaseFilter* parent;
GUID interfaces[1];
- DECLARE_IUNKNOWN();
};
CInputPin* CInputPinCreate(CBaseFilter* parent, const AM_MEDIA_TYPE* vhdr);
@@ -49,10 +49,10 @@
typedef struct CRemotePin
{
IPin_vt* vt;
+ DECLARE_IUNKNOWN();
CBaseFilter* parent;
- IPin* remote_pin;
GUID interfaces[1];
- DECLARE_IUNKNOWN();
+ IPin* remote_pin;
} CRemotePin;
CRemotePin* CRemotePinCreate(CBaseFilter* pt, IPin* rpin);
@@ -61,9 +61,9 @@
typedef struct CRemotePin2
{
IPin_vt* vt;
+ DECLARE_IUNKNOWN();
CBaseFilter2* parent;
GUID interfaces[1];
- DECLARE_IUNKNOWN();
} CRemotePin2;
CRemotePin2* CRemotePin2Create(CBaseFilter2* parent);
Index: outputpin.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/dshow/outputpin.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- outputpin.c 21 Nov 2001 19:12:39 -0000 1.7
+++ outputpin.c 26 Nov 2001 00:56:11 -0000 1.8
@@ -497,6 +497,7 @@
This->mempin->frame_size_pointer = 0;
This->mempin->frame_pointer = 0;
This->mempin->pAllocator = 0;
+ This->mempin->refcount = 1;
This->mempin->parent = This;
This->SetPointer2 = COutputPin_SetPointer2;
Index: outputpin.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/dshow/outputpin.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- outputpin.h 21 Nov 2001 19:12:39 -0000 1.4
+++ outputpin.h 26 Nov 2001 00:56:11 -0000 1.5
@@ -11,6 +11,7 @@
struct _COutputMemPin
{
IMemInputPin_vt* vt;
+ DECLARE_IUNKNOWN();
char** frame_pointer;
long* frame_size_pointer;
MemAllocator* pAllocator;
@@ -20,8 +21,8 @@
struct _COutputPin
{
IPin_vt* vt;
+ DECLARE_IUNKNOWN();
COutputMemPin* mempin;
- int refcount;
AM_MEDIA_TYPE type;
IPin* remote;
void ( *SetFramePointer )(COutputPin*, char** z);
More information about the MPlayer-cvslog
mailing list