[PATCH 3/5] winegstreamer: Share sink pin and filter reference counts.
Zebediah Figura
z.figura12 at gmail.com
Mon Jun 17 20:41:57 CDT 2019
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/winegstreamer/gstdemux.c | 45 ++++++++++++++---------------------
1 file changed, 18 insertions(+), 27 deletions(-)
diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c
index fcb909bebc7..9b489c40fe4 100644
--- a/dlls/winegstreamer/gstdemux.c
+++ b/dlls/winegstreamer/gstdemux.c
@@ -1207,7 +1207,6 @@ static void gstdemux_destroy(BaseFilter *iface)
{
GSTImpl *filter = impl_from_IBaseFilter(&iface->IBaseFilter_iface);
IPin *connected = NULL;
- ULONG pinref;
HRESULT hr;
CloseHandle(filter->no_more_pads_event);
@@ -1223,16 +1222,16 @@ static void gstdemux_destroy(BaseFilter *iface)
hr = IPin_Disconnect(&filter->pInputPin.pin.IPin_iface);
assert(hr == S_OK);
}
- pinref = IPin_Release(&filter->pInputPin.pin.IPin_iface);
- if (pinref)
- {
- /* Valgrind could find this, if I kill it here */
- ERR("pinref should be null, is %u, destroying anyway\n", pinref);
- assert((LONG)pinref > 0);
- while (pinref)
- pinref = IPin_Release(&filter->pInputPin.pin.IPin_iface);
- }
+ FreeMediaType(&filter->pInputPin.pin.mtCurrent);
+ if (filter->pInputPin.pAlloc)
+ IMemAllocator_Release(filter->pInputPin.pAlloc);
+ filter->pInputPin.pAlloc = NULL;
+ if (filter->pInputPin.pReader)
+ IAsyncReader_Release(filter->pInputPin.pReader);
+ filter->pInputPin.pReader = NULL;
+ filter->pInputPin.pin.IPin_iface.lpVtbl = NULL;
+
if (filter->bus)
{
gst_bus_set_sync_handler(filter->bus, NULL, NULL, NULL);
@@ -1888,24 +1887,16 @@ static inline GSTInPin *impl_sink_from_IPin(IPin *iface)
return CONTAINING_RECORD(iface, GSTInPin, pin.IPin_iface);
}
-static ULONG WINAPI GSTInPin_Release(IPin *iface)
+static ULONG WINAPI GSTInPin_AddRef(IPin *iface)
{
- GSTInPin *This = impl_sink_from_IPin(iface);
- ULONG refCount = InterlockedDecrement(&This->pin.refCount);
+ GSTInPin *pin = impl_sink_from_IPin(iface);
+ return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter);
+}
- TRACE("(%p)->() Release from %d\n", iface, refCount + 1);
- if (!refCount) {
- FreeMediaType(&This->pin.mtCurrent);
- if (This->pAlloc)
- IMemAllocator_Release(This->pAlloc);
- This->pAlloc = NULL;
- if (This->pReader)
- IAsyncReader_Release(This->pReader);
- This->pReader = NULL;
- This->pin.IPin_iface.lpVtbl = NULL;
- return 0;
- } else
- return refCount;
+static ULONG WINAPI GSTInPin_Release(IPin *iface)
+{
+ GSTInPin *pin = impl_sink_from_IPin(iface);
+ return IBaseFilter_Release(pin->pin.pinInfo.pFilter);
}
static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, const AM_MEDIA_TYPE *pmt)
@@ -2090,7 +2081,7 @@ static HRESULT WINAPI GSTInPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppE
static const IPinVtbl GST_InputPin_Vtbl = {
GSTInPin_QueryInterface,
- BasePinImpl_AddRef,
+ GSTInPin_AddRef,
GSTInPin_Release,
BaseInputPinImpl_Connect,
GSTInPin_ReceiveConnection,
--
2.21.0
More information about the wine-devel
mailing list