system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

strmbase: Clean up source_Connect().

Browse source 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2020-02-05 19:50:04 -06:00 committed by Alexandre Julliard
parent b10a328bf5
commit 1d1ca2f883
1 changed files with 55 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

125
dlls/strmbase/pin.c
View file

@ -428,96 +428,81 @@ static inline struct strmbase_source *impl_source_from_IPin( IPin *iface )
return CONTAINING_RECORD(iface, struct strmbase_source, pin.IPin_iface); return CONTAINING_RECORD(iface, struct strmbase_source, pin.IPin_iface);
} }
static HRESULT WINAPI source_Connect(IPin *iface, IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt)
{ {
struct strmbase_source *pin = impl_source_from_IPin(iface);
AM_MEDIA_TYPE *candidate;
IEnumMediaTypes *enummt;
ULONG count;
HRESULT hr; HRESULT hr;
struct strmbase_source *This = impl_source_from_IPin(iface);
TRACE("pin %p %s:%s, peer %p, mt %p.\n", This, debugstr_w(This->pin.filter->name), TRACE("pin %p %s:%s, peer %p, mt %p.\n", pin, debugstr_w(pin->pin.filter->name),
debugstr_w(This->pin.name), pReceivePin, pmt); debugstr_w(pin->pin.name), peer, mt);
strmbase_dump_media_type(pmt); strmbase_dump_media_type(mt);
if (!pReceivePin) if (!peer)
return E_POINTER; return E_POINTER;
/* If we try to connect to ourselves, we will definitely deadlock. /* If we try to connect to ourselves, we will definitely deadlock.
* There are other cases where we could deadlock too, but this * There are other cases where we could deadlock too, but this
* catches the obvious case */ * catches the obvious case */
assert(pReceivePin != iface); assert(peer != iface);
EnterCriticalSection(&This->pin.filter->csFilter); EnterCriticalSection(&pin->pin.filter->csFilter);
if (pin->pin.filter->state != State_Stopped)
{ {
if (This->pin.filter->state != State_Stopped) LeaveCriticalSection(&pin->pin.filter->csFilter);
WARN("Filter is not stopped; returning VFW_E_NOT_STOPPED.\n");
return VFW_E_NOT_STOPPED;
}
if (mt && !IsEqualGUID(&mt->majortype, &GUID_NULL) && !IsEqualGUID(&mt->subtype, &GUID_NULL))
{
hr = pin->pFuncsTable->pfnAttemptConnection(pin, peer, mt);
LeaveCriticalSection(&pin->pin.filter->csFilter);
return hr;
}
if (SUCCEEDED(IPin_EnumMediaTypes(iface, &enummt)))
{
while (IEnumMediaTypes_Next(enummt, 1, &candidate, NULL) == S_OK)
{ {
LeaveCriticalSection(&This->pin.filter->csFilter); if ((!mt || CompareMediaTypes(mt, candidate, TRUE))
WARN("Filter is not stopped; returning VFW_E_NOT_STOPPED.\n"); && pin->pFuncsTable->pfnAttemptConnection(pin, peer, candidate) == S_OK)
return VFW_E_NOT_STOPPED; {
LeaveCriticalSection(&pin->pin.filter->csFilter);
DeleteMediaType(candidate);
IEnumMediaTypes_Release(enummt);
return S_OK;
}
DeleteMediaType(candidate);
} }
/* if we have been a specific type to connect with, then we can either connect IEnumMediaTypes_Release(enummt);
* with that or fail. We cannot choose different AM_MEDIA_TYPE */ }
if (pmt && !IsEqualGUID(&pmt->majortype, &GUID_NULL) && !IsEqualGUID(&pmt->subtype, &GUID_NULL))
hr = This->pFuncsTable->pfnAttemptConnection(This, pReceivePin, pmt); if (SUCCEEDED(IPin_EnumMediaTypes(peer, &enummt)))
else {
while (IEnumMediaTypes_Next(enummt, 1, &candidate, &count) == S_OK)
{ {
/* negotiate media type */ if ((!mt || CompareMediaTypes(mt, candidate, TRUE))
&& pin->pFuncsTable->pfnAttemptConnection(pin, peer, candidate) == S_OK)
IEnumMediaTypes * pEnumCandidates;
AM_MEDIA_TYPE * pmtCandidate = NULL; /* Candidate media type */
if (SUCCEEDED(hr = IPin_EnumMediaTypes(iface, &pEnumCandidates)))
{ {
hr = VFW_E_NO_ACCEPTABLE_TYPES; /* Assume the worst, but set to S_OK if connected successfully */ LeaveCriticalSection(&pin->pin.filter->csFilter);
DeleteMediaType(candidate);
/* try this filter's media types first */ IEnumMediaTypes_Release(enummt);
while (S_OK == IEnumMediaTypes_Next(pEnumCandidates, 1, &pmtCandidate, NULL)) return S_OK;
{
assert(pmtCandidate);
if (!IsEqualGUID(&FORMAT_None, &pmtCandidate->formattype)
&& !IsEqualGUID(&GUID_NULL, &pmtCandidate->formattype))
assert(pmtCandidate->pbFormat);
if ((!pmt || CompareMediaTypes(pmt, pmtCandidate, TRUE))
&& This->pFuncsTable->pfnAttemptConnection(This, pReceivePin, pmtCandidate) == S_OK)
{
hr = S_OK;
DeleteMediaType(pmtCandidate);
break;
}
DeleteMediaType(pmtCandidate);
pmtCandidate = NULL;
}
IEnumMediaTypes_Release(pEnumCandidates);
} }
DeleteMediaType(candidate);
}
/* then try receiver filter's media types */ IEnumMediaTypes_Release(enummt);
if (hr != S_OK && SUCCEEDED(hr = IPin_EnumMediaTypes(pReceivePin, &pEnumCandidates))) /* if we haven't already connected successfully */ }
{
ULONG fetched;
hr = VFW_E_NO_ACCEPTABLE_TYPES; /* Assume the worst, but set to S_OK if connected successfully */ LeaveCriticalSection(&pin->pin.filter->csFilter);
while (S_OK == IEnumMediaTypes_Next(pEnumCandidates, 1, &pmtCandidate, &fetched)) return VFW_E_NO_ACCEPTABLE_TYPES;
{
assert(pmtCandidate);
strmbase_dump_media_type(pmtCandidate);
if ((!pmt || CompareMediaTypes(pmt, pmtCandidate, TRUE))
&& This->pFuncsTable->pfnAttemptConnection(This, pReceivePin, pmtCandidate) == S_OK)
{
hr = S_OK;
DeleteMediaType(pmtCandidate);
break;
}
DeleteMediaType(pmtCandidate);
pmtCandidate = NULL;
} /* while */
IEnumMediaTypes_Release(pEnumCandidates);
} /* if not found */
} /* if negotiate media type */
} /* if succeeded */
LeaveCriticalSection(&This->pin.filter->csFilter);
TRACE(" -- %x\n", hr);
return hr;
} }
static HRESULT WINAPI source_ReceiveConnection(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) static HRESULT WINAPI source_ReceiveConnection(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt)