Anton Baskanov : strmbase: Defer EC_COMPLETE until the renderer is running.
Alexandre Julliard
julliard at winehq.org
Thu May 27 16:02:09 CDT 2021
Module: wine
Branch: master
Commit: 82b86d470488ae266d3ccd46ae4a6750ff3e79eb
URL: https://source.winehq.org/git/wine.git/?a=commit;h=82b86d470488ae266d3ccd46ae4a6750ff3e79eb
Author: Anton Baskanov <baskanov at gmail.com>
Date: Wed May 26 23:46:43 2021 +0700
strmbase: Defer EC_COMPLETE until the renderer is running.
Signed-off-by: Anton Baskanov <baskanov at gmail.com>
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/quartz/tests/videorenderer.c | 4 ++--
dlls/quartz/tests/vmr9.c | 4 ++--
dlls/strmbase/renderer.c | 14 +++++++++++++-
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c
index 470652543ad..4ff84e77012 100644
--- a/dlls/quartz/tests/videorenderer.c
+++ b/dlls/quartz/tests/videorenderer.c
@@ -1143,7 +1143,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control)
hr = IMediaControl_GetState(control, 1000, &state);
ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0);
- todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n");
+ ok(!ret, "Got unexpected EC_COMPLETE.\n");
hr = join_thread(send_frame(input));
todo_wine ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr);
@@ -1151,7 +1151,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control)
hr = IMediaControl_Run(control);
ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0);
- todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n");
+ ok(ret == 1, "Expected EC_COMPLETE.\n");
hr = IMediaControl_Stop(control);
ok(hr == S_OK, "Got hr %#x.\n", hr);
diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c
index c7a84d65b7b..5bca91faecd 100644
--- a/dlls/quartz/tests/vmr9.c
+++ b/dlls/quartz/tests/vmr9.c
@@ -1295,7 +1295,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control)
hr = IMediaControl_GetState(control, 1000, &state);
ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0);
- todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n");
+ ok(!ret, "Got unexpected EC_COMPLETE.\n");
hr = join_thread(send_frame(input));
todo_wine ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr);
@@ -1303,7 +1303,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control)
hr = IMediaControl_Run(control);
ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0);
- todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n");
+ ok(ret == 1, "Expected EC_COMPLETE.\n");
hr = IMediaControl_Stop(control);
ok(hr == S_OK, "Got hr %#x.\n", hr);
diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c
index daa407ba42e..01fabfc98de 100644
--- a/dlls/strmbase/renderer.c
+++ b/dlls/strmbase/renderer.c
@@ -242,6 +242,8 @@ static HRESULT renderer_init_stream(struct strmbase_filter *iface)
static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TIME start)
{
struct strmbase_renderer *filter = impl_from_strmbase_filter(iface);
+ IFilterGraph *graph = filter->filter.graph;
+ IMediaEventSink *event_sink;
filter->stream_start = start;
SetEvent(filter->state_event);
@@ -250,6 +252,15 @@ static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TI
if (filter->sink.pin.peer && filter->ops->renderer_start_stream)
filter->ops->renderer_start_stream(filter);
+ if (filter->eos && graph
+ && SUCCEEDED(IFilterGraph_QueryInterface(graph,
+ &IID_IMediaEventSink, (void **)&event_sink)))
+ {
+ IMediaEventSink_Notify(event_sink, EC_COMPLETE, S_OK,
+ (LONG_PTR)&filter->filter.IBaseFilter_iface);
+ IMediaEventSink_Release(event_sink);
+ }
+
return S_OK;
}
@@ -437,7 +448,8 @@ static HRESULT sink_eos(struct strmbase_sink *iface)
filter->eos = TRUE;
- if (graph && SUCCEEDED(IFilterGraph_QueryInterface(graph,
+ if (filter->filter.state == State_Running && graph
+ && SUCCEEDED(IFilterGraph_QueryInterface(graph,
&IID_IMediaEventSink, (void **)&event_sink)))
{
IMediaEventSink_Notify(event_sink, EC_COMPLETE, S_OK,
More information about the wine-cvs
mailing list