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

strmbase: Acquire the streaming lock in MemInputPin_Receive(). 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-01-19 21:35:34 -06:00 committed by Alexandre Julliard
parent 89b82195cd
commit 32d339829e
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/quartz/dsoundrender.c
View File

@ -373,18 +373,13 @@ static HRESULT WINAPI dsound_render_sink_Receive(struct strmbase_sink *iface, IM
if (FAILED(hr = DSoundRender_PrepareReceive(filter, sample))) if (FAILED(hr = DSoundRender_PrepareReceive(filter, sample)))
return hr; return hr;
EnterCriticalSection(&filter->filter.stream_cs);
if (filter->filter.clock && SUCCEEDED(IMediaSample_GetTime(sample, &start, &stop))) if (filter->filter.clock && SUCCEEDED(IMediaSample_GetTime(sample, &start, &stop)))
strmbase_passthrough_update_time(&filter->passthrough, start); strmbase_passthrough_update_time(&filter->passthrough, start);
if (filter->filter.state == State_Paused) if (filter->filter.state == State_Paused)
SetEvent(filter->state_event); SetEvent(filter->state_event);
hr = DSoundRender_DoRenderSample(filter, sample); return DSoundRender_DoRenderSample(filter, sample);
LeaveCriticalSection(&filter->filter.stream_cs);
return hr;
} }
static HRESULT dsound_render_sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) static HRESULT dsound_render_sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out)

4
dlls/strmbase/pin.c
View File

@ -1140,7 +1140,11 @@ static HRESULT WINAPI MemInputPin_Receive(IMemInputPin *iface, IMediaSample *sam
debugstr_w(pin->pin.name), sample); debugstr_w(pin->pin.name), sample);
if (pin->pFuncsTable->pfnReceive) if (pin->pFuncsTable->pfnReceive)
{
EnterCriticalSection(&pin->pin.filter->stream_cs);
hr = pin->pFuncsTable->pfnReceive(pin, sample); hr = pin->pFuncsTable->pfnReceive(pin, sample);
LeaveCriticalSection(&pin->pin.filter->stream_cs);
}
return hr; return hr;
} }

5
dlls/strmbase/renderer.c
View File

@ -192,8 +192,6 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp
DeleteMediaType(mt); DeleteMediaType(mt);
} }
EnterCriticalSection(&filter->filter.stream_cs);
if (filter->filter.clock && SUCCEEDED(IMediaSample_GetTime(sample, &start, &stop))) if (filter->filter.clock && SUCCEEDED(IMediaSample_GetTime(sample, &start, &stop)))
{ {
strmbase_passthrough_update_time(&filter->passthrough, start); strmbase_passthrough_update_time(&filter->passthrough, start);
@ -229,7 +227,6 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp
if (ret == 1) if (ret == 1)
{ {
LeaveCriticalSection(&filter->filter.stream_cs);
TRACE("Flush signaled; discarding current sample.\n"); TRACE("Flush signaled; discarding current sample.\n");
return S_OK; return S_OK;
} }
@ -245,8 +242,6 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp
QualityControlRender_DoQOS(&filter->qc); QualityControlRender_DoQOS(&filter->qc);
LeaveCriticalSection(&filter->filter.stream_cs);
return hr; return hr;
} }