ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wineqtdecoder: Share sink pin and filter reference counts. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2019-06-17 20:41:59 -05:00 committed by Alexandre Julliard
parent 8983528f60
commit f194d99d20
1 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
dlls/wineqtdecoder/qtsplitter.c
View File

@ -225,7 +225,6 @@ static void qt_splitter_destroy(BaseFilter *iface)
{ {
QTSplitter *filter = impl_from_BaseFilter(iface); QTSplitter *filter = impl_from_BaseFilter(iface);
IPin *peer = NULL; IPin *peer = NULL;
ULONG pinref;
EnterCriticalSection(&filter->csReceive); EnterCriticalSection(&filter->csReceive);
/* Don't need to clean up output pins, disconnecting input pin will do that */ /* Don't need to clean up output pins, disconnecting input pin will do that */
@ -235,15 +234,15 @@ static void qt_splitter_destroy(BaseFilter *iface)
IPin_Disconnect(peer); IPin_Disconnect(peer);
IPin_Release(peer); IPin_Release(peer);
} }
pinref = IPin_Release(&filter->pInputPin.pin.IPin_iface);
if (pinref)
{
ERR("pinref should be null, is %u, destroying anyway\n", pinref);
assert((LONG)pinref > 0);
while (pinref) FreeMediaType(&filter->pInputPin.pin.mtCurrent);
pinref = IPin_Release(&filter->pInputPin.pin.IPin_iface); 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->pQTMovie) if (filter->pQTMovie)
{ {
@ -833,26 +832,16 @@ static inline QTInPin *impl_from_IPin( IPin *iface )
return CONTAINING_RECORD(iface, QTInPin, pin.IPin_iface); return CONTAINING_RECORD(iface, QTInPin, pin.IPin_iface);
} }
static ULONG WINAPI QTInPin_AddRef(IPin *iface)
{
QTInPin *pin = impl_from_IPin(iface);
return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter);
}
static ULONG WINAPI QTInPin_Release(IPin *iface) static ULONG WINAPI QTInPin_Release(IPin *iface)
{ {
QTInPin *This = impl_from_IPin(iface); QTInPin *pin = impl_from_IPin(iface);
ULONG refCount = InterlockedDecrement(&This->pin.refCount); return IBaseFilter_Release(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 HRESULT QT_Process_Video_Track(QTSplitter* filter, Track trk) static HRESULT QT_Process_Video_Track(QTSplitter* filter, Track trk)
@ -1288,7 +1277,7 @@ static HRESULT WINAPI QTInPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEn
static const IPinVtbl QT_InputPin_Vtbl = { static const IPinVtbl QT_InputPin_Vtbl = {
QTInPin_QueryInterface, QTInPin_QueryInterface,
BasePinImpl_AddRef, QTInPin_AddRef,
QTInPin_Release, QTInPin_Release,
BaseInputPinImpl_Connect, BaseInputPinImpl_Connect,
QTInPin_ReceiveConnection, QTInPin_ReceiveConnection,