[PATCH 1/5] winegstreamer: Do not handle GST_EVENT_TAG in event_src().
GST_EVENT_TAG is a downstream-only event. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index d6b47e871d5..f45036ae946 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -647,7 +647,6 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) break; default: WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); - case GST_EVENT_TAG: case GST_EVENT_QOS: case GST_EVENT_RECONFIGURE: return gst_pad_event_default(pad, parent, event); -- 2.30.0
This matches the behaviour of GstBaseSrc and GstBaseSink. In particular, we now return FALSE for unhandled source events. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index f45036ae946..a10be5c6e2f 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -645,11 +645,13 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) IAsyncReader_EndFlush(This->reader); LeaveCriticalSection(&This->filter.csFilter); break; - default: - WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); case GST_EVENT_QOS: case GST_EVENT_RECONFIGURE: - return gst_pad_event_default(pad, parent, event); + break; + default: + WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); + ret = FALSE; + break; } gst_event_unref(event); return ret; @@ -729,7 +731,6 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) } default: WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); - return gst_pad_event_default(pad, parent, event); } gst_event_unref(event); return TRUE; -- 2.30.0
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/amstream/tests/amstream.c | 8 ++-- dlls/qasf/dmowrapper.c | 4 +- dlls/qcap/filewriter.c | 4 +- dlls/qcap/smartteefilter.c | 16 ++++---- dlls/qcap/vfwcapture.c | 4 +- dlls/qedit/samplegrabber.c | 12 +++--- dlls/quartz/vmr9.c | 74 +++++++++++++++++----------------- dlls/strmbase/filter.c | 40 +++++++++--------- dlls/strmbase/pin.c | 52 ++++++++++++------------ dlls/winegstreamer/gstdemux.c | 12 +++--- include/wine/strmbase.h | 2 +- 11 files changed, 114 insertions(+), 114 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 648d5ee93c3..f422a6a8db9 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1039,9 +1039,9 @@ static HRESULT testfilter_wait_state(struct strmbase_filter *iface, DWORD timeou struct testfilter *filter = impl_from_BaseFilter(iface); HRESULT hr; - LeaveCriticalSection(&filter->filter.csFilter); + LeaveCriticalSection(&filter->filter.filter_cs); WaitForSingleObject(filter->wait_state_event, timeout); - EnterCriticalSection(&filter->filter.csFilter); + EnterCriticalSection(&filter->filter.filter_cs); hr = filter->wait_state_hr; @@ -2470,10 +2470,10 @@ static void test_set_state(void) ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "SetState returned prematurely.\n"); - EnterCriticalSection(&source.filter.csFilter); + EnterCriticalSection(&source.filter.filter_cs); source.wait_state_hr = S_OK; SetEvent(source.wait_state_event); - LeaveCriticalSection(&source.filter.csFilter); + LeaveCriticalSection(&source.filter.filter_cs); ok(!WaitForSingleObject(thread, 2000), "Wait timed out.\n"); CloseHandle(thread); diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index 8cf4404ece1..ec01e79822e 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -582,7 +582,7 @@ static HRESULT WINAPI dmo_wrapper_filter_Init(IDMOWrapperFilter *iface, REFCLSID FALSE, &sinks[0].pin.IPin_iface); } - EnterCriticalSection(&filter->filter.csFilter); + EnterCriticalSection(&filter->filter.filter_cs); filter->dmo = unk; filter->sink_count = input_count; @@ -591,7 +591,7 @@ static HRESULT WINAPI dmo_wrapper_filter_Init(IDMOWrapperFilter *iface, REFCLSID filter->sources = sources; filter->buffers = buffers; - LeaveCriticalSection(&filter->filter.csFilter); + LeaveCriticalSection(&filter->filter.filter_cs); IMediaObject_Release(dmo); diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index 6209287d379..4ea1460bb26 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -109,14 +109,14 @@ static HRESULT file_writer_sink_eos(struct strmbase_sink *iface) { struct file_writer *filter = impl_from_strmbase_pin(&iface->pin); - EnterCriticalSection(&filter->filter.csFilter); + EnterCriticalSection(&filter->filter.filter_cs); if (filter->filter.state == State_Running) deliver_ec_complete(filter); else filter->eos = TRUE; - LeaveCriticalSection(&filter->filter.csFilter); + LeaveCriticalSection(&filter->filter.filter_cs); return S_OK; } diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index ab32dce8e89..fc98666196c 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -93,7 +93,7 @@ static HRESULT sink_get_media_type(struct strmbase_pin *base, TRACE("(%p)->(%d, %p)\n", This, iPosition, amt); if (iPosition) return S_FALSE; - EnterCriticalSection(&This->filter.csFilter); + EnterCriticalSection(&This->filter.filter_cs); if (This->sink.pin.peer) { CopyMediaType(amt, &This->sink.pin.mt); @@ -101,7 +101,7 @@ static HRESULT sink_get_media_type(struct strmbase_pin *base, } else hr = S_FALSE; - LeaveCriticalSection(&This->filter.csFilter); + LeaveCriticalSection(&This->filter.filter_cs); return hr; } @@ -211,19 +211,19 @@ static HRESULT WINAPI SmartTeeFilterInput_Receive(struct strmbase_sink *base, IM * that's possible. */ /* FIXME: we should ideally do each of these in a separate thread */ - EnterCriticalSection(&This->filter.csFilter); + EnterCriticalSection(&This->filter.filter_cs); if (This->capture.pin.peer) hrCapture = copy_sample(inputSample, This->capture.pAllocator, &captureSample); - LeaveCriticalSection(&This->filter.csFilter); + LeaveCriticalSection(&This->filter.filter_cs); if (SUCCEEDED(hrCapture) && This->capture.pMemInputPin) hrCapture = IMemInputPin_Receive(This->capture.pMemInputPin, captureSample); if (captureSample) IMediaSample_Release(captureSample); - EnterCriticalSection(&This->filter.csFilter); + EnterCriticalSection(&This->filter.filter_cs); if (This->preview.pin.peer) hrPreview = copy_sample(inputSample, This->preview.pAllocator, &previewSample); - LeaveCriticalSection(&This->filter.csFilter); + LeaveCriticalSection(&This->filter.filter_cs); /* No timestamps on preview stream: */ if (SUCCEEDED(hrPreview)) hrPreview = IMediaSample_SetTime(previewSample, NULL, NULL); @@ -259,7 +259,7 @@ static HRESULT source_get_media_type(struct strmbase_pin *iface, SmartTeeFilter *filter = impl_from_strmbase_pin(iface); HRESULT hr = S_OK; - EnterCriticalSection(&filter->filter.csFilter); + EnterCriticalSection(&filter->filter.filter_cs); if (!filter->sink.pin.peer) hr = VFW_E_NOT_CONNECTED; @@ -268,7 +268,7 @@ static HRESULT source_get_media_type(struct strmbase_pin *iface, else hr = VFW_S_NO_MORE_ITEMS; - LeaveCriticalSection(&filter->filter.csFilter); + LeaveCriticalSection(&filter->filter.filter_cs); return hr; } diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 9d1934e8295..48401344ac4 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -346,7 +346,7 @@ static HRESULT WINAPI AMStreamConfig_GetFormat(IAMStreamConfig *iface, AM_MEDIA_ if (!(*mt = CoTaskMemAlloc(sizeof(**mt)))) return E_OUTOFMEMORY; - EnterCriticalSection(&filter->filter.csFilter); + EnterCriticalSection(&filter->filter.filter_cs); if (filter->source.pin.peer) { @@ -367,7 +367,7 @@ static HRESULT WINAPI AMStreamConfig_GetFormat(IAMStreamConfig *iface, AM_MEDIA_ } } - LeaveCriticalSection(&filter->filter.csFilter); + LeaveCriticalSection(&filter->filter.filter_cs); if (SUCCEEDED(hr)) strmbase_dump_media_type(*mt); diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 1619111f95d..47358f2763b 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -140,7 +140,7 @@ static void SampleGrabber_callback(struct sample_grabber *This, IMediaSample *sa if (size >= 0 && SUCCEEDED(IMediaSample_GetPointer(sample, &data))) { if (!data) size = 0; - EnterCriticalSection(&This->filter.csFilter); + EnterCriticalSection(&This->filter.filter_cs); if (This->bufferLen != size) { CoTaskMemFree(This->bufferData); This->bufferData = size ? CoTaskMemAlloc(size) : NULL; @@ -148,7 +148,7 @@ static void SampleGrabber_callback(struct sample_grabber *This, IMediaSample *sa } if (size) CopyMemory(This->bufferData, data, size); - LeaveCriticalSection(&This->filter.csFilter); + LeaveCriticalSection(&This->filter.filter_cs); } } if (!This->grabberIface) @@ -261,14 +261,14 @@ SampleGrabber_ISampleGrabber_SetBufferSamples(ISampleGrabber *iface, BOOL buffer { struct sample_grabber *This = impl_from_ISampleGrabber(iface); TRACE("(%p)->(%u)\n", This, bufferEm); - EnterCriticalSection(&This->filter.csFilter); + EnterCriticalSection(&This->filter.filter_cs); if (bufferEm) { if (This->bufferLen < 0) This->bufferLen = 0; } else This->bufferLen = -1; - LeaveCriticalSection(&This->filter.csFilter); + LeaveCriticalSection(&This->filter.filter_cs); return S_OK; } @@ -281,7 +281,7 @@ SampleGrabber_ISampleGrabber_GetCurrentBuffer(ISampleGrabber *iface, LONG *bufSi TRACE("(%p)->(%p, %p)\n", This, bufSize, buffer); if (!bufSize) return E_POINTER; - EnterCriticalSection(&This->filter.csFilter); + EnterCriticalSection(&This->filter.filter_cs); if (!This->sink.pin.peer) ret = VFW_E_NOT_CONNECTED; else if (This->bufferLen < 0) @@ -297,7 +297,7 @@ SampleGrabber_ISampleGrabber_GetCurrentBuffer(ISampleGrabber *iface, LONG *bufSi } *bufSize = This->bufferLen; } - LeaveCriticalSection(&This->filter.csFilter); + LeaveCriticalSection(&This->filter.filter_cs); return ret; } diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index a664d5109c3..37bb09b399b 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1304,18 +1304,18 @@ static HRESULT WINAPI VMR9FilterConfig_SetNumberOfStreams(IVMRFilterConfig9 *ifa return E_INVALIDARG; } - EnterCriticalSection(&filter->renderer.filter.csFilter); + EnterCriticalSection(&filter->renderer.filter.filter_cs); if (filter->stream_count) { - LeaveCriticalSection(&filter->renderer.filter.csFilter); + LeaveCriticalSection(&filter->renderer.filter.filter_cs); WARN("Stream count is already set; returning VFW_E_WRONG_STATE.\n"); return VFW_E_WRONG_STATE; } filter->stream_count = count; - LeaveCriticalSection(&filter->renderer.filter.csFilter); + LeaveCriticalSection(&filter->renderer.filter.filter_cs); return S_OK; } @@ -1325,17 +1325,17 @@ static HRESULT WINAPI VMR9FilterConfig_GetNumberOfStreams(IVMRFilterConfig9 *ifa TRACE("filter %p, count %p.\n", filter, count); - EnterCriticalSection(&filter->renderer.filter.csFilter); + EnterCriticalSection(&filter->renderer.filter.filter_cs); if (!filter->stream_count) { - LeaveCriticalSection(&filter->renderer.filter.csFilter); + LeaveCriticalSection(&filter->renderer.filter.filter_cs); return VFW_E_VMR_NOT_IN_MIXER_MODE; } *count = filter->stream_count; - LeaveCriticalSection(&filter->renderer.filter.csFilter); + LeaveCriticalSection(&filter->renderer.filter.filter_cs); return S_OK; } @@ -1362,10 +1362,10 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface TRACE("(%p/%p)->(%u)\n", iface, This, mode); - EnterCriticalSection(&This->renderer.filter.csFilter); + EnterCriticalSection(&This->renderer.filter.filter_cs); if (This->mode) { - LeaveCriticalSection(&This->renderer.filter.csFilter); + LeaveCriticalSection(&This->renderer.filter.filter_cs); return VFW_E_WRONG_STATE; } @@ -1400,7 +1400,7 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface case VMR9Mode_Renderless: break; default: - LeaveCriticalSection(&This->renderer.filter.csFilter); + LeaveCriticalSection(&This->renderer.filter.filter_cs); return E_INVALIDARG; } @@ -1408,7 +1408,7 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface video_window_cleanup(&This->window); This->mode = mode; - LeaveCriticalSection(&This->renderer.filter.csFilter); + LeaveCriticalSection(&This->renderer.filter.filter_cs); return hr; } @@ -1507,14 +1507,14 @@ static HRESULT WINAPI VMR7WindowlessControl_SetVideoPosition(IVMRWindowlessContr TRACE("(%p/%p)->(%p, %p)\n", iface, This, source, dest); - EnterCriticalSection(&This->renderer.filter.csFilter); + EnterCriticalSection(&This->renderer.filter.filter_cs); if (source) This->window.src = *source; if (dest) This->window.dst = *dest; - LeaveCriticalSection(&This->renderer.filter.csFilter); + LeaveCriticalSection(&This->renderer.filter.filter_cs); return S_OK; } @@ -1705,14 +1705,14 @@ static HRESULT WINAPI VMR9WindowlessControl_SetVideoPosition(IVMRWindowlessContr TRACE("filter %p, src %s, dst %s.\n", filter, wine_dbgstr_rect(src), wine_dbgstr_rect(dst)); - EnterCriticalSection(&filter->renderer.filter.csFilter); + EnterCriticalSection(&filter->renderer.filter.filter_cs); if (src) filter->window.src = *src; if (dst) filter->window.dst = *dst; - LeaveCriticalSection(&filter->renderer.filter.csFilter); + LeaveCriticalSection(&filter->renderer.filter.filter_cs); return S_OK; } @@ -1738,9 +1738,9 @@ static HRESULT WINAPI VMR9WindowlessControl_GetAspectRatioMode(IVMRWindowlessCon TRACE("filter %p, mode %p.\n", filter, mode); - EnterCriticalSection(&filter->renderer.filter.csFilter); + EnterCriticalSection(&filter->renderer.filter.filter_cs); *mode = filter->aspect_mode; - LeaveCriticalSection(&filter->renderer.filter.csFilter); + LeaveCriticalSection(&filter->renderer.filter.filter_cs); return S_OK; } @@ -1750,9 +1750,9 @@ static HRESULT WINAPI VMR9WindowlessControl_SetAspectRatioMode(IVMRWindowlessCon TRACE("filter %p, mode %u.\n", filter, mode); - EnterCriticalSection(&filter->renderer.filter.csFilter); + EnterCriticalSection(&filter->renderer.filter.filter_cs); filter->aspect_mode = mode; - LeaveCriticalSection(&filter->renderer.filter.csFilter); + LeaveCriticalSection(&filter->renderer.filter.filter_cs); return S_OK; } @@ -1769,11 +1769,11 @@ static HRESULT WINAPI VMR9WindowlessControl_SetVideoClippingWindow(IVMRWindowles return E_INVALIDARG; } - EnterCriticalSection(&filter->renderer.filter.csFilter); + EnterCriticalSection(&filter->renderer.filter.filter_cs); if (filter->renderer.sink.pin.peer) { - LeaveCriticalSection(&filter->renderer.filter.csFilter); + LeaveCriticalSection(&filter->renderer.filter.filter_cs); WARN("Attempt to set the clipping window while connected; returning VFW_E_WRONG_STATE.\n"); return VFW_E_WRONG_STATE; } @@ -1782,7 +1782,7 @@ static HRESULT WINAPI VMR9WindowlessControl_SetVideoClippingWindow(IVMRWindowles hr = IVMRFilterConfig9_SetNumberOfStreams(&filter->IVMRFilterConfig9_iface, 4); - LeaveCriticalSection(&filter->renderer.filter.csFilter); + LeaveCriticalSection(&filter->renderer.filter.filter_cs); return hr; } @@ -1793,24 +1793,24 @@ static HRESULT WINAPI VMR9WindowlessControl_RepaintVideo(IVMRWindowlessControl9 FIXME("(%p/%p)->(...) semi-stub\n", iface, This); - EnterCriticalSection(&This->renderer.filter.csFilter); + EnterCriticalSection(&This->renderer.filter.filter_cs); if (hwnd != This->clipping_window) { ERR("Not handling changing windows yet!!!\n"); - LeaveCriticalSection(&This->renderer.filter.csFilter); + LeaveCriticalSection(&This->renderer.filter.filter_cs); return S_OK; } if (!This->allocator_d3d9_dev) { ERR("No d3d9 device!\n"); - LeaveCriticalSection(&This->renderer.filter.csFilter); + LeaveCriticalSection(&This->renderer.filter.filter_cs); return VFW_E_WRONG_STATE; } /* Windowless extension */ hr = IDirect3DDevice9_Present(This->allocator_d3d9_dev, NULL, NULL, NULL, NULL); - LeaveCriticalSection(&This->renderer.filter.csFilter); + LeaveCriticalSection(&This->renderer.filter.filter_cs); return hr; } @@ -1990,20 +1990,20 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AdviseSurfaceAllocator( TRACE("filter %p, cookie %#Ix, allocator %p.\n", filter, cookie, allocator); - EnterCriticalSection(&filter->renderer.filter.csFilter); + EnterCriticalSection(&filter->renderer.filter.filter_cs); filter->cookie = cookie; if (filter->renderer.sink.pin.peer) { - LeaveCriticalSection(&filter->renderer.filter.csFilter); + LeaveCriticalSection(&filter->renderer.filter.filter_cs); WARN("Attempt to set allocator while connected; returning VFW_E_WRONG_STATE.\n"); return VFW_E_WRONG_STATE; } if (FAILED(IVMRSurfaceAllocator9_QueryInterface(allocator, &IID_IVMRImagePresenter9, (void **)&presenter))) { - LeaveCriticalSection(&filter->renderer.filter.csFilter); + LeaveCriticalSection(&filter->renderer.filter.filter_cs); return E_NOINTERFACE; } @@ -2016,7 +2016,7 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AdviseSurfaceAllocator( filter->presenter = presenter; IVMRSurfaceAllocator9_AddRef(allocator); - LeaveCriticalSection(&filter->renderer.filter.csFilter); + LeaveCriticalSection(&filter->renderer.filter.filter_cs); return S_OK; } @@ -2274,9 +2274,9 @@ static HRESULT WINAPI mixer_control9_SetMixingPrefs(IVMRMixerControl9 *iface, DW FIXME("filter %p, flags %#x, stub!\n", filter, flags); - EnterCriticalSection(&filter->renderer.filter.csFilter); + EnterCriticalSection(&filter->renderer.filter.filter_cs); filter->mixing_prefs = flags; - LeaveCriticalSection(&filter->renderer.filter.csFilter); + LeaveCriticalSection(&filter->renderer.filter.filter_cs); return S_OK; } @@ -2286,9 +2286,9 @@ static HRESULT WINAPI mixer_control9_GetMixingPrefs(IVMRMixerControl9 *iface, DW FIXME("filter %p, flags %p, stub!\n", filter, flags); - EnterCriticalSection(&filter->renderer.filter.csFilter); + EnterCriticalSection(&filter->renderer.filter.filter_cs); *flags = filter->mixing_prefs; - LeaveCriticalSection(&filter->renderer.filter.csFilter); + LeaveCriticalSection(&filter->renderer.filter.filter_cs); return S_OK; } @@ -2428,9 +2428,9 @@ static HRESULT WINAPI aspect_ratio_control9_GetAspectRatioMode(IVMRAspectRatioCo TRACE("filter %p, mode %p.\n", filter, mode); - EnterCriticalSection(&filter->renderer.filter.csFilter); + EnterCriticalSection(&filter->renderer.filter.filter_cs); *mode = filter->aspect_mode; - LeaveCriticalSection(&filter->renderer.filter.csFilter); + LeaveCriticalSection(&filter->renderer.filter.filter_cs); return S_OK; } @@ -2440,9 +2440,9 @@ static HRESULT WINAPI aspect_ratio_control9_SetAspectRatioMode(IVMRAspectRatioCo TRACE("filter %p, mode %u.\n", filter, mode); - EnterCriticalSection(&filter->renderer.filter.csFilter); + EnterCriticalSection(&filter->renderer.filter.filter_cs); filter->aspect_mode = mode; - LeaveCriticalSection(&filter->renderer.filter.csFilter); + LeaveCriticalSection(&filter->renderer.filter.filter_cs); return S_OK; } diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 8b8182a13ab..4f2fe5967d7 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -307,7 +307,7 @@ static HRESULT WINAPI filter_Stop(IBaseFilter *iface) TRACE("filter %p %s.\n", filter, debugstr_w(filter->name)); - EnterCriticalSection(&filter->csFilter); + EnterCriticalSection(&filter->filter_cs); if (filter->state == State_Running && filter->ops->filter_stop_stream) hr = filter->ops->filter_stop_stream(filter); @@ -316,7 +316,7 @@ static HRESULT WINAPI filter_Stop(IBaseFilter *iface) if (SUCCEEDED(hr)) filter->state = State_Stopped; - LeaveCriticalSection(&filter->csFilter); + LeaveCriticalSection(&filter->filter_cs); return hr; } @@ -328,7 +328,7 @@ static HRESULT WINAPI filter_Pause(IBaseFilter *iface) TRACE("filter %p %s.\n", filter, debugstr_w(filter->name)); - EnterCriticalSection(&filter->csFilter); + EnterCriticalSection(&filter->filter_cs); if (filter->state == State_Stopped && filter->ops->filter_init_stream) hr = filter->ops->filter_init_stream(filter); @@ -337,7 +337,7 @@ static HRESULT WINAPI filter_Pause(IBaseFilter *iface) if (SUCCEEDED(hr)) filter->state = State_Paused; - LeaveCriticalSection(&filter->csFilter); + LeaveCriticalSection(&filter->filter_cs); return hr; } @@ -349,7 +349,7 @@ static HRESULT WINAPI filter_Run(IBaseFilter *iface, REFERENCE_TIME start) TRACE("filter %p %s, start %s.\n", filter, debugstr_w(filter->name), debugstr_time(start)); - EnterCriticalSection(&filter->csFilter); + EnterCriticalSection(&filter->filter_cs); if (filter->state == State_Stopped && filter->ops->filter_init_stream) hr = filter->ops->filter_init_stream(filter); @@ -358,7 +358,7 @@ static HRESULT WINAPI filter_Run(IBaseFilter *iface, REFERENCE_TIME start) if (SUCCEEDED(hr)) filter->state = State_Running; - LeaveCriticalSection(&filter->csFilter); + LeaveCriticalSection(&filter->filter_cs); return hr; } @@ -370,13 +370,13 @@ static HRESULT WINAPI filter_GetState(IBaseFilter *iface, DWORD timeout, FILTER_ TRACE("filter %p %s, timeout %u, state %p.\n", filter, debugstr_w(filter->name), timeout, state); - EnterCriticalSection(&filter->csFilter); + EnterCriticalSection(&filter->filter_cs); if (filter->ops->filter_wait_state) hr = filter->ops->filter_wait_state(filter, timeout); *state = filter->state; - LeaveCriticalSection(&filter->csFilter); + LeaveCriticalSection(&filter->filter_cs); return hr; } @@ -387,7 +387,7 @@ static HRESULT WINAPI filter_SetSyncSource(IBaseFilter *iface, IReferenceClock * TRACE("filter %p %s, clock %p.\n", filter, debugstr_w(filter->name), clock); - EnterCriticalSection(&filter->csFilter); + EnterCriticalSection(&filter->filter_cs); if (filter->clock) IReferenceClock_Release(filter->clock); @@ -395,7 +395,7 @@ static HRESULT WINAPI filter_SetSyncSource(IBaseFilter *iface, IReferenceClock * if (filter->clock) IReferenceClock_AddRef(filter->clock); - LeaveCriticalSection(&filter->csFilter); + LeaveCriticalSection(&filter->filter_cs); return S_OK; } @@ -406,13 +406,13 @@ static HRESULT WINAPI filter_GetSyncSource(IBaseFilter *iface, IReferenceClock * TRACE("filter %p %s, clock %p.\n", filter, debugstr_w(filter->name), clock); - EnterCriticalSection(&filter->csFilter); + EnterCriticalSection(&filter->filter_cs); *clock = filter->clock; if (filter->clock) IReferenceClock_AddRef(filter->clock); - LeaveCriticalSection(&filter->csFilter); + LeaveCriticalSection(&filter->filter_cs); return S_OK; } @@ -467,7 +467,7 @@ static HRESULT WINAPI filter_JoinFilterGraph(IBaseFilter *iface, IFilterGraph *g TRACE("filter %p %s, graph %p, name %s.\n", filter, debugstr_w(filter->name), graph, debugstr_w(name)); - EnterCriticalSection(&filter->csFilter); + EnterCriticalSection(&filter->filter_cs); if (name) lstrcpynW(filter->name, name, ARRAY_SIZE(filter->name)); @@ -476,7 +476,7 @@ static HRESULT WINAPI filter_JoinFilterGraph(IBaseFilter *iface, IFilterGraph *g /* The graph references us, so we cannot also reference the graph. */ filter->graph = graph; - LeaveCriticalSection(&filter->csFilter); + LeaveCriticalSection(&filter->filter_cs); return S_OK; } @@ -524,9 +524,9 @@ void strmbase_filter_init(struct strmbase_filter *filter, IUnknown *outer, filter->outer_unk = outer ? outer : &filter->IUnknown_inner; filter->refcount = 1; - InitializeCriticalSection(&filter->csFilter); - if (filter->csFilter.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) - filter->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_filter.csFilter"); + InitializeCriticalSection(&filter->filter_cs); + if (filter->filter_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) + filter->filter_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_filter.filter_cs"); filter->clsid = *clsid; filter->pin_version = 1; filter->ops = ops; @@ -538,7 +538,7 @@ void strmbase_filter_cleanup(struct strmbase_filter *filter) IReferenceClock_Release(filter->clock); filter->IBaseFilter_iface.lpVtbl = NULL; - if (filter->csFilter.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) - filter->csFilter.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&filter->csFilter); + if (filter->filter_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) + filter->filter_cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&filter->filter_cs); } diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index d7788cda493..dcfbdcd767e 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -308,7 +308,7 @@ static HRESULT WINAPI pin_ConnectedTo(IPin * iface, IPin ** ppPin) TRACE("pin %p %s:%s, peer %p.\n", This, debugstr_w(This->filter->name), debugstr_w(This->name), ppPin); - EnterCriticalSection(&This->filter->csFilter); + EnterCriticalSection(&This->filter->filter_cs); { if (This->peer) { @@ -322,7 +322,7 @@ static HRESULT WINAPI pin_ConnectedTo(IPin * iface, IPin ** ppPin) *ppPin = NULL; } } - LeaveCriticalSection(&This->filter->csFilter); + LeaveCriticalSection(&This->filter->filter_cs); return hr; } @@ -334,7 +334,7 @@ static HRESULT WINAPI pin_ConnectionMediaType(IPin *iface, AM_MEDIA_TYPE *pmt) TRACE("pin %p %s:%s, pmt %p.\n", This, debugstr_w(This->filter->name), debugstr_w(This->name), pmt); - EnterCriticalSection(&This->filter->csFilter); + EnterCriticalSection(&This->filter->filter_cs); { if (This->peer) { @@ -348,7 +348,7 @@ static HRESULT WINAPI pin_ConnectionMediaType(IPin *iface, AM_MEDIA_TYPE *pmt) hr = VFW_E_NOT_CONNECTED; } } - LeaveCriticalSection(&This->filter->csFilter); + LeaveCriticalSection(&This->filter->filter_cs); return hr; } @@ -489,18 +489,18 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP return VFW_E_INVALID_DIRECTION; } - EnterCriticalSection(&pin->pin.filter->csFilter); + EnterCriticalSection(&pin->pin.filter->filter_cs); if (pin->pin.peer) { - LeaveCriticalSection(&pin->pin.filter->csFilter); + LeaveCriticalSection(&pin->pin.filter->filter_cs); WARN("Pin is already connected, returning VFW_E_ALREADY_CONNECTED.\n"); return VFW_E_ALREADY_CONNECTED; } if (pin->pin.filter->state != State_Stopped) { - LeaveCriticalSection(&pin->pin.filter->csFilter); + LeaveCriticalSection(&pin->pin.filter->filter_cs); WARN("Filter is not stopped; returning VFW_E_NOT_STOPPED.\n"); return VFW_E_NOT_STOPPED; } @@ -512,7 +512,7 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP && !IsEqualGUID(&mt->formattype, &GUID_NULL)) { hr = pin->pFuncsTable->pfnAttemptConnection(pin, peer, mt); - LeaveCriticalSection(&pin->pin.filter->csFilter); + LeaveCriticalSection(&pin->pin.filter->filter_cs); return hr; } @@ -524,7 +524,7 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP if (compare_media_types(mt, &candidate) && pin->pFuncsTable->pfnAttemptConnection(pin, peer, &candidate) == S_OK) { - LeaveCriticalSection(&pin->pin.filter->csFilter); + LeaveCriticalSection(&pin->pin.filter->filter_cs); FreeMediaType(&candidate); return S_OK; } @@ -539,7 +539,7 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP if (compare_media_types(mt, candidate_ptr) && pin->pFuncsTable->pfnAttemptConnection(pin, peer, candidate_ptr) == S_OK) { - LeaveCriticalSection(&pin->pin.filter->csFilter); + LeaveCriticalSection(&pin->pin.filter->filter_cs); DeleteMediaType(candidate_ptr); IEnumMediaTypes_Release(enummt); return S_OK; @@ -550,7 +550,7 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP IEnumMediaTypes_Release(enummt); } - LeaveCriticalSection(&pin->pin.filter->csFilter); + LeaveCriticalSection(&pin->pin.filter->filter_cs); return VFW_E_NO_ACCEPTABLE_TYPES; } @@ -572,11 +572,11 @@ static HRESULT WINAPI source_Disconnect(IPin *iface) TRACE("pin %p %s:%s.\n", This, debugstr_w(This->pin.filter->name), debugstr_w(This->pin.name)); - EnterCriticalSection(&This->pin.filter->csFilter); + EnterCriticalSection(&This->pin.filter->filter_cs); { if (This->pin.filter->state != State_Stopped) { - LeaveCriticalSection(&This->pin.filter->csFilter); + LeaveCriticalSection(&This->pin.filter->filter_cs); WARN("Filter is not stopped; returning VFW_E_NOT_STOPPED.\n"); return VFW_E_NOT_STOPPED; } @@ -607,7 +607,7 @@ static HRESULT WINAPI source_Disconnect(IPin *iface) else hr = S_FALSE; } - LeaveCriticalSection(&This->pin.filter->csFilter); + LeaveCriticalSection(&This->pin.filter->filter_cs); return hr; } @@ -836,11 +836,11 @@ static HRESULT WINAPI sink_ReceiveConnection(IPin *iface, IPin *pReceivePin, con if (!pmt) return E_POINTER; - EnterCriticalSection(&This->pin.filter->csFilter); + EnterCriticalSection(&This->pin.filter->filter_cs); { if (This->pin.filter->state != State_Stopped) { - LeaveCriticalSection(&This->pin.filter->csFilter); + LeaveCriticalSection(&This->pin.filter->filter_cs); WARN("Filter is not stopped; returning VFW_E_NOT_STOPPED.\n"); return VFW_E_NOT_STOPPED; } @@ -873,7 +873,7 @@ static HRESULT WINAPI sink_ReceiveConnection(IPin *iface, IPin *pReceivePin, con IPin_AddRef(pReceivePin); } } - LeaveCriticalSection(&This->pin.filter->csFilter); + LeaveCriticalSection(&This->pin.filter->filter_cs); return hr; } @@ -885,11 +885,11 @@ static HRESULT WINAPI sink_Disconnect(IPin *iface) TRACE("pin %p %s:%s.\n", pin, debugstr_w(pin->pin.filter->name), debugstr_w(pin->pin.name)); - EnterCriticalSection(&pin->pin.filter->csFilter); + EnterCriticalSection(&pin->pin.filter->filter_cs); if (pin->pin.filter->state != State_Stopped) { - LeaveCriticalSection(&pin->pin.filter->csFilter); + LeaveCriticalSection(&pin->pin.filter->filter_cs); WARN("Filter is not stopped; returning VFW_E_NOT_STOPPED.\n"); return VFW_E_NOT_STOPPED; } @@ -914,7 +914,7 @@ static HRESULT WINAPI sink_Disconnect(IPin *iface) else hr = S_FALSE; - LeaveCriticalSection(&pin->pin.filter->csFilter); + LeaveCriticalSection(&pin->pin.filter->filter_cs); return hr; } @@ -934,10 +934,10 @@ static HRESULT WINAPI sink_EndOfStream(IPin *iface) if (This->pFuncsTable->sink_eos) return This->pFuncsTable->sink_eos(This); - EnterCriticalSection(&This->pin.filter->csFilter); + EnterCriticalSection(&This->pin.filter->filter_cs); if (This->flushing) hr = S_FALSE; - LeaveCriticalSection(&This->pin.filter->csFilter); + LeaveCriticalSection(&This->pin.filter->filter_cs); if (hr == S_OK) hr = SendFurther(This, deliver_endofstream, NULL); @@ -956,7 +956,7 @@ static HRESULT WINAPI sink_BeginFlush(IPin *iface) TRACE("pin %p %s:%s.\n", pin, debugstr_w(pin->pin.filter->name), debugstr_w(pin->pin.name)); - EnterCriticalSection(&pin->pin.filter->csFilter); + EnterCriticalSection(&pin->pin.filter->filter_cs); pin->flushing = TRUE; @@ -965,7 +965,7 @@ static HRESULT WINAPI sink_BeginFlush(IPin *iface) else hr = SendFurther(pin, deliver_beginflush, NULL); - LeaveCriticalSection(&pin->pin.filter->csFilter); + LeaveCriticalSection(&pin->pin.filter->filter_cs); return hr; } @@ -982,7 +982,7 @@ static HRESULT WINAPI sink_EndFlush(IPin * iface) TRACE("pin %p %s:%s.\n", pin, debugstr_w(pin->pin.filter->name), debugstr_w(pin->pin.name)); - EnterCriticalSection(&pin->pin.filter->csFilter); + EnterCriticalSection(&pin->pin.filter->filter_cs); pin->flushing = FALSE; @@ -991,7 +991,7 @@ static HRESULT WINAPI sink_EndFlush(IPin * iface) else hr = SendFurther(pin, deliver_endflush, NULL); - LeaveCriticalSection(&pin->pin.filter->csFilter); + LeaveCriticalSection(&pin->pin.filter->filter_cs); return hr; } diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a10be5c6e2f..54691a0318a 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -634,16 +634,16 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) ret = gst_base_src_perform_seek(This, event); break; case GST_EVENT_FLUSH_START: - EnterCriticalSection(&This->filter.csFilter); + EnterCriticalSection(&This->filter.filter_cs); if (This->reader) IAsyncReader_BeginFlush(This->reader); - LeaveCriticalSection(&This->filter.csFilter); + LeaveCriticalSection(&This->filter.filter_cs); break; case GST_EVENT_FLUSH_STOP: - EnterCriticalSection(&This->filter.csFilter); + EnterCriticalSection(&This->filter.filter_cs); if (This->reader) IAsyncReader_EndFlush(This->reader); - LeaveCriticalSection(&This->filter.csFilter); + LeaveCriticalSection(&This->filter.filter_cs); break; case GST_EVENT_QOS: case GST_EVENT_RECONFIGURE: @@ -1264,7 +1264,7 @@ static gboolean activate_push(GstPad *pad, gboolean activate) { struct parser *This = gst_pad_get_element_private(pad); - EnterCriticalSection(&This->filter.csFilter); + EnterCriticalSection(&This->filter.filter_cs); if (!activate) { TRACE("Deactivating\n"); if (!This->initial) @@ -1285,7 +1285,7 @@ static gboolean activate_push(GstPad *pad, gboolean activate) else This->push_thread = CreateThread(NULL, 0, push_data, This, 0, NULL); } - LeaveCriticalSection(&This->filter.csFilter); + LeaveCriticalSection(&This->filter.filter_cs); return TRUE; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 5bd181746a1..c56a8d96037 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -126,7 +126,7 @@ struct strmbase_filter IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; - CRITICAL_SECTION csFilter; + CRITICAL_SECTION filter_cs; FILTER_STATE state; IReferenceClock *clock; -- 2.30.0
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/videorenderer.c | 16 ++++++++-------- dlls/quartz/vmr9.c | 10 +++++----- dlls/strmbase/filter.c | 6 ++++++ dlls/strmbase/renderer.c | 19 +++++++------------ include/wine/strmbase.h | 2 +- 5 files changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 2ad479a6301..a925340a676 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -112,9 +112,9 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa filter->current_sample = pSample; SetEvent(filter->renderer.state_event); - LeaveCriticalSection(&filter->renderer.csRenderLock); + LeaveCriticalSection(&filter->renderer.filter.stream_cs); WaitForMultipleObjects(2, events, FALSE, INFINITE); - EnterCriticalSection(&filter->renderer.csRenderLock); + EnterCriticalSection(&filter->renderer.filter.stream_cs); filter->current_sample = NULL; } @@ -258,33 +258,33 @@ static HRESULT video_renderer_get_current_image(struct video_window *iface, LONG size_t image_size; BYTE *sample_data; - EnterCriticalSection(&filter->renderer.csRenderLock); + EnterCriticalSection(&filter->renderer.filter.stream_cs); bih = get_bitmap_header(&filter->renderer.sink.pin.mt); image_size = bih->biWidth * bih->biHeight * bih->biBitCount / 8; if (!image) { - LeaveCriticalSection(&filter->renderer.csRenderLock); + LeaveCriticalSection(&filter->renderer.filter.stream_cs); *size = sizeof(BITMAPINFOHEADER) + image_size; return S_OK; } if (filter->renderer.filter.state != State_Paused) { - LeaveCriticalSection(&filter->renderer.csRenderLock); + LeaveCriticalSection(&filter->renderer.filter.stream_cs); return VFW_E_NOT_PAUSED; } if (!filter->current_sample) { - LeaveCriticalSection(&filter->renderer.csRenderLock); + LeaveCriticalSection(&filter->renderer.filter.stream_cs); return E_UNEXPECTED; } if (*size < sizeof(BITMAPINFOHEADER) + image_size) { - LeaveCriticalSection(&filter->renderer.csRenderLock); + LeaveCriticalSection(&filter->renderer.filter.stream_cs); return E_OUTOFMEMORY; } @@ -292,7 +292,7 @@ static HRESULT video_renderer_get_current_image(struct video_window *iface, LONG IMediaSample_GetPointer(filter->current_sample, &sample_data); memcpy((char *)image + sizeof(BITMAPINFOHEADER), sample_data, image_size); - LeaveCriticalSection(&filter->renderer.csRenderLock); + LeaveCriticalSection(&filter->renderer.filter.stream_cs); return S_OK; } diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 37bb09b399b..57b219a6d26 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -317,9 +317,9 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi if (filter->renderer.filter.state == State_Paused) { SetEvent(filter->renderer.state_event); - LeaveCriticalSection(&filter->renderer.csRenderLock); + LeaveCriticalSection(&filter->renderer.filter.stream_cs); WaitForMultipleObjects(2, events, FALSE, INFINITE); - EnterCriticalSection(&filter->renderer.csRenderLock); + EnterCriticalSection(&filter->renderer.filter.stream_cs); } return hr; @@ -687,7 +687,7 @@ static HRESULT vmr_get_current_image(struct video_window *iface, LONG *size, LON char *dst; HRESULT hr; - EnterCriticalSection(&filter->renderer.csRenderLock); + EnterCriticalSection(&filter->renderer.filter.stream_cs); device = filter->allocator_d3d9_dev; bih = *get_bitmap_header(&filter->renderer.sink.pin.mt); @@ -696,7 +696,7 @@ static HRESULT vmr_get_current_image(struct video_window *iface, LONG *size, LON if (!image) { *size = sizeof(BITMAPINFOHEADER) + bih.biSizeImage; - LeaveCriticalSection(&filter->renderer.csRenderLock); + LeaveCriticalSection(&filter->renderer.filter.stream_cs); return S_OK; } @@ -732,7 +732,7 @@ static HRESULT vmr_get_current_image(struct video_window *iface, LONG *size, LON out: if (surface) IDirect3DSurface9_Release(surface); if (rt) IDirect3DSurface9_Release(rt); - LeaveCriticalSection(&filter->renderer.csRenderLock); + LeaveCriticalSection(&filter->renderer.filter.stream_cs); return hr; } diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 4f2fe5967d7..93593e4c189 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -527,6 +527,9 @@ void strmbase_filter_init(struct strmbase_filter *filter, IUnknown *outer, InitializeCriticalSection(&filter->filter_cs); if (filter->filter_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) filter->filter_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_filter.filter_cs"); + InitializeCriticalSection(&filter->stream_cs); + if (filter->stream_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) + filter->stream_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_filter.stream_cs"); filter->clsid = *clsid; filter->pin_version = 1; filter->ops = ops; @@ -541,4 +544,7 @@ void strmbase_filter_cleanup(struct strmbase_filter *filter) if (filter->filter_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) filter->filter_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&filter->filter_cs); + if (filter->stream_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) + filter->stream_cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&filter->stream_cs); } diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 24d209703ca..b63129e0e87 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -192,7 +192,7 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp DeleteMediaType(mt); } - EnterCriticalSection(&filter->csRenderLock); + EnterCriticalSection(&filter->filter.stream_cs); if (filter->filter.clock && SUCCEEDED(IMediaSample_GetTime(sample, &start, &stop))) { @@ -229,7 +229,7 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp if (ret == 1) { - LeaveCriticalSection(&filter->csRenderLock); + LeaveCriticalSection(&filter->filter.stream_cs); TRACE("Flush signaled; discarding current sample.\n"); return S_OK; } @@ -245,7 +245,7 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp QualityControlRender_DoQOS(&filter->qc); - LeaveCriticalSection(&filter->csRenderLock); + LeaveCriticalSection(&filter->filter.stream_cs); return hr; } @@ -273,7 +273,7 @@ static HRESULT sink_eos(struct strmbase_sink *iface) IFilterGraph *graph = filter->filter.graph; IMediaEventSink *event_sink; - EnterCriticalSection(&filter->csRenderLock); + EnterCriticalSection(&filter->filter.stream_cs); filter->eos = TRUE; @@ -287,7 +287,7 @@ static HRESULT sink_eos(struct strmbase_sink *iface) strmbase_passthrough_eos(&filter->passthrough); SetEvent(filter->state_event); - LeaveCriticalSection(&filter->csRenderLock); + LeaveCriticalSection(&filter->filter.stream_cs); return S_OK; } @@ -304,14 +304,14 @@ static HRESULT sink_end_flush(struct strmbase_sink *iface) { struct strmbase_renderer *filter = impl_from_IPin(&iface->pin.IPin_iface); - EnterCriticalSection(&filter->csRenderLock); + EnterCriticalSection(&filter->filter.stream_cs); filter->eos = FALSE; QualityControlRender_Start(&filter->qc, filter->stream_start); strmbase_passthrough_invalidate_time(&filter->passthrough); ResetEvent(filter->flush_event); - LeaveCriticalSection(&filter->csRenderLock); + LeaveCriticalSection(&filter->filter.stream_cs); return S_OK; } @@ -336,9 +336,6 @@ void strmbase_renderer_cleanup(struct strmbase_renderer *filter) strmbase_passthrough_cleanup(&filter->passthrough); - filter->csRenderLock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&filter->csRenderLock); - CloseHandle(filter->state_event); CloseHandle(filter->advise_event); CloseHandle(filter->flush_event); @@ -358,8 +355,6 @@ void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, strmbase_sink_init(&filter->sink, &filter->filter, sink_name, &sink_ops, NULL); - InitializeCriticalSection(&filter->csRenderLock); - filter->csRenderLock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": strmbase_renderer.csRenderLock"); filter->state_event = CreateEventW(NULL, TRUE, TRUE, NULL); filter->advise_event = CreateEventW(NULL, FALSE, FALSE, NULL); filter->flush_event = CreateEventW(NULL, TRUE, TRUE, NULL); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index c56a8d96037..4bb9d898a1a 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -127,6 +127,7 @@ struct strmbase_filter IUnknown *outer_unk; LONG refcount; CRITICAL_SECTION filter_cs; + CRITICAL_SECTION stream_cs; FILTER_STATE state; IReferenceClock *clock; @@ -295,7 +296,6 @@ struct strmbase_renderer struct strmbase_sink sink; - CRITICAL_SECTION csRenderLock; /* Signaled when the filter has completed a state change. The filter waits * for this event in IBaseFilter::GetState(). */ HANDLE state_event; -- 2.30.0
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/dsoundrender.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index fc64eae8f72..f07e7b0d1e0 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -51,7 +51,6 @@ struct dsound_render struct strmbase_sink sink; - CRITICAL_SECTION stream_cs; /* Signaled when the filter has completed a state change. The filter waits * for this event in IBaseFilter::GetState(). */ HANDLE state_event; @@ -375,7 +374,7 @@ static HRESULT WINAPI dsound_render_sink_Receive(struct strmbase_sink *iface, IM if (FAILED(hr = DSoundRender_PrepareReceive(filter, sample))) return hr; - EnterCriticalSection(&filter->stream_cs); + EnterCriticalSection(&filter->filter.stream_cs); if (filter->filter.clock && SUCCEEDED(IMediaSample_GetTime(sample, &start, &stop))) strmbase_passthrough_update_time(&filter->passthrough, start); @@ -385,7 +384,7 @@ static HRESULT WINAPI dsound_render_sink_Receive(struct strmbase_sink *iface, IM hr = DSoundRender_DoRenderSample(filter, sample); - LeaveCriticalSection(&filter->stream_cs); + LeaveCriticalSection(&filter->filter.stream_cs); return hr; } @@ -515,7 +514,7 @@ static HRESULT dsound_render_sink_eos(struct strmbase_sink *iface) void *buffer; DWORD size; - EnterCriticalSection(&filter->stream_cs); + EnterCriticalSection(&filter->filter.stream_cs); filter->eos = TRUE; @@ -535,7 +534,7 @@ static HRESULT dsound_render_sink_eos(struct strmbase_sink *iface) memset(buffer, 0, size); IDirectSoundBuffer_Unlock(filter->dsbuffer, buffer, size, NULL, 0); - LeaveCriticalSection(&filter->stream_cs); + LeaveCriticalSection(&filter->filter.stream_cs); return S_OK; } @@ -551,7 +550,7 @@ static HRESULT dsound_render_sink_end_flush(struct strmbase_sink *iface) { struct dsound_render *filter = impl_from_strmbase_pin(&iface->pin); - EnterCriticalSection(&filter->stream_cs); + EnterCriticalSection(&filter->filter.stream_cs); filter->eos = FALSE; strmbase_passthrough_invalidate_time(&filter->passthrough); @@ -569,7 +568,7 @@ static HRESULT dsound_render_sink_end_flush(struct strmbase_sink *iface) filter->writepos = filter->buf_size; } - LeaveCriticalSection(&filter->stream_cs); + LeaveCriticalSection(&filter->filter.stream_cs); return S_OK; } @@ -601,9 +600,6 @@ static void dsound_render_destroy(struct strmbase_filter *iface) IPin_Disconnect(&filter->sink.pin.IPin_iface); strmbase_sink_cleanup(&filter->sink); - filter->stream_cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&filter->stream_cs); - CloseHandle(filter->state_event); CloseHandle(filter->flush_event); @@ -1095,8 +1091,6 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out) strmbase_sink_init(&object->sink, &object->filter, L"Audio Input pin (rendered)", &sink_ops, NULL); - InitializeCriticalSection(&object->stream_cs); - object->stream_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": dsound_render.stream_cs"); object->state_event = CreateEventW(NULL, TRUE, TRUE, NULL); object->flush_event = CreateEventW(NULL, TRUE, TRUE, NULL); -- 2.30.0
participants (1)
-
Zebediah Figura