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

strmbase: do not lock in BaseOutputPinImpl_GetDeliveryBuffer the MemInputPin will lock in the required places.

This commit is contained in:
Aric Stewart 2012-05-11 13:19:38 -05:00 committed by Alexandre Julliard
parent 2ebfd01b51
commit c736af74dc
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/strmbase/pin.c
View File

@ -580,27 +580,23 @@ HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin *This, IMediaSa
TRACE("(%p, %p, %p, %x)\n", ppSample, tStart, tStop, dwFlags); TRACE("(%p, %p, %p, %x)\n", ppSample, tStart, tStop, dwFlags);
EnterCriticalSection(This->pin.pCritSec); if (!This->pin.pConnectedTo)
hr = VFW_E_NOT_CONNECTED;
else
{ {
if (!This->pin.pConnectedTo) IMemAllocator * pAlloc = NULL;
hr = VFW_E_NOT_CONNECTED;
else
{
IMemAllocator * pAlloc = NULL;
hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pAlloc); hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pAlloc);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
hr = IMemAllocator_GetBuffer(pAlloc, ppSample, tStart, tStop, dwFlags); hr = IMemAllocator_GetBuffer(pAlloc, ppSample, tStart, tStop, dwFlags);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
hr = IMediaSample_SetTime(*ppSample, tStart, tStop); hr = IMediaSample_SetTime(*ppSample, tStart, tStop);
if (pAlloc) if (pAlloc)
IMemAllocator_Release(pAlloc); IMemAllocator_Release(pAlloc);
}
} }
LeaveCriticalSection(This->pin.pCritSec);
return hr; return hr;
} }