Zebediah Figura : strmbase: Share pin and filter reference counts in base pin reference counting methods.
Module: wine Branch: master Commit: 42b3fd84bbbc691628fed94cd012db7ab8c76127 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42b3fd84bbbc691628fed94cd...
Author: Zebediah Figura z.figura12@gmail.com Date: Tue Jun 18 20:17:34 2019 -0500
strmbase: Share pin and filter reference counts in base pin reference counting methods.
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/quartz/pin.c | 1 - dlls/strmbase/pin.c | 41 ++++++++--------------------------------- dlls/winegstreamer/gstdemux.c | 1 - dlls/wineqtdecoder/qtsplitter.c | 1 - include/wine/strmbase.h | 6 ++---- 5 files changed, 10 insertions(+), 40 deletions(-)
diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 5c1fcdc..e99a493 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -174,7 +174,6 @@ static HRESULT PullPin_Init(const IPinVtbl *PullPin_Vtbl, const PIN_INFO *info, { /* Common attributes */ pPinImpl->pin.IPin_iface.lpVtbl = PullPin_Vtbl; - pPinImpl->pin.refCount = 1; pPinImpl->pin.pConnectedTo = NULL; pPinImpl->pin.pCritSec = pCritSec; /* avoid copying uninitialized data */ diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index f578751..ebc7a1c 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -173,14 +173,16 @@ LONG WINAPI BasePinImpl_GetMediaTypeVersion(BasePin *iface) return 1; }
-ULONG WINAPI BasePinImpl_AddRef(IPin * iface) +ULONG WINAPI BasePinImpl_AddRef(IPin *iface) { - BasePin *This = impl_from_IPin(iface); - ULONG refCount = InterlockedIncrement(&This->refCount); - - TRACE("(%p)->() AddRef from %d\n", iface, refCount - 1); + BasePin *pin = impl_from_IPin(iface); + return IBaseFilter_AddRef(pin->pinInfo.pFilter); +}
- return refCount; +ULONG WINAPI BasePinImpl_Release(IPin *iface) +{ + BasePin *pin = impl_from_IPin(iface); + return IBaseFilter_Release(pin->pinInfo.pFilter); }
HRESULT WINAPI BasePinImpl_Disconnect(IPin * iface) @@ -379,19 +381,6 @@ HRESULT WINAPI BaseOutputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOI return E_NOINTERFACE; }
-ULONG WINAPI BaseOutputPinImpl_Release(IPin * iface) -{ - BaseOutputPin *This = impl_BaseOutputPin_from_IPin(iface); - ULONG refCount = InterlockedDecrement(&This->pin.refCount); - - TRACE("(%p)->() Release from %d\n", iface, refCount + 1); - - if (!refCount) - BaseOutputPin_Destroy(This); - - return refCount; -} - HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { HRESULT hr; @@ -733,7 +722,6 @@ static void strmbase_pin_init(BasePin *pin, const IPinVtbl *vtbl, { memset(pin, 0, sizeof(*pin)); pin->IPin_iface.lpVtbl = vtbl; - pin->refCount = 1; pin->pCritSec = cs; pin->dRate = 1.0; Copy_PinInfo(&pin->pinInfo, info); @@ -825,19 +813,6 @@ HRESULT WINAPI BaseInputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID return E_NOINTERFACE; }
-ULONG WINAPI BaseInputPinImpl_Release(IPin * iface) -{ - BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); - ULONG refCount = InterlockedDecrement(&This->pin.refCount); - - TRACE("(%p)->() Release from %d\n", iface, refCount + 1); - - if (!refCount) - BaseInputPin_Destroy(This); - - return refCount; -} - HRESULT WINAPI BaseInputPinImpl_Connect(IPin *iface, IPin *pin, const AM_MEDIA_TYPE *pmt) { ERR("(%p)->(%p, %p) outgoing connection on an input pin!\n", iface, pin, pmt); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index bc2cb2b..8dc2355 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1286,7 +1286,6 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) piInput->pFilter = &This->filter.IBaseFilter_iface; lstrcpynW(piInput->achName, wcsInputPinName, ARRAY_SIZE(piInput->achName)); This->pInputPin.pin.IPin_iface.lpVtbl = &GST_InputPin_Vtbl; - This->pInputPin.pin.refCount = 1; This->pInputPin.pin.pConnectedTo = NULL; This->pInputPin.pin.pCritSec = &This->filter.csFilter; ZeroMemory(&This->pInputPin.pin.mtCurrent, sizeof(AM_MEDIA_TYPE)); diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 8298406..8b271d2 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -318,7 +318,6 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) piInput->pFilter = &This->filter.IBaseFilter_iface; lstrcpynW(piInput->achName, wcsInputPinName, ARRAY_SIZE(piInput->achName)); This->pInputPin.pin.IPin_iface.lpVtbl = &QT_InputPin_Vtbl; - This->pInputPin.pin.refCount = 1; This->pInputPin.pin.pConnectedTo = NULL; This->pInputPin.pin.pCritSec = &This->filter.csFilter;
diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 1a8b8aa..c19bc6c 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -31,7 +31,6 @@ void WINAPI DeleteMediaType(AM_MEDIA_TYPE * pMediaType); typedef struct BasePin { IPin IPin_iface; - LONG refCount; LPCRITICAL_SECTION pCritSec; PIN_INFO pinInfo; IPin * pConnectedTo; @@ -103,7 +102,8 @@ typedef struct BaseInputPinFuncTable { /* Base Pin */ HRESULT WINAPI BasePinImpl_GetMediaType(BasePin *This, int iPosition, AM_MEDIA_TYPE *pmt); LONG WINAPI BasePinImpl_GetMediaTypeVersion(BasePin *This); -ULONG WINAPI BasePinImpl_AddRef(IPin * iface); +ULONG WINAPI BasePinImpl_AddRef(IPin *iface); +ULONG WINAPI BasePinImpl_Release(IPin *iface); HRESULT WINAPI BasePinImpl_Disconnect(IPin * iface); HRESULT WINAPI BasePinImpl_ConnectedTo(IPin * iface, IPin ** ppPin); HRESULT WINAPI BasePinImpl_ConnectionMediaType(IPin * iface, AM_MEDIA_TYPE * pmt); @@ -117,7 +117,6 @@ HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFER
/* Base Output Pin */ HRESULT WINAPI BaseOutputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv); -ULONG WINAPI BaseOutputPinImpl_Release(IPin * iface); HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt); HRESULT WINAPI BaseOutputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt); HRESULT WINAPI BaseOutputPinImpl_Disconnect(IPin * iface); @@ -141,7 +140,6 @@ void strmbase_source_init(BaseOutputPin *pin, const IPinVtbl *vtbl, const PIN_IN
/* Base Input Pin */ HRESULT WINAPI BaseInputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv); -ULONG WINAPI BaseInputPinImpl_Release(IPin * iface); HRESULT WINAPI BaseInputPinImpl_Connect(IPin * iface, IPin * pConnector, const AM_MEDIA_TYPE * pmt); HRESULT WINAPI BaseInputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt); HRESULT WINAPI BaseInputPinImpl_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt);
-
Alexandre Julliard