October 2020 - Wine-Commits

Nikolay Sivov : mfplat: Implement MFCreateDXSurfaceBuffer().
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 23a656a083df15aeb7d4656b700e3ea9fed6b390 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23a656a083df15aeb7d4656b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:41 2020 +0300 mfplat: Implement MFCreateDXSurfaceBuffer(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 308 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 11 +- 3 files changed, 319 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=23a656a083df15aeb7d4…

1 0

Nikolay Sivov : evr: Add MFCreateDXSurfaceBuffer() forward.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 13aa1e12e0304108a366378eee6c285148a2158f URL: https://source.winehq.org/git/wine.git/?a=commit;h=13aa1e12e0304108a366378e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:43 2020 +0300 evr: Add MFCreateDXSurfaceBuffer() forward. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec index dcf062cf5aa..67eee3122cf 100644 --- a/dlls/evr/evr.spec +++ b/dlls/evr/evr.spec @@ -7,7 +7,7 @@ @ stub MFConvertFromFP16Array @ stub MFConvertToFP16Array @ stdcall -import MFCopyImage(ptr long ptr long long long) -@ stub MFCreateDXSurfaceBuffer +@ stdcall -import MFCreateDXSurfaceBuffer(ptr ptr long ptr) @ stub MFCreateVideoMediaType @ stub MFCreateVideoMediaTypeFromBitMapInfoHeader @ stdcall -import MFCreateVideoMediaTypeFromSubtype(ptr ptr)

1 0

Nikolay Sivov : mf/evr: Pass incoming samples to the mixer.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 41fe1ac058756611b1215d2b60871272f6d143f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41fe1ac058756611b1215d2b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:46 2020 +0300 mf/evr: Pass incoming samples to the mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 4dca8515c94..618bbf8924f 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -335,19 +335,36 @@ static HRESULT WINAPI video_stream_sink_GetMediaTypeHandler(IMFStreamSink *iface static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFSample *sample) { struct video_stream *stream = impl_from_IMFStreamSink(iface); + LONGLONG timestamp; + HRESULT hr = S_OK; - FIXME("%p, %p.\n", iface, sample); + TRACE("%p, %p.\n", iface, sample); EnterCriticalSection(&stream->cs); - if (stream->flags & EVR_STREAM_PREROLLING) + + if (!stream->parent) + hr = MF_E_STREAMSINK_REMOVED; + else if (!stream->parent->clock) + hr = MF_E_NO_CLOCK; + else if (FAILED(hr = IMFSample_GetSampleTime(sample, &timestamp))) + { + WARN("No sample timestamp, hr %#x.\n", hr); + } + else if (stream->parent->state == EVR_STATE_RUNNING) { - IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkPrerolled, &GUID_NULL, S_OK, NULL); - stream->flags &= ~EVR_STREAM_PREROLLING; - stream->flags |= EVR_STREAM_PREROLLED; + IMFTransform_ProcessInput(stream->parent->mixer, stream->id, sample, 0); + + if (stream->flags & EVR_STREAM_PREROLLING) + { + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkPrerolled, &GUID_NULL, S_OK, NULL); + stream->flags &= ~EVR_STREAM_PREROLLING; + stream->flags |= EVR_STREAM_PREROLLED; + } } + LeaveCriticalSection(&stream->cs); - return E_NOTIMPL; + return hr; } static HRESULT WINAPI video_stream_sink_PlaceMarker(IMFStreamSink *iface, MFSTREAMSINK_MARKER_TYPE marker_type,

1 0

Zhiyi Zhang : d3d8/tests: Restore display modes at the end of test_wndproc().
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 5715b77e87de175464c68fa412c821a63e9f079e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5715b77e87de175464c68fa4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 14:45:00 2020 +0800 d3d8/tests: Restore display modes at the end of test_wndproc(). test_wndproc() makes a series of ChangeDisplaySettings() calls that could make the current display mode no longer match the registry display mode. Restore display modes at the end of test_wndproc() so that other tests are not affected. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 4c567a47603..3e933143332 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3361,6 +3361,8 @@ done: DestroyWindow(device_window); DestroyWindow(focus_window); UnregisterClassA("d3d8_test_wndproc_wc", GetModuleHandleA(NULL)); + change_ret = ChangeDisplaySettingsExW(NULL, NULL, NULL, 0, NULL); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %d.\n", change_ret); } static void test_wndproc_windowed(void)

1 0

Derek Lesho : winegstreamer: Implement IMFMediaStream::RequestSample.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 03eaa2cc93e5e2ea4c36495870c268797aea3ca8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03eaa2cc93e5e2ea4c364958… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri Oct 30 13:57:19 2020 -0500 winegstreamer: Implement IMFMediaStream::RequestSample. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 19 +++++--- dlls/mfreadwrite/tests/mfplat.c | 16 ++++++- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/media_source.c | 94 ++++++++++++++++++++++++++++++++++++++- dlls/winegstreamer/mfplat.c | 69 ++++++++++++++++++++++++++++ 5 files changed, 191 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=03eaa2cc93e5e2ea4c36…

1 0

Derek Lesho : winegstreamer: Implement IMFMediaSource::Start.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 12f1afbffed35cf9dcc18f5dbf33633aa9a7d2ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=12f1afbffed35cf9dcc18f5d… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri Oct 30 10:58:14 2020 -0500 winegstreamer: Implement IMFMediaSource::Start. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 8 +- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/media_source.c | 307 +++++++++++++++++++++++++++++++++++++- dlls/winegstreamer/mfplat.c | 130 ++++++++++++++++ 4 files changed, 438 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=12f1afbffed35cf9dcc1…

1 0

Zhiyi Zhang : dxgi/tests: Test display mode restoration.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: ef81152c8cd17f1bfb2950753428a95a81728c97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef81152c8cd17f1bfb295075… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 14:49:00 2020 +0800 dxgi/tests: Test display mode restoration. Mostly to test that when doing mode restoration, all display outputs get restored to their display settings in the registry, not just one output gets restored. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 427 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 427 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef81152c8cd17f1bfb29…

1 0

Nikolay Sivov : mf/evr: Notify presenter on new input.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 3641c80244445a8f5dd54232cdce4397c4b78cdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3641c80244445a8f5dd54232… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:47 2020 +0300 mf/evr: Notify presenter on new input. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 618bbf8924f..f5bbfffc4a5 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -352,7 +352,8 @@ static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFS } else if (stream->parent->state == EVR_STATE_RUNNING) { - IMFTransform_ProcessInput(stream->parent->mixer, stream->id, sample, 0); + if (SUCCEEDED(IMFTransform_ProcessInput(stream->parent->mixer, stream->id, sample, 0))) + IMFVideoPresenter_ProcessMessage(stream->parent->presenter, MFVP_MESSAGE_PROCESSINPUTNOTIFY, 0); if (stream->flags & EVR_STREAM_PREROLLING) {

1 0

Nikolay Sivov : evr/allocator: Use different buffer implementation for surface buffers.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 959279413ee363293ceb270dc115835893fb7f85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=959279413ee363293ceb270d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:42 2020 +0300 evr/allocator: Use different buffer implementation for surface buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 31 ++++++++++++++++--------------- dlls/evr/tests/evr.c | 6 +----- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index b65cc45a662..39520cb6020 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -306,27 +306,28 @@ static HRESULT sample_allocator_create_samples(struct sample_allocator *allocato for (i = 0; i < sample_count; ++i) { struct queued_sample *queued_sample = heap_alloc(sizeof(*queued_sample)); + IMFMediaBuffer *buffer; - if (service) + if (SUCCEEDED(hr = MFCreateVideoSampleFromSurface(NULL, &sample))) { - if (SUCCEEDED(hr = IDirectXVideoProcessorService_CreateSurface(service, width, height, 0, format, - D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL))) + if (service) { - hr = MFCreateVideoSampleFromSurface((IUnknown *)surface, &sample); - IDirect3DSurface9_Release(surface); + if (SUCCEEDED(hr = IDirectXVideoProcessorService_CreateSurface(service, width, height, + 0, format, D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL))) + { + hr = MFCreateDXSurfaceBuffer(&IID_IDirect3DSurface9, (IUnknown *)surface, FALSE, &buffer); + IDirect3DSurface9_Release(surface); + } + } + else + { + hr = MFCreate2DMediaBuffer(width, height, format, FALSE, &buffer); } - } - else - { - IMFMediaBuffer *buffer; - if (SUCCEEDED(hr = MFCreateVideoSampleFromSurface(NULL, &sample))) + if (SUCCEEDED(hr)) { - if (SUCCEEDED(hr = MFCreate2DMediaBuffer(width, height, format, FALSE, &buffer))) - { - hr = IMFSample_AddBuffer(sample, buffer); - IMFMediaBuffer_Release(buffer); - } + hr = IMFSample_AddBuffer(sample, buffer); + IMFMediaBuffer_Release(buffer); } } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index e4f45396ae8..a711be7ad21 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1468,17 +1468,13 @@ todo_wine IDirect3DSurface9_Release(surface); hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&unk); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(unk); hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaBuffer_Unlock(buffer); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFSample_Release(sample);

1 0

Zhiyi Zhang : d3d8/tests: Test display mode restoration.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: e166f6d07e436e4d769c80bd2aaf821961c9c9fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e166f6d07e436e4d769c80bd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 14:48:31 2020 +0800 d3d8/tests: Test display mode restoration. Mostly to test that when doing mode restoration, all display outputs get restored to their display settings in the registry, not just one output gets restored. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 408 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 398 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e166f6d07e436e4d769c…

1 0