[PATCH] strmbase: Send EC_COMPLETE on Run for unconnected renderers
Andrew Eikum
aeikum at codeweavers.com
Fri Oct 22 14:05:13 CDT 2021
Tests written by Zebediah Figura.
Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
---
dlls/evr/tests/evr.c | 104 ++++++++++++++++++++++++++++++
dlls/qedit/tests/nullrenderer.c | 104 ++++++++++++++++++++++++++++++
dlls/quartz/tests/videorenderer.c | 67 +++++++++++++++++++
dlls/quartz/tests/vmr9.c | 67 +++++++++++++++++++
dlls/strmbase/renderer.c | 2 +-
5 files changed, 343 insertions(+), 1 deletion(-)
diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c
index 01edda7bc9b..4f2bfc5b986 100644
--- a/dlls/evr/tests/evr.c
+++ b/dlls/evr/tests/evr.c
@@ -84,6 +84,15 @@ static IBaseFilter *create_evr(void)
return filter;
}
+static IFilterGraph2 *create_graph(void)
+{
+ IFilterGraph2 *ret;
+ HRESULT hr;
+ hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&ret);
+ ok(hr == S_OK, "Failed to create FilterGraph: %#x\n", hr);
+ return ret;
+}
+
static ULONG get_refcount(void *iface)
{
IUnknown *unknown = iface;
@@ -2763,6 +2772,100 @@ static void test_MFIsFormatYUV(void)
}
}
+static unsigned int check_event_code(IMediaEvent *eventsrc, DWORD timeout, LONG expected_code, LONG_PTR expected1, LONG_PTR expected2)
+{
+ LONG_PTR param1, param2;
+ unsigned int ret = 0;
+ HRESULT hr;
+ LONG code;
+
+ while ((hr = IMediaEvent_GetEvent(eventsrc, &code, ¶m1, ¶m2, timeout)) == S_OK)
+ {
+ if (code == expected_code)
+ {
+ ok(param1 == expected1, "Got param1 %#lx.\n", param1);
+ ok(param2 == expected2, "Got param2 %#lx.\n", param2);
+ ret++;
+ }
+ IMediaEvent_FreeEventParams(eventsrc, code, param1, param2);
+ timeout = 0;
+ }
+ ok(hr == E_ABORT, "Got hr %#x.\n", hr);
+
+ return ret;
+}
+
+static inline unsigned int check_ec_complete(IMediaEvent *eventsrc, DWORD timeout)
+{
+ return check_event_code(eventsrc, timeout, EC_COMPLETE, S_OK, 0);
+}
+
+static void test_unconnected_eos(void)
+{
+ IBaseFilter *filter = create_evr();
+ IFilterGraph2 *graph = create_graph();
+ IMediaControl *control;
+ IMediaEvent *eventsrc;
+ unsigned int ret;
+ HRESULT hr;
+ ULONG ref;
+
+ hr = IFilterGraph2_AddFilter(graph, filter, L"renderer");
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(!ret, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Pause(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(!ret, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Run(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Pause(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(!ret, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Run(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Stop(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(!ret, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Run(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+
+ IMediaControl_Release(control);
+ IMediaEvent_Release(eventsrc);
+ ref = IFilterGraph2_Release(graph);
+ ok(!ref, "Got outstanding refcount %d.\n", ref);
+ ref = IBaseFilter_Release(filter);
+ ok(!ref, "Got outstanding refcount %d.\n", ref);
+}
+
START_TEST(evr)
{
CoInitialize(NULL);
@@ -2788,6 +2891,7 @@ START_TEST(evr)
test_mixer_zorder();
test_mixer_samples();
test_MFIsFormatYUV();
+ test_unconnected_eos();
CoUninitialize();
}
diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c
index 1800f4dad4c..59e346fe5bf 100644
--- a/dlls/qedit/tests/nullrenderer.c
+++ b/dlls/qedit/tests/nullrenderer.c
@@ -32,6 +32,15 @@ static IBaseFilter *create_null_renderer(void)
return filter;
}
+static IFilterGraph2 *create_graph(void)
+{
+ IFilterGraph2 *ret;
+ HRESULT hr;
+ hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&ret);
+ ok(hr == S_OK, "Failed to create FilterGraph: %#x\n", hr);
+ return ret;
+}
+
static ULONG get_refcount(void *iface)
{
IUnknown *unknown = iface;
@@ -900,6 +909,100 @@ static void test_connect_pin(void)
ok(!ref, "Got outstanding refcount %d.\n", ref);
}
+static unsigned int check_event_code(IMediaEvent *eventsrc, DWORD timeout, LONG expected_code, LONG_PTR expected1, LONG_PTR expected2)
+{
+ LONG_PTR param1, param2;
+ unsigned int ret = 0;
+ HRESULT hr;
+ LONG code;
+
+ while ((hr = IMediaEvent_GetEvent(eventsrc, &code, ¶m1, ¶m2, timeout)) == S_OK)
+ {
+ if (code == expected_code)
+ {
+ ok(param1 == expected1, "Got param1 %#lx.\n", param1);
+ ok(param2 == expected2, "Got param2 %#lx.\n", param2);
+ ret++;
+ }
+ IMediaEvent_FreeEventParams(eventsrc, code, param1, param2);
+ timeout = 0;
+ }
+ ok(hr == E_ABORT, "Got hr %#x.\n", hr);
+
+ return ret;
+}
+
+static inline unsigned int check_ec_complete(IMediaEvent *eventsrc, DWORD timeout)
+{
+ return check_event_code(eventsrc, timeout, EC_COMPLETE, S_OK, 0);
+}
+
+static void test_unconnected_eos(void)
+{
+ IBaseFilter *filter = create_null_renderer();
+ IFilterGraph2 *graph = create_graph();
+ IMediaControl *control;
+ IMediaEvent *eventsrc;
+ unsigned int ret;
+ HRESULT hr;
+ ULONG ref;
+
+ hr = IFilterGraph2_AddFilter(graph, filter, L"renderer");
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(!ret, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Pause(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(!ret, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Run(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Pause(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(!ret, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Run(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Stop(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(!ret, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Run(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+
+ IMediaControl_Release(control);
+ IMediaEvent_Release(eventsrc);
+ ref = IFilterGraph2_Release(graph);
+ ok(!ref, "Got outstanding refcount %d.\n", ref);
+ ref = IBaseFilter_Release(filter);
+ ok(!ref, "Got outstanding refcount %d.\n", ref);
+}
+
START_TEST(nullrenderer)
{
IBaseFilter *filter;
@@ -924,6 +1027,7 @@ START_TEST(nullrenderer)
test_media_types();
test_enum_media_types();
test_connect_pin();
+ test_unconnected_eos();
CoUninitialize();
}
diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c
index 8d0003cf12e..5625971426b 100644
--- a/dlls/quartz/tests/videorenderer.c
+++ b/dlls/quartz/tests/videorenderer.c
@@ -2865,6 +2865,72 @@ static void test_basic_video(void)
ok(!ref, "Got outstanding refcount %d.\n", ref);
}
+static void test_unconnected_eos(void)
+{
+ IBaseFilter *filter = create_video_renderer();
+ IFilterGraph2 *graph = create_graph();
+ IMediaControl *control;
+ IMediaEvent *eventsrc;
+ unsigned int ret;
+ HRESULT hr;
+ ULONG ref;
+
+ hr = IFilterGraph2_AddFilter(graph, filter, L"renderer");
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(!ret, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Pause(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(!ret, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Run(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Pause(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(!ret, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Run(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Stop(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(!ret, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Run(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+
+ IMediaControl_Release(control);
+ IMediaEvent_Release(eventsrc);
+ ref = IFilterGraph2_Release(graph);
+ ok(!ref, "Got outstanding refcount %d.\n", ref);
+ ref = IBaseFilter_Release(filter);
+ ok(!ref, "Got outstanding refcount %d.\n", ref);
+}
+
START_TEST(videorenderer)
{
CoInitialize(NULL);
@@ -2881,6 +2947,7 @@ START_TEST(videorenderer)
test_overlay();
test_video_window();
test_basic_video();
+ test_unconnected_eos();
CoUninitialize();
}
diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c
index 154b6a6b99e..bb8b91eaeef 100644
--- a/dlls/quartz/tests/vmr9.c
+++ b/dlls/quartz/tests/vmr9.c
@@ -4170,6 +4170,72 @@ static void test_mixing_prefs(void)
ok(!ref, "Got outstanding refcount %d.\n", ref);
}
+static void test_unconnected_eos(void)
+{
+ IBaseFilter *filter = create_vmr9(0);
+ IFilterGraph2 *graph = create_graph();
+ IMediaControl *control;
+ IMediaEvent *eventsrc;
+ unsigned int ret;
+ HRESULT hr;
+ ULONG ref;
+
+ hr = IFilterGraph2_AddFilter(graph, filter, L"renderer");
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(!ret, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Pause(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(!ret, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Run(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Pause(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(!ret, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Run(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Stop(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(!ret, "Got %u EC_COMPLETE events.\n", ret);
+
+ hr = IMediaControl_Run(control);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+ ret = check_ec_complete(eventsrc, 0);
+ ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
+
+ IMediaControl_Release(control);
+ IMediaEvent_Release(eventsrc);
+ ref = IFilterGraph2_Release(graph);
+ ok(!ref, "Got outstanding refcount %d.\n", ref);
+ ref = IBaseFilter_Release(filter);
+ ok(!ref, "Got outstanding refcount %d.\n", ref);
+}
+
START_TEST(vmr9)
{
IBaseFilter *filter;
@@ -4205,6 +4271,7 @@ START_TEST(vmr9)
test_basic_video();
test_windowless_size();
test_mixing_prefs();
+ test_unconnected_eos();
CoUninitialize();
}
diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c
index a879917b169..da257555a19 100644
--- a/dlls/strmbase/renderer.c
+++ b/dlls/strmbase/renderer.c
@@ -252,7 +252,7 @@ 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
+ if ((filter->eos || !filter->sink.pin.peer) && graph
&& SUCCEEDED(IFilterGraph_QueryInterface(graph,
&IID_IMediaEventSink, (void **)&event_sink)))
{
--
2.33.1
More information about the wine-devel
mailing list