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

quartz/dsoundrender: Defer EC_COMPLETE until running. 

Signed-off-by: Anton Baskanov <baskanov@gmail.com>
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Anton Baskanov 2021-05-26 23:46:45 +07:00 committed by Alexandre Julliard
parent a2504b8ec7
commit 4a9936e318
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/quartz/dsoundrender.c
View File

@ -461,7 +461,8 @@ static HRESULT dsound_render_sink_eos(struct strmbase_sink *iface)
filter->eos = TRUE; 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))) &IID_IMediaEventSink, (void **)&event_sink)))
{ {
IMediaEventSink_Notify(event_sink, EC_COMPLETE, S_OK, IMediaEventSink_Notify(event_sink, EC_COMPLETE, S_OK,
@ -599,6 +600,8 @@ static HRESULT dsound_render_init_stream(struct strmbase_filter *iface)
static HRESULT dsound_render_start_stream(struct strmbase_filter *iface, REFERENCE_TIME start) static HRESULT dsound_render_start_stream(struct strmbase_filter *iface, REFERENCE_TIME start)
{ {
struct dsound_render *filter = impl_from_strmbase_filter(iface); struct dsound_render *filter = impl_from_strmbase_filter(iface);
IFilterGraph *graph = filter->filter.graph;
IMediaEventSink *event_sink;
filter->stream_start = start; filter->stream_start = start;
@ -607,6 +610,15 @@ static HRESULT dsound_render_start_stream(struct strmbase_filter *iface, REFEREN
if (filter->sink.pin.peer) if (filter->sink.pin.peer)
IDirectSoundBuffer_Play(filter->dsbuffer, 0, 0, DSBPLAY_LOOPING); IDirectSoundBuffer_Play(filter->dsbuffer, 0, 0, DSBPLAY_LOOPING);
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; return S_OK;
} }

4
dlls/quartz/tests/dsoundrender.c
View File

@ -920,7 +920,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control)
hr = IMediaControl_GetState(control, 1000, &state); hr = IMediaControl_GetState(control, 1000, &state);
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, "Got unexpected EC_COMPLETE.\n"); ok(!ret, "Got unexpected EC_COMPLETE.\n");
hr = send_frame(input); hr = send_frame(input);
todo_wine ok(hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr); todo_wine ok(hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr);
@ -928,7 +928,7 @@ static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control)
hr = IMediaControl_Run(control); hr = IMediaControl_Run(control);
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, "Expected EC_COMPLETE.\n"); ok(ret == 1, "Expected EC_COMPLETE.\n");
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);