Skip to content

W
wine-winehq
Commit 6e11378d authored by Andrew Eikum's avatar Andrew Eikum Committed by Alexandre Julliard
Browse files
Options

strmbase: Send EC_COMPLETE in IBaseFilter::Run() for unconnected renderers.

Signed-off-by: 's avatarZebediah Figura <zfigura@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 59376f12
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
dlls/evr/tests/evr.c
View file @ 6e11378d
...@@ -508,7 +508,7 @@ static void test_unconnected_eos(void) ...@@ -508,7 +508,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0); ret = check_ec_complete(eventsrc, 0);
todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
hr = IMediaControl_Pause(control); hr = IMediaControl_Pause(control);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
...@@ -520,7 +520,7 @@ static void test_unconnected_eos(void) ...@@ -520,7 +520,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0); ret = check_ec_complete(eventsrc, 0);
todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
hr = IMediaControl_Stop(control); hr = IMediaControl_Stop(control);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
...@@ -532,7 +532,7 @@ static void test_unconnected_eos(void) ...@@ -532,7 +532,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0); ret = check_ec_complete(eventsrc, 0);
todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
IMediaControl_Release(control); IMediaControl_Release(control);
IMediaEvent_Release(eventsrc); IMediaEvent_Release(eventsrc);
......
dlls/qedit/tests/nullrenderer.c
View file @ 6e11378d
...@@ -969,7 +969,7 @@ static void test_unconnected_eos(void) ...@@ -969,7 +969,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0); ret = check_ec_complete(eventsrc, 0);
todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
hr = IMediaControl_Pause(control); hr = IMediaControl_Pause(control);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
...@@ -981,7 +981,7 @@ static void test_unconnected_eos(void) ...@@ -981,7 +981,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0); ret = check_ec_complete(eventsrc, 0);
todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
hr = IMediaControl_Stop(control); hr = IMediaControl_Stop(control);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
...@@ -993,7 +993,7 @@ static void test_unconnected_eos(void) ...@@ -993,7 +993,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0); ret = check_ec_complete(eventsrc, 0);
todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
IMediaControl_Release(control); IMediaControl_Release(control);
IMediaEvent_Release(eventsrc); IMediaEvent_Release(eventsrc);
......
dlls/quartz/tests/videorenderer.c
View file @ 6e11378d
...@@ -2897,7 +2897,7 @@ static void test_unconnected_eos(void) ...@@ -2897,7 +2897,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0); ret = check_ec_complete(eventsrc, 0);
todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
hr = IMediaControl_Pause(control); hr = IMediaControl_Pause(control);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
...@@ -2909,7 +2909,7 @@ static void test_unconnected_eos(void) ...@@ -2909,7 +2909,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0); ret = check_ec_complete(eventsrc, 0);
todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
hr = IMediaControl_Stop(control); hr = IMediaControl_Stop(control);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
...@@ -2921,7 +2921,7 @@ static void test_unconnected_eos(void) ...@@ -2921,7 +2921,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0); ret = check_ec_complete(eventsrc, 0);
todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
IMediaControl_Release(control); IMediaControl_Release(control);
IMediaEvent_Release(eventsrc); IMediaEvent_Release(eventsrc);
......
dlls/quartz/tests/vmr7.c
View file @ 6e11378d
...@@ -3101,7 +3101,7 @@ static void test_unconnected_eos(void) ...@@ -3101,7 +3101,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0); ret = check_ec_complete(eventsrc, 0);
todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
hr = IMediaControl_Pause(control); hr = IMediaControl_Pause(control);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
...@@ -3113,7 +3113,7 @@ static void test_unconnected_eos(void) ...@@ -3113,7 +3113,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0); ret = check_ec_complete(eventsrc, 0);
todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
hr = IMediaControl_Stop(control); hr = IMediaControl_Stop(control);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
...@@ -3125,7 +3125,7 @@ static void test_unconnected_eos(void) ...@@ -3125,7 +3125,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0); ret = check_ec_complete(eventsrc, 0);
todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
IMediaControl_Release(control); IMediaControl_Release(control);
IMediaEvent_Release(eventsrc); IMediaEvent_Release(eventsrc);
......
dlls/quartz/tests/vmr9.c
View file @ 6e11378d
...@@ -4202,7 +4202,7 @@ static void test_unconnected_eos(void) ...@@ -4202,7 +4202,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0); ret = check_ec_complete(eventsrc, 0);
todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
hr = IMediaControl_Pause(control); hr = IMediaControl_Pause(control);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
...@@ -4214,7 +4214,7 @@ static void test_unconnected_eos(void) ...@@ -4214,7 +4214,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0); ret = check_ec_complete(eventsrc, 0);
todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
hr = IMediaControl_Stop(control); hr = IMediaControl_Stop(control);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
...@@ -4226,7 +4226,7 @@ static void test_unconnected_eos(void) ...@@ -4226,7 +4226,7 @@ static void test_unconnected_eos(void)
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
ret = check_ec_complete(eventsrc, 0); ret = check_ec_complete(eventsrc, 0);
todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret);
IMediaControl_Release(control); IMediaControl_Release(control);
IMediaEvent_Release(eventsrc); IMediaEvent_Release(eventsrc);
......
dlls/strmbase/renderer.c
View file @ 6e11378d
...@@ -252,7 +252,7 @@ static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TI ...@@ -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) if (filter->sink.pin.peer && filter->ops->renderer_start_stream)
filter->ops->renderer_start_stream(filter); filter->ops->renderer_start_stream(filter);
if (filter->eos && graph if ((filter->eos || !filter->sink.pin.peer) && graph
&& SUCCEEDED(IFilterGraph_QueryInterface(graph, && SUCCEEDED(IFilterGraph_QueryInterface(graph,
&IID_IMediaEventSink, (void **)&event_sink))) &IID_IMediaEventSink, (void **)&event_sink)))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment