May 2020 - Wine-commits - list.winehq.org

Nikolay Sivov : mf: Add a helper to set closed state for the session.
by Alexandre Julliard 11 May '20

11 May '20

Module: wine Branch: master Commit: b68a765b95728ebc6277c7fe7a28f0db5c37532d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b68a765b95728ebc6277c7fe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 11 17:53:11 2020 +0300 mf: Add a helper to set closed state for the session. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 375dd8e196..62b0b6e978 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -812,6 +812,14 @@ static void session_start(struct media_session *session, const GUID *time_format LeaveCriticalSection(&session->cs); } +static void session_set_closed(struct media_session *session, HRESULT status) +{ + session->state = SESSION_STATE_CLOSED; + if (SUCCEEDED(status)) + session_set_caps(session, session->caps & ~(MFSESSIONCAP_START | MFSESSIONCAP_SEEK)); + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionClosed, &GUID_NULL, status, NULL); +} + static void session_pause(struct media_session *session) { HRESULT hr; @@ -911,11 +919,7 @@ static HRESULT session_finalize_sinks(struct media_session *session) } if (sinks_finalized) - { - session->state = SESSION_STATE_CLOSED; - session_set_caps(session, session->caps & ~(MFSESSIONCAP_START | MFSESSIONCAP_SEEK)); - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionClosed, &GUID_NULL, hr, NULL); - } + session_set_closed(session, hr); return hr; } @@ -945,10 +949,7 @@ static void session_close(struct media_session *session) } if (FAILED(hr)) - { - session->state = SESSION_STATE_CLOSED; - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionClosed, &GUID_NULL, hr, NULL); - } + session_set_closed(session, hr); LeaveCriticalSection(&session->cs); } @@ -3018,11 +3019,7 @@ static HRESULT WINAPI session_sink_finalizer_callback_Invoke(IMFAsyncCallback *i { sink->finalized = TRUE; if (sinks_finalized) - { - session->state = SESSION_STATE_CLOSED; - session_set_caps(session, session->caps & ~(MFSESSIONCAP_START | MFSESSIONCAP_SEEK)); - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionClosed, &GUID_NULL, hr, NULL); - } + session_set_closed(session, hr); } IMFFinalizableMediaSink_Release(fin_sink); }

1 0

Nikolay Sivov : mf: Add a helper to set paused state for the session.
by Alexandre Julliard 11 May '20

11 May '20

Module: wine Branch: master Commit: a9e2044a111f40c3f5ec3d28e70ca2474516e307 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9e2044a111f40c3f5ec3d28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 11 17:53:12 2020 +0300 mf: Add a helper to set paused state for the session. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 62b0b6e978..26ea34b441 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -812,6 +812,14 @@ static void session_start(struct media_session *session, const GUID *time_format LeaveCriticalSection(&session->cs); } +static void session_set_paused(struct media_session *session, HRESULT status) +{ + session->state = SESSION_STATE_PAUSED; + if (SUCCEEDED(status)) + session_set_caps(session, session->caps & ~MFSESSIONCAP_PAUSE); + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionPaused, &GUID_NULL, status, NULL); +} + static void session_set_closed(struct media_session *session, HRESULT status) { session->state = SESSION_STATE_CLOSED; @@ -840,10 +848,7 @@ static void session_pause(struct media_session *session) } if (FAILED(hr)) - { - session->state = SESSION_STATE_PAUSED; - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionPaused, &GUID_NULL, hr, NULL); - } + session_set_paused(session, hr); LeaveCriticalSection(&session->cs); } @@ -2185,12 +2190,7 @@ static void session_set_source_object_state(struct media_session *session, IUnkn if (!session_is_source_nodes_state(session, OBJ_STATE_PAUSED)) break; - session->state = SESSION_STATE_PAUSED; - - session_set_caps(session, session->caps & ~MFSESSIONCAP_PAUSE); - - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionPaused, &GUID_NULL, S_OK, NULL); - + session_set_paused(session, S_OK); break; case SESSION_STATE_STOPPING_SOURCES: if (!session_is_source_nodes_state(session, OBJ_STATE_STOPPED)) @@ -2291,10 +2291,7 @@ static void session_set_sink_stream_state(struct media_session *session, IMFStre } if (FAILED(hr)) - { - session->state = SESSION_STATE_PAUSED; - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionPaused, &GUID_NULL, hr, NULL); - } + session_set_paused(session, hr); break; case SESSION_STATE_STOPPING_SINKS:

1 0

Nikolay Sivov : mf: Move locking from individual command helpers to command callback.
by Alexandre Julliard 11 May '20

11 May '20

Module: wine Branch: master Commit: 59ae49446eb0caa4a47379579fbf0a5ca4e820ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=59ae49446eb0caa4a4737957… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 11 17:53:13 2020 +0300 mf: Move locking from individual command helpers to command callback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 26ea34b441..7b479dbfd7 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -769,8 +769,6 @@ static void session_start(struct media_session *session, const GUID *time_format struct media_source *source; HRESULT hr; - EnterCriticalSection(&session->cs); - switch (session->state) { case SESSION_STATE_STOPPED: @@ -808,8 +806,6 @@ static void session_start(struct media_session *session, const GUID *time_format default: ; } - - LeaveCriticalSection(&session->cs); } static void session_set_paused(struct media_session *session, HRESULT status) @@ -832,8 +828,6 @@ static void session_pause(struct media_session *session) { HRESULT hr; - EnterCriticalSection(&session->cs); - switch (session->state) { case SESSION_STATE_STARTED: @@ -849,8 +843,6 @@ static void session_pause(struct media_session *session) if (FAILED(hr)) session_set_paused(session, hr); - - LeaveCriticalSection(&session->cs); } static void session_set_stopped(struct media_session *session, HRESULT status) @@ -873,8 +865,6 @@ static void session_stop(struct media_session *session) { HRESULT hr; - EnterCriticalSection(&session->cs); - switch (session->state) { case SESSION_STATE_STARTED: @@ -894,8 +884,6 @@ static void session_stop(struct media_session *session) default: ; } - - LeaveCriticalSection(&session->cs); } static HRESULT session_finalize_sinks(struct media_session *session) @@ -933,8 +921,6 @@ static void session_close(struct media_session *session) { HRESULT hr = S_OK; - EnterCriticalSection(&session->cs); - switch (session->state) { case SESSION_STATE_STOPPED: @@ -955,8 +941,6 @@ static void session_close(struct media_session *session) if (FAILED(hr)) session_set_closed(session, hr); - - LeaveCriticalSection(&session->cs); } static struct media_source *session_get_media_source(struct media_session *session, IMFMediaSource *source) @@ -1333,8 +1317,6 @@ static void session_set_topology(struct media_session *session, DWORD flags, IMF } } - EnterCriticalSection(&session->cs); - if (flags & MFSESSION_SETTOPOLOGY_CLEAR_CURRENT) { if ((topology && topology == session->presentation.current_topology) || !topology) @@ -1375,8 +1357,6 @@ static void session_set_topology(struct media_session *session, DWORD flags, IMF } } - LeaveCriticalSection(&session->cs); - if (resolved_topology) IMFTopology_Release(resolved_topology); } @@ -1791,13 +1771,12 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, struct session_op *op = impl_op_from_IUnknown(IMFAsyncResult_GetStateNoAddRef(result)); struct media_session *session = impl_from_commands_callback_IMFAsyncCallback(iface); + EnterCriticalSection(&session->cs); + switch (op->command) { case SESSION_CMD_CLEAR_TOPOLOGIES: - EnterCriticalSection(&session->cs); session_clear_topologies(session); - LeaveCriticalSection(&session->cs); - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionTopologiesCleared, &GUID_NULL, S_OK, NULL); break; @@ -1820,6 +1799,8 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, ; } + LeaveCriticalSection(&session->cs); + return S_OK; }

1 0

Nikolay Sivov : mf: Serialize session commands.
by Alexandre Julliard 11 May '20

11 May '20

Module: wine Branch: master Commit: 40c60b7eb8fc602039a2755202110a61edd0e664 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40c60b7eb8fc602039a27552… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 11 17:53:14 2020 +0300 mf: Serialize session commands. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 102 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 75 insertions(+), 27 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 7b479dbfd7..bf6e29471d 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -63,6 +63,7 @@ struct session_op PROPVARIANT start_position; } start; } u; + struct list entry; }; struct queued_topology @@ -218,6 +219,7 @@ struct media_session PROPVARIANT start_position; } presentation; struct list topologies; + struct list commands; enum session_state state; DWORD caps; CRITICAL_SECTION cs; @@ -530,7 +532,12 @@ static HRESULT session_submit_command(struct media_session *session, struct sess EnterCriticalSection(&session->cs); if (SUCCEEDED(hr = session_is_shut_down(session))) - hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &session->commands_callback, &op->IUnknown_iface); + { + if (list_empty(&session->commands)) + hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &session->commands_callback, &op->IUnknown_iface); + list_add_tail(&session->commands, &op->entry); + IUnknown_AddRef(&op->IUnknown_iface); + } LeaveCriticalSection(&session->cs); return hr; @@ -730,6 +737,7 @@ static void session_clear_presentation(struct media_session *session) struct media_source *source, *source2; struct media_sink *sink, *sink2; struct topo_node *node, *node2; + struct session_op *op, *op2; IMFTopology_Clear(session->presentation.current_topology); session->presentation.topo_status = MF_TOPOSTATUS_INVALID; @@ -762,6 +770,12 @@ static void session_clear_presentation(struct media_session *session) IMFMediaEventGenerator_Release(sink->event_generator); heap_free(sink); } + + LIST_FOR_EACH_ENTRY_SAFE(op, op2, &session->commands, struct session_op, entry) + { + list_remove(&op->entry); + IUnknown_Release(&op->IUnknown_iface); + } } static void session_start(struct media_session *session, const GUID *time_format, const PROPVARIANT *start_position) @@ -808,12 +822,66 @@ static void session_start(struct media_session *session, const GUID *time_format } } +static void session_command_complete(struct media_session *session) +{ + struct session_op *op; + struct list *e; + + /* Pop current command, submit next. */ + if ((e = list_head(&session->commands))) + { + op = LIST_ENTRY(e, struct session_op, entry); + list_remove(&op->entry); + IUnknown_Release(&op->IUnknown_iface); + } + + if ((e = list_head(&session->commands))) + { + op = LIST_ENTRY(e, struct session_op, entry); + MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &session->commands_callback, &op->IUnknown_iface); + } +} + +static void session_set_started(struct media_session *session) +{ + struct media_source *source; + unsigned int caps, flags; + IMFMediaEvent *event; + + session->state = SESSION_STATE_STARTED; + + caps = session->caps | MFSESSIONCAP_PAUSE; + + LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) + { + if (SUCCEEDED(IMFMediaSource_GetCharacteristics(source->source, &flags))) + { + if (!(flags & MFMEDIASOURCE_CAN_PAUSE)) + { + caps &= ~MFSESSIONCAP_PAUSE; + break; + } + } + } + + session_set_caps(session, caps); + + if (SUCCEEDED(MFCreateMediaEvent(MESessionStarted, &GUID_NULL, S_OK, NULL, &event))) + { + IMFMediaEvent_SetUINT64(event, &MF_EVENT_PRESENTATION_TIME_OFFSET, 0); + IMFMediaEventQueue_QueueEvent(session->event_queue, event); + IMFMediaEvent_Release(event); + } + session_command_complete(session); +} + static void session_set_paused(struct media_session *session, HRESULT status) { session->state = SESSION_STATE_PAUSED; if (SUCCEEDED(status)) session_set_caps(session, session->caps & ~MFSESSIONCAP_PAUSE); IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionPaused, &GUID_NULL, status, NULL); + session_command_complete(session); } static void session_set_closed(struct media_session *session, HRESULT status) @@ -822,6 +890,7 @@ static void session_set_closed(struct media_session *session, HRESULT status) if (SUCCEEDED(status)) session_set_caps(session, session->caps & ~(MFSESSIONCAP_START | MFSESSIONCAP_SEEK)); IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionClosed, &GUID_NULL, status, NULL); + session_command_complete(session); } static void session_pause(struct media_session *session) @@ -859,6 +928,7 @@ static void session_set_stopped(struct media_session *session, HRESULT status) IMFMediaEventQueue_QueueEvent(session->event_queue, event); IMFMediaEvent_Release(event); } + session_command_complete(session); } static void session_stop(struct media_session *session) @@ -1779,9 +1849,11 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, session_clear_topologies(session); IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionTopologiesCleared, &GUID_NULL, S_OK, NULL); + session_command_complete(session); break; case SESSION_CMD_SET_TOPOLOGY: session_set_topology(session, op->u.set_topology.flags, op->u.set_topology.topology); + session_command_complete(session); break; case SESSION_CMD_START: session_start(session, &op->u.start.time_format, &op->u.start.start_position); @@ -2210,8 +2282,6 @@ static void session_set_sink_stream_state(struct media_session *session, IMFStre { struct media_source *source; enum object_state state; - IMFMediaEvent *event; - DWORD caps, flags; HRESULT hr = S_OK; BOOL changed; @@ -2234,30 +2304,7 @@ static void session_set_sink_stream_state(struct media_session *session, IMFStre if (!session_is_output_nodes_state(session, OBJ_STATE_STARTED)) break; - session->state = SESSION_STATE_STARTED; - - caps = session->caps | MFSESSIONCAP_PAUSE; - - LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) - { - if (SUCCEEDED(IMFMediaSource_GetCharacteristics(source->source, &flags))) - { - if (!(flags & MFMEDIASOURCE_CAN_PAUSE)) - { - caps &= ~MFSESSIONCAP_PAUSE; - break; - } - } - } - - session_set_caps(session, caps); - - if (SUCCEEDED(MFCreateMediaEvent(MESessionStarted, &GUID_NULL, S_OK, NULL, &event))) - { - IMFMediaEvent_SetUINT64(event, &MF_EVENT_PRESENTATION_TIME_OFFSET, 0); - IMFMediaEventQueue_QueueEvent(session->event_queue, event); - IMFMediaEvent_Release(event); - } + session_set_started(session); break; case SESSION_STATE_PAUSING_SINKS: if (!session_is_output_nodes_state(session, OBJ_STATE_PAUSED)) @@ -3210,6 +3257,7 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses object->sink_finalizer_callback.lpVtbl = &session_sink_finalizer_callback_vtbl; object->refcount = 1; list_init(&object->topologies); + list_init(&object->commands); list_init(&object->presentation.sources); list_init(&object->presentation.sinks); list_init(&object->presentation.nodes);

1 0

Nikolay Sivov : mf: Add internal placeholder command for end-of-presentation.
by Alexandre Julliard 11 May '20

11 May '20

Module: wine Branch: master Commit: fafe82c6cc0baad4dec14f401da36a3e35553cee URL: https://source.winehq.org/git/wine.git/?a=commit;h=fafe82c6cc0baad4dec14f40… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 11 17:53:15 2020 +0300 mf: Add internal placeholder command for end-of-presentation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index bf6e29471d..ba30733fe5 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -43,6 +43,7 @@ enum session_command SESSION_CMD_START, SESSION_CMD_PAUSE, SESSION_CMD_STOP, + SESSION_CMD_END, /* Internal use only. */ }; struct session_op @@ -526,6 +527,14 @@ static HRESULT session_is_shut_down(struct media_session *session) return session->state == SESSION_STATE_SHUT_DOWN ? MF_E_SHUTDOWN : S_OK; } +static void session_push_back_command(struct media_session *session, enum session_command command) +{ + struct session_op *op; + + if (SUCCEEDED(create_session_op(command, &op))) + list_add_head(&session->commands, &op->entry); +} + static HRESULT session_submit_command(struct media_session *session, struct session_op *op) { HRESULT hr; @@ -933,7 +942,7 @@ static void session_set_stopped(struct media_session *session, HRESULT status) static void session_stop(struct media_session *session) { - HRESULT hr; + HRESULT hr = MF_E_INVALIDREQUEST; switch (session->state) { @@ -949,10 +958,12 @@ static void session_stop(struct media_session *session) break; case SESSION_STATE_STOPPED: - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStopped, &GUID_NULL, S_OK, NULL); - break; + hr = S_OK; + /* fallthrough */ default: - ; + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStopped, &GUID_NULL, hr, NULL); + session_command_complete(session); + break; } } @@ -1002,11 +1013,9 @@ static void session_close(struct media_session *session) if (SUCCEEDED(hr = IMFPresentationClock_Stop(session->clock))) session->state = SESSION_STATE_STOPPING_SINKS; break; - case SESSION_STATE_CLOSED: + default: hr = MF_E_INVALIDREQUEST; break; - default: - ; } if (FAILED(hr)) @@ -2749,8 +2758,9 @@ static void session_raise_end_of_presentation(struct media_session *session) { if (session_nodes_is_mask_set(session, MF_TOPOLOGY_MAX, SOURCE_FLAG_END_OF_PRESENTATION)) { - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MEEndOfPresentation, &GUID_NULL, S_OK, NULL); session->presentation.flags |= SESSION_FLAG_END_OF_PRESENTATION; + session_push_back_command(session, SESSION_CMD_END); + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MEEndOfPresentation, &GUID_NULL, S_OK, NULL); } } }

1 0

Zebediah Figura : quartz/tests: Fix a test failure on 32-bit Windows.
by Alexandre Julliard 11 May '20

11 May '20

Module: wine Branch: master Commit: 34648344435dfa46554ddd06edd1e5b3f67937bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=34648344435dfa46554ddd06… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 11 11:03:06 2020 -0500 quartz/tests: Fix a test failure on 32-bit Windows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 656f943ca3..3a3863ff50 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdint.h> #define COBJMACROS #include "ocidl.h" #include "olectl.h" @@ -70,6 +71,22 @@ static inline BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TY && !memcmp(a->pbFormat, b->pbFormat, a->cbFormat); } +static BOOL compare_double(double f, double g, unsigned int ulps) +{ + int64_t x = *(int64_t *)&f; + int64_t y = *(int64_t *)&g; + + if (x < 0) + x = INT64_MIN - x; + if (y < 0) + y = INT64_MIN - y; + + if (abs(x - y) > ulps) + return FALSE; + + return TRUE; +} + static IFilterGraph2 *create_graph(void) { IFilterGraph2 *ret; @@ -3693,7 +3710,7 @@ static void test_basic_video(void) reftime = 0.0; hr = IBasicVideo_get_AvgTimePerFrame(video, &reftime); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(reftime == 0.02, "Got frame rate %.16e.\n", reftime); + todo_wine ok(compare_double(reftime, 0.02, 1 << 28), "Got frame rate %.16e.\n", reftime); l = 0xdeadbeef; hr = IBasicVideo_get_BitRate(video, &l);

1 0

Zebediah Figura : quartz/tests: Add some tests for windowless video size.
by Alexandre Julliard 11 May '20

11 May '20

Module: wine Branch: master Commit: fd159a356345d71d96d158e9a87bd8e4ec1a699d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd159a356345d71d96d158e9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 11 11:03:07 2020 -0500 quartz/tests: Add some tests for windowless video size. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 3a3863ff50..1e81866633 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3746,6 +3746,137 @@ out: ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_windowless_size(void) +{ + ALLOCATOR_PROPERTIES req_props = {1, 32 * 16 * 4, 1, 0}, ret_props; + VIDEOINFOHEADER vih = + { + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 32, + .bmiHeader.biHeight = 16, + .bmiHeader.biBitCount = 32, + .bmiHeader.biPlanes = 1, + }; + AM_MEDIA_TYPE mt = + { + .majortype = MEDIATYPE_Video, + .subtype = MEDIASUBTYPE_RGB32, + .formattype = FORMAT_VideoInfo, + .cbFormat = sizeof(vih), + .pbFormat = (BYTE *)&vih, + }; + IBaseFilter *filter = create_vmr9(VMR9Mode_Windowless); + LONG width, height, aspect_width, aspect_height; + IVMRWindowlessControl9 *windowless_control; + IFilterGraph2 *graph = create_graph(); + struct testfilter source; + IMemAllocator *allocator; + RECT src, dst, expect; + IMemInputPin *input; + HWND window; + HRESULT hr; + ULONG ref; + IPin *pin; + + IBaseFilter_QueryInterface(filter, &IID_IVMRWindowlessControl9, (void **)&windowless_control); + IBaseFilter_FindPin(filter, L"VMR Input0", &pin); + IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&input); + testfilter_init(&source); + IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, L"source"); + IFilterGraph2_AddFilter(graph, filter, L"vmr9"); + window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create a window.\n"); + + hr = IVMRWindowlessControl9_SetVideoClippingWindow(windowless_control, window); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemInputPin_GetAllocator(input, &allocator); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + hr = IMemAllocator_SetProperties(allocator, &req_props, &ret_props); + IMemAllocator_Release(allocator); + if (hr == E_FAIL) + { + skip("Got E_FAIL when setting allocator properties.\n"); + goto out; + } + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!memcmp(&ret_props, &req_props, sizeof(req_props)), "Properties did not match.\n"); + } + + hr = IVMRWindowlessControl9_GetNativeVideoSize(windowless_control, NULL, &height, &aspect_width, &aspect_height); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + hr = IVMRWindowlessControl9_GetNativeVideoSize(windowless_control, &width, NULL, &aspect_width, &aspect_height); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + width = height = 0xdeadbeef; + hr = IVMRWindowlessControl9_GetNativeVideoSize(windowless_control, &width, &height, NULL, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(width == 32, "Got width %d.\n", width); + todo_wine ok(height == 16, "Got height %d.\n", height); + + aspect_width = aspect_height = 0xdeadbeef; + hr = IVMRWindowlessControl9_GetNativeVideoSize(windowless_control, &width, &height, &aspect_width, &aspect_height); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(aspect_width == 32, "Got width %d.\n", aspect_width); + ok(aspect_height == 16, "Got height %d.\n", aspect_height); + + memset(&src, 0xcc, sizeof(src)); + hr = IVMRWindowlessControl9_GetVideoPosition(windowless_control, &src, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + SetRect(&expect, 0, 0, 32, 16); + ok(EqualRect(&src, &expect), "Got source rect %s.\n", wine_dbgstr_rect(&src)); + + memset(&dst, 0xcc, sizeof(dst)); + hr = IVMRWindowlessControl9_GetVideoPosition(windowless_control, NULL, &dst); + ok(hr == S_OK, "Got hr %#x.\n", hr); + SetRect(&expect, 0, 0, 0, 0); + todo_wine ok(EqualRect(&dst, &expect), "Got dest rect %s.\n", wine_dbgstr_rect(&dst)); + + SetRect(&src, 4, 6, 16, 12); + hr = IVMRWindowlessControl9_SetVideoPosition(windowless_control, &src, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + memset(&src, 0xcc, sizeof(src)); + memset(&dst, 0xcc, sizeof(dst)); + hr = IVMRWindowlessControl9_GetVideoPosition(windowless_control, &src, &dst); + ok(hr == S_OK, "Got hr %#x.\n", hr); + SetRect(&expect, 4, 6, 16, 12); + ok(EqualRect(&src, &expect), "Got source rect %s.\n", wine_dbgstr_rect(&src)); + SetRect(&expect, 0, 0, 0, 0); + todo_wine ok(EqualRect(&dst, &expect), "Got dest rect %s.\n", wine_dbgstr_rect(&dst)); + + SetRect(&dst, 40, 60, 120, 160); + hr = IVMRWindowlessControl9_SetVideoPosition(windowless_control, NULL, &dst); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + memset(&src, 0xcc, sizeof(src)); + memset(&dst, 0xcc, sizeof(dst)); + hr = IVMRWindowlessControl9_GetVideoPosition(windowless_control, &src, &dst); + ok(hr == S_OK, "Got hr %#x.\n", hr); + SetRect(&expect, 4, 6, 16, 12); + ok(EqualRect(&src, &expect), "Got source rect %s.\n", wine_dbgstr_rect(&src)); + SetRect(&expect, 40, 60, 120, 160); + todo_wine ok(EqualRect(&dst, &expect), "Got dest rect %s.\n", wine_dbgstr_rect(&dst)); + + GetWindowRect(window, &src); + SetRect(&expect, 0, 0, 640, 480); + ok(EqualRect(&src, &expect), "Got window rect %s.\n", wine_dbgstr_rect(&src)); + +out: + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMemInputPin_Release(input); + IPin_Release(pin); + IVMRWindowlessControl9_Release(windowless_control); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + DestroyWindow(window); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -3779,6 +3910,7 @@ START_TEST(vmr9) test_clipping_window(); test_surface_allocator_notify_refcount(); test_basic_video(); + test_windowless_size(); CoUninitialize(); }

1 0

Zebediah Figura : quartz: Set VMR9AllocationInfo dimension members to the video dimensions.
by Alexandre Julliard 11 May '20

11 May '20

Module: wine Branch: master Commit: 5f602b46f3cd70f68d6666ca4b0a1b43fca3e0e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f602b46f3cd70f68d6666ca… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 11 11:03:08 2020 -0500 quartz: Set VMR9AllocationInfo dimension members to the video dimensions. These will be identical to the source rect at connection time, but not necessarily if we ever need to recreate the surfaces (due to a lost device, for example), and we still want to use the source image dimensions in that case. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 758ede6155..29be5aaa81 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -409,14 +409,10 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE if (filter->mode == VMR9Mode_Windowless && !filter->hWndClippingWindow) return S_OK; - info.dwWidth = filter->window.src.right; - info.dwHeight = filter->window.src.bottom; info.Pool = D3DPOOL_DEFAULT; info.MinBuffers = 1; - info.szAspectRatio.cx = info.dwWidth; - info.szAspectRatio.cy = info.dwHeight; - info.szNativeSize.cx = filter->bmiheader.biWidth; - info.szNativeSize.cy = filter->bmiheader.biHeight; + info.dwWidth = info.szAspectRatio.cx = info.szNativeSize.cx = filter->bmiheader.biWidth; + info.dwHeight = info.szAspectRatio.cy = info.szNativeSize.cy = filter->bmiheader.biHeight; filter->cur_surface = 0;

1 0

Zebediah Figura : quartz: Get rid of the texture drawing path.
by Alexandre Julliard 11 May '20

11 May '20

Module: wine Branch: master Commit: 848b85b65768454c544de81c7585e2d43b3e5de2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=848b85b65768454c544de81c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 11 11:03:09 2020 -0500 quartz: Get rid of the texture drawing path. StretchRect() should be good enough for presenting both kinds of surfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 125 +---------------------------------------------------- 1 file changed, 2 insertions(+), 123 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 29be5aaa81..342c44bdad 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -179,7 +179,6 @@ struct default_presenter IDirect3DDevice9 *d3d9_dev; IDirect3D9 *d3d9_ptr; IDirect3DSurface9 **d3d9_surfaces; - IDirect3DVertexBuffer9 *d3d9_vertex; HMONITOR hMon; DWORD num_surfaces; @@ -2379,11 +2378,6 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) free(This->d3d9_surfaces); This->d3d9_surfaces = NULL; This->num_surfaces = 0; - if (This->d3d9_vertex) - { - IDirect3DVertexBuffer9_Release(This->d3d9_vertex); - This->d3d9_vertex = NULL; - } free(This); return 0; } @@ -2406,57 +2400,10 @@ static HRESULT WINAPI VMR9_ImagePresenter_StopPresenting(IVMRImagePresenter9 *if return S_OK; } -#define USED_FVF (D3DFVF_XYZRHW | D3DFVF_TEX1) -struct VERTEX { float x, y, z, rhw, u, v; }; - -static HRESULT VMR9_ImagePresenter_PresentTexture(struct default_presenter *This, IDirect3DSurface9 *surface) -{ - IDirect3DTexture9 *texture = NULL; - HRESULT hr; - - hr = IDirect3DDevice9_SetFVF(This->d3d9_dev, USED_FVF); - if (FAILED(hr)) - { - FIXME("SetFVF: %08x\n", hr); - return hr; - } - - hr = IDirect3DDevice9_SetStreamSource(This->d3d9_dev, 0, This->d3d9_vertex, 0, sizeof(struct VERTEX)); - if (FAILED(hr)) - { - FIXME("SetStreamSource: %08x\n", hr); - return hr; - } - - hr = IDirect3DSurface9_GetContainer(surface, &IID_IDirect3DTexture9, (void **) &texture); - if (FAILED(hr)) - { - FIXME("IDirect3DSurface9_GetContainer failed\n"); - return hr; - } - hr = IDirect3DDevice9_SetTexture(This->d3d9_dev, 0, (IDirect3DBaseTexture9 *)texture); - IDirect3DTexture9_Release(texture); - if (FAILED(hr)) - { - FIXME("SetTexture: %08x\n", hr); - return hr; - } - - hr = IDirect3DDevice9_DrawPrimitive(This->d3d9_dev, D3DPT_TRIANGLESTRIP, 0, 2); - if (FAILED(hr)) - { - FIXME("DrawPrimitive: %08x\n", hr); - return hr; - } - - return S_OK; -} - static HRESULT VMR9_ImagePresenter_PresentOffscreenSurface(struct default_presenter *This, IDirect3DSurface9 *surface) { HRESULT hr; IDirect3DSurface9 *target = NULL; - RECT target_rect; hr = IDirect3DDevice9_GetBackBuffer(This->d3d9_dev, 0, 0, D3DBACKBUFFER_TYPE_MONO, &target); if (FAILED(hr)) @@ -2465,12 +2412,8 @@ static HRESULT VMR9_ImagePresenter_PresentOffscreenSurface(struct default_presen return hr; } - /* Move rect to origin and flip it */ - SetRect(&target_rect, 0, This->pVMR9->window.dst.bottom - This->pVMR9->window.dst.top, - This->pVMR9->window.dst.right - This->pVMR9->window.dst.left, 0); - hr = IDirect3DDevice9_StretchRect(This->d3d9_dev, surface, - &This->pVMR9->window.src, target, &target_rect, D3DTEXF_LINEAR); + &This->pVMR9->window.src, target, NULL, D3DTEXF_LINEAR); if (FAILED(hr)) ERR("IDirect3DDevice9_StretchRect -- %08x\n", hr); IDirect3DSurface9_Release(target); @@ -2500,10 +2443,7 @@ static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *ifac hr = IDirect3DDevice9_BeginScene(This->d3d9_dev); if (SUCCEEDED(hr)) { - if (This->d3d9_vertex) - hr = VMR9_ImagePresenter_PresentTexture(This, info->lpSurf); - else - hr = VMR9_ImagePresenter_PresentOffscreenSurface(This, info->lpSurf); + hr = VMR9_ImagePresenter_PresentOffscreenSurface(This, info->lpSurf); render = SUCCEEDED(hr); } else @@ -2589,13 +2529,6 @@ static HRESULT VMR9_SurfaceAllocator_SetAllocationSettings(struct default_presen FIXME("Square texture support required..\n"); } - hr = IDirect3DDevice9_CreateVertexBuffer(This->d3d9_dev, 4 * sizeof(struct VERTEX), D3DUSAGE_WRITEONLY, USED_FVF, allocinfo->Pool, &This->d3d9_vertex, NULL); - if (FAILED(hr)) - { - ERR("Couldn't create vertex buffer: %08x\n", hr); - return hr; - } - This->reset = TRUE; allocinfo->dwHeight = height; allocinfo->dwWidth = width; @@ -2709,10 +2642,7 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_TerminateDevice(IVMRSurfaceAllocator /* Recreate all surfaces (If allocated as D3DPOOL_DEFAULT) and survive! */ static HRESULT VMR9_SurfaceAllocator_UpdateDeviceReset(struct default_presenter *This) { - struct VERTEX t_vert[4]; - UINT width, height; unsigned int i; - void *bits = NULL; D3DPRESENT_PARAMETERS d3dpp; HRESULT hr; @@ -2721,11 +2651,6 @@ static HRESULT VMR9_SurfaceAllocator_UpdateDeviceReset(struct default_presenter This->reset = FALSE; TRACE("RESETTING\n"); - if (This->d3d9_vertex) - { - IDirect3DVertexBuffer9_Release(This->d3d9_vertex); - This->d3d9_vertex = NULL; - } for (i = 0; i < This->num_surfaces; ++i) { @@ -2765,52 +2690,6 @@ static HRESULT VMR9_SurfaceAllocator_UpdateDeviceReset(struct default_presenter This->reset = FALSE; - if (!(This->info.dwFlags & VMR9AllocFlag_TextureSurface)) - return S_OK; - - hr = IDirect3DDevice9_CreateVertexBuffer(This->d3d9_dev, 4 * sizeof(struct VERTEX), D3DUSAGE_WRITEONLY, USED_FVF, - This->info.Pool, &This->d3d9_vertex, NULL); - - width = This->info.dwWidth; - height = This->info.dwHeight; - - for (i = 0; i < ARRAY_SIZE(t_vert); ++i) - { - if (i % 2) - { - t_vert[i].x = (float)This->pVMR9->window.dst.right - (float)This->pVMR9->window.dst.left - 0.5f; - t_vert[i].u = (float)This->pVMR9->window.src.right / (float)width; - } - else - { - t_vert[i].x = -0.5f; - t_vert[i].u = (float)This->pVMR9->window.src.left / (float)width; - } - - if (i % 4 < 2) - { - t_vert[i].y = -0.5f; - t_vert[i].v = (float)This->pVMR9->window.src.bottom / (float)height; - } - else - { - t_vert[i].y = (float)This->pVMR9->window.dst.bottom - (float)This->pVMR9->window.dst.top - 0.5f; - t_vert[i].v = (float)This->pVMR9->window.src.top / (float)height; - } - t_vert[i].z = 0.0f; - t_vert[i].rhw = 1.0f; - } - - FIXME("Vertex rectangle:\n"); - FIXME("X, Y: %f, %f\n", t_vert[0].x, t_vert[0].y); - FIXME("X, Y: %f, %f\n", t_vert[3].x, t_vert[3].y); - FIXME("TOP, LEFT: %f, %f\n", t_vert[0].u, t_vert[0].v); - FIXME("DOWN, BOTTOM: %f, %f\n", t_vert[3].u, t_vert[3].v); - - IDirect3DVertexBuffer9_Lock(This->d3d9_vertex, 0, sizeof(t_vert), &bits, 0); - memcpy(bits, t_vert, sizeof(t_vert)); - IDirect3DVertexBuffer9_Unlock(This->d3d9_vertex); - return S_OK; }

1 0

Vincent Povirk : joy.cpl: Add a description.
by Alexandre Julliard 11 May '20

11 May '20

Module: wine Branch: master Commit: 41e9ba8210b3fa7fd8c7b804a00632c35990581a URL: https://source.winehq.org/git/wine.git/?a=commit;h=41e9ba8210b3fa7fd8c7b804… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun May 10 21:28:53 2020 -0500 joy.cpl: Add a description. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/joy.rc | 1 + po/ar.po | 28 ++++++++++++++++------------ po/ast.po | 28 ++++++++++++++++------------ po/bg.po | 28 ++++++++++++++++------------ po/ca.po | 28 ++++++++++++++++------------ po/cs.po | 28 ++++++++++++++++------------ po/da.po | 28 ++++++++++++++++------------ po/de.po | 28 ++++++++++++++++------------ po/el.po | 28 ++++++++++++++++------------ po/en.po | 28 ++++++++++++++++------------ po/en_US.po | 28 ++++++++++++++++------------ po/eo.po | 28 ++++++++++++++++------------ po/es.po | 28 ++++++++++++++++------------ po/fa.po | 28 ++++++++++++++++------------ po/fi.po | 28 ++++++++++++++++------------ po/fr.po | 28 ++++++++++++++++------------ po/he.po | 28 ++++++++++++++++------------ po/hi.po | 28 ++++++++++++++++------------ po/hr.po | 28 ++++++++++++++++------------ po/hu.po | 28 ++++++++++++++++------------ po/it.po | 28 ++++++++++++++++------------ po/ja.po | 28 ++++++++++++++++------------ po/ko.po | 28 ++++++++++++++++------------ po/lt.po | 28 ++++++++++++++++------------ po/ml.po | 28 ++++++++++++++++------------ po/nb_NO.po | 28 ++++++++++++++++------------ po/nl.po | 28 ++++++++++++++++------------ po/or.po | 28 ++++++++++++++++------------ po/pa.po | 28 ++++++++++++++++------------ po/pl.po | 28 ++++++++++++++++------------ po/pt_BR.po | 28 ++++++++++++++++------------ po/pt_PT.po | 28 ++++++++++++++++------------ po/rm.po | 28 ++++++++++++++++------------ po/ro.po | 28 ++++++++++++++++------------ po/ru.po | 28 ++++++++++++++++------------ po/si.po | 28 ++++++++++++++++------------ po/sk.po | 28 ++++++++++++++++------------ po/sl.po | 28 ++++++++++++++++------------ po/sr_RS(a)cyrillic.po | 28 ++++++++++++++++------------ po/sr_RS(a)latin.po | 28 ++++++++++++++++------------ po/sv.po | 28 ++++++++++++++++------------ po/ta.po | 28 ++++++++++++++++------------ po/te.po | 28 ++++++++++++++++------------ po/th.po | 28 ++++++++++++++++------------ po/tr.po | 28 ++++++++++++++++------------ po/uk.po | 28 ++++++++++++++++------------ po/wa.po | 28 ++++++++++++++++------------ po/wine.pot | 28 ++++++++++++++++------------ po/zh_CN.po | 28 ++++++++++++++++------------ po/zh_TW.po | 28 ++++++++++++++++------------ 50 files changed, 785 insertions(+), 588 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=41e9ba8210b3fa7fd8c7…

1 0