wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

Anton Baskanov : quartz: Reset the event if the queue was empty in IMediaEvent::GetEvent().
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: d293200f7f1b6771ab49ac2d3e2cd68d34d42812 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d293200f7f1b6771ab49ac2d… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Feb 18 16:58:13 2021 -0600 quartz: Reset the event if the queue was empty in IMediaEvent::GetEvent(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 4 +--- dlls/quartz/tests/filtergraph.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 8909ba64024..131e022b0ba 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -4744,6 +4744,7 @@ static HRESULT WINAPI MediaEvent_GetEvent(IMediaEventEx *iface, LONG *code, if (!(entry = list_head(&graph->media_events))) { + ResetEvent(graph->media_event_handle); LeaveCriticalSection(&graph->cs); return E_ABORT; } @@ -4754,9 +4755,6 @@ static HRESULT WINAPI MediaEvent_GetEvent(IMediaEventEx *iface, LONG *code, *param2 = event->param2; free(event); - if (list_empty(&graph->media_events)) - ResetEvent(graph->media_event_handle); - LeaveCriticalSection(&graph->cs); return S_OK; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 5d22ba410af..81b13255382 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -5260,7 +5260,7 @@ static void test_set_notify_flags(void) hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); ok(hr == E_ABORT, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); hr = IMediaEventEx_SetNotifyFlags(media_event, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -5474,7 +5474,7 @@ static void test_events(void) hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); ok(hr == E_ABORT, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); hr = IMediaControl_Stop(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : quartz: Clear pending events when disabling notifications.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: aab10e6ca79ccdbaad3109a97afd57226c29bea8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aab10e6ca79ccdbaad3109a9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 18 16:58:12 2021 -0600 quartz: Clear pending events when disabling notifications. Based on a patch by Anton Baskanov. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 28 ++++++++++++++++++++-------- dlls/quartz/tests/filtergraph.c | 6 +++--- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index a060ee840db..8909ba64024 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -319,6 +319,19 @@ static BOOL queue_media_event(struct filter_graph *graph, LONG code, return TRUE; } +static void flush_media_events(struct filter_graph *graph) +{ + struct list *cursor; + + while ((cursor = list_head(&graph->media_events))) + { + struct media_event *event = LIST_ENTRY(cursor, struct media_event, entry); + + list_remove(&event->entry); + free(event); + } +} + static struct filter_graph *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, struct filter_graph, IUnknown_inner); @@ -443,14 +456,7 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown *iface) if (This->pSite) IUnknown_Release(This->pSite); - while ((cursor = list_head(&This->media_events))) - { - struct media_event *event = LIST_ENTRY(cursor, struct media_event, entry); - - list_remove(&event->entry); - free(event); - } - + flush_media_events(This); CloseHandle(This->media_event_handle); This->cs.DebugInfo->Spare[0] = 0; @@ -4850,6 +4856,12 @@ static HRESULT WINAPI MediaEvent_SetNotifyFlags(IMediaEventEx *iface, LONG flags graph->media_events_disabled = flags; + if (flags) + { + flush_media_events(graph); + ResetEvent(graph->media_event_handle); + } + return S_OK; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 6288e3095dd..5d22ba410af 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -5215,10 +5215,10 @@ static void test_set_notify_flags(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(flags == AM_MEDIAEVENT_NONOTIFY, "Got flags %#x\n", flags); - todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); - todo_wine ok(hr == E_ABORT, "Got hr %#x.\n", hr); + ok(hr == E_ABORT, "Got hr %#x.\n", hr); hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -5282,7 +5282,7 @@ static void test_set_notify_flags(void) hr = IMediaEventEx_SetNotifyFlags(media_event, AM_MEDIAEVENT_NONOTIFY); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); hr = IMediaControl_Stop(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : quartz: Inline the WndNotify structure into struct filter_graph.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 99c098728994c8c57540eaff60752204021ece5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=99c098728994c8c57540eaff… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 18 16:58:11 2021 -0600 quartz: Inline the WndNotify structure into struct filter_graph. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 61 +++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 25aa78433b9..a060ee840db 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -42,13 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -typedef struct { - HWND hWnd; /* Target window */ - UINT msg; /* User window message */ - LONG_PTR instance; /* User data */ - int disabled; /* Disabled messages posting */ -} WndNotify; - struct media_event { struct list entry; @@ -113,9 +106,11 @@ struct filter_graph struct list media_events; HANDLE media_event_handle; + HWND media_event_window; + UINT media_event_message; + LPARAM media_event_lparam; HANDLE hEventCompletion; int CompletionStatus; - WndNotify notif; int nRenderers; int EcCompleteCount; int HandleEcComplete; @@ -141,6 +136,7 @@ struct filter_graph unsigned int needs_async_run : 1; unsigned int got_ec_complete : 1; + unsigned int media_events_disabled : 1; }; struct enum_filters @@ -317,8 +313,8 @@ static BOOL queue_media_event(struct filter_graph *graph, LONG code, list_add_tail(&graph->media_events, &event->entry); SetEvent(graph->media_event_handle); - if (graph->notif.hWnd) - PostMessageW(graph->notif.hWnd, graph->notif.msg, 0, graph->notif.instance); + if (graph->media_event_window) + PostMessageW(graph->media_event_window, graph->media_event_message, 0, graph->media_event_lparam); return TRUE; } @@ -4826,44 +4822,47 @@ static HRESULT WINAPI MediaEvent_FreeEventParams(IMediaEventEx *iface, LONG lEvC } /*** IMediaEventEx methods ***/ -static HRESULT WINAPI MediaEvent_SetNotifyWindow(IMediaEventEx *iface, OAHWND hwnd, LONG lMsg, - LONG_PTR lInstanceData) +static HRESULT WINAPI MediaEvent_SetNotifyWindow(IMediaEventEx *iface, + OAHWND window, LONG message, LONG_PTR lparam) { - struct filter_graph *This = impl_from_IMediaEventEx(iface); + struct filter_graph *graph = impl_from_IMediaEventEx(iface); - TRACE("(%p/%p)->(%08lx, %d, %08lx)\n", This, iface, hwnd, lMsg, lInstanceData); + TRACE("graph %p, window %#Ix, message %#x, lparam %#Ix.\n", graph, window, message, lparam); - This->notif.hWnd = (HWND)hwnd; - This->notif.msg = lMsg; - This->notif.instance = lInstanceData; + graph->media_event_window = (HWND)window; + graph->media_event_message = message; + graph->media_event_lparam = lparam; return S_OK; } -static HRESULT WINAPI MediaEvent_SetNotifyFlags(IMediaEventEx *iface, LONG lNoNotifyFlags) +static HRESULT WINAPI MediaEvent_SetNotifyFlags(IMediaEventEx *iface, LONG flags) { - struct filter_graph *This = impl_from_IMediaEventEx(iface); + struct filter_graph *graph = impl_from_IMediaEventEx(iface); - TRACE("(%p/%p)->(%d)\n", This, iface, lNoNotifyFlags); + TRACE("graph %p, flags %#x.\n", graph, flags); - if ((lNoNotifyFlags != 0) && (lNoNotifyFlags != 1)) - return E_INVALIDARG; + if (flags & ~AM_MEDIAEVENT_NONOTIFY) + { + WARN("Invalid flags %#x, returning E_INVALIDARG.\n", flags); + return E_INVALIDARG; + } - This->notif.disabled = lNoNotifyFlags; + graph->media_events_disabled = flags; return S_OK; } -static HRESULT WINAPI MediaEvent_GetNotifyFlags(IMediaEventEx *iface, LONG *lplNoNotifyFlags) +static HRESULT WINAPI MediaEvent_GetNotifyFlags(IMediaEventEx *iface, LONG *flags) { - struct filter_graph *This = impl_from_IMediaEventEx(iface); + struct filter_graph *graph = impl_from_IMediaEventEx(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, lplNoNotifyFlags); + TRACE("graph %p, flags %p.\n", graph, flags); - if (!lplNoNotifyFlags) - return E_POINTER; + if (!flags) + return E_POINTER; - *lplNoNotifyFlags = This->notif.disabled; + *flags = graph->media_events_disabled; return S_OK; } @@ -5246,7 +5245,7 @@ static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, LONG code, { if (++graph->EcCompleteCount == graph->nRenderers) { - if (graph->notif.disabled) + if (graph->media_events_disabled) SetEvent(graph->media_event_handle); else queue_media_event(graph, EC_COMPLETE, S_OK, 0); @@ -5259,7 +5258,7 @@ static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, LONG code, { FIXME("EC_REPAINT is not handled.\n"); } - else if (!graph->notif.disabled) + else if (!graph->media_events_disabled) { queue_media_event(graph, code, param1, param2); }

1 0

Zebediah Figura : quartz: Use a linked list to store media events.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: d40bc6dc3751fd30cb3808f6d2ceaa1ea198a77f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d40bc6dc3751fd30cb3808f6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 18 16:58:10 2021 -0600 quartz: Use a linked list to store media events. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 236 ++++++++++++++++++---------------------------- 1 file changed, 93 insertions(+), 143 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d40bc6dc3751fd30cb38…

1 0

Zebediah Figura : quartz: Use the graph critical section to synchronize media event methods.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: dc836b85c1458c916c5ad3b86ff8df59ce634dd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc836b85c1458c916c5ad3b8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 18 16:58:09 2021 -0600 quartz: Use the graph critical section to synchronize media event methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 8c1cd6232e4..681893a1e11 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -62,7 +62,6 @@ typedef struct { int ring_buffer_size; int msg_tosave; int msg_toget; - CRITICAL_SECTION msg_crst; HANDLE msg_event; /* Signaled for no empty queue */ } EventsQueue; @@ -75,8 +74,6 @@ static int EventsQueue_Init(EventsQueue* omr) omr->messages = CoTaskMemAlloc(omr->ring_buffer_size * sizeof(Event)); ZeroMemory(omr->messages, omr->ring_buffer_size * sizeof(Event)); - InitializeCriticalSection(&omr->msg_crst); - omr->msg_crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": EventsQueue.msg_crst"); return TRUE; } @@ -84,14 +81,11 @@ static int EventsQueue_Destroy(EventsQueue* omr) { CloseHandle(omr->msg_event); CoTaskMemFree(omr->messages); - omr->msg_crst.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&omr->msg_crst); return TRUE; } static BOOL EventsQueue_PutEvent(EventsQueue* omr, const Event* evt) { - EnterCriticalSection(&omr->msg_crst); if (omr->msg_toget == ((omr->msg_tosave + 1) % omr->ring_buffer_size)) { int old_ring_buffer_size = omr->ring_buffer_size; @@ -114,22 +108,13 @@ static BOOL EventsQueue_PutEvent(EventsQueue* omr, const Event* evt) omr->messages[omr->msg_tosave] = *evt; SetEvent(omr->msg_event); omr->msg_tosave = (omr->msg_tosave + 1) % omr->ring_buffer_size; - LeaveCriticalSection(&omr->msg_crst); return TRUE; } -static BOOL EventsQueue_GetEvent(EventsQueue* omr, Event* evt, LONG msTimeOut) +static BOOL EventsQueue_GetEvent(EventsQueue* omr, Event* evt) { - if (WaitForSingleObject(omr->msg_event, msTimeOut) != WAIT_OBJECT_0) - return FALSE; - - EnterCriticalSection(&omr->msg_crst); - if (omr->msg_toget == omr->msg_tosave) /* buffer empty ? */ - { - LeaveCriticalSection(&omr->msg_crst); return FALSE; - } *evt = omr->messages[omr->msg_toget]; omr->msg_toget = (omr->msg_toget + 1) % omr->ring_buffer_size; @@ -138,7 +123,6 @@ static BOOL EventsQueue_GetEvent(EventsQueue* omr, Event* evt, LONG msTimeOut) if (omr->msg_toget == omr->msg_tosave) /* buffer empty ? */ ResetEvent(omr->msg_event); - LeaveCriticalSection(&omr->msg_crst); return TRUE; } @@ -4786,14 +4770,24 @@ static HRESULT WINAPI MediaEvent_GetEvent(IMediaEventEx *iface, LONG *lEventCode TRACE("(%p/%p)->(%p, %p, %p, %d)\n", This, iface, lEventCode, lParam1, lParam2, msTimeout); - if (EventsQueue_GetEvent(&This->evqueue, &evt, msTimeout)) + if (WaitForSingleObject(This->evqueue.msg_event, msTimeout)) + { + *lEventCode = 0; + return E_ABORT; + } + + EnterCriticalSection(&This->cs); + + if (EventsQueue_GetEvent(&This->evqueue, &evt)) { *lEventCode = evt.lEventCode; *lParam1 = evt.lParam1; *lParam2 = evt.lParam2; + LeaveCriticalSection(&This->cs); return S_OK; } + LeaveCriticalSection(&This->cs); *lEventCode = 0; return E_ABORT; } @@ -5280,8 +5274,7 @@ static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, LONG EventCo TRACE("(%p/%p)->(%d, %ld, %ld)\n", This, iface, EventCode, EventParam1, EventParam2); - /* We need thread safety here, let's use the events queue's one */ - EnterCriticalSection(&This->evqueue.msg_crst); + EnterCriticalSection(&This->cs); if ((EventCode == EC_COMPLETE) && This->HandleEcComplete) { @@ -5324,7 +5317,7 @@ static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, LONG EventCo PostMessageW(This->notif.hWnd, This->notif.msg, 0, This->notif.instance); } - LeaveCriticalSection(&This->evqueue.msg_crst); + LeaveCriticalSection(&This->cs); return S_OK; }

1 0

Zebediah Figura : quartz/tests: Add more tests for media events.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 5b0b78b6f0cb47dd87b353d1c4bf20bd7677e517 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b0b78b6f0cb47dd87b353d1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 18 16:58:08 2021 -0600 quartz/tests: Add more tests for media events. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 86 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 55c70702e47..6288e3095dd 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -5156,12 +5156,12 @@ static void test_set_notify_flags(void) IMediaEventEx *media_event; struct testfilter filter; LONG_PTR param1, param2; + LONG code, flags; HANDLE event; HWND window; BSTR status; HRESULT hr; ULONG ref; - LONG code; MSG msg; window = CreateWindowA("static", NULL, WS_OVERLAPPEDWINDOW, @@ -5196,9 +5196,25 @@ static void test_set_notify_flags(void) while (PeekMessageA(&msg, window, WM_USER, WM_USER, PM_REMOVE)); + hr = IMediaEventEx_SetNotifyFlags(media_event, 2); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IMediaEventEx_GetNotifyFlags(media_event, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + flags = 0xdeadbeef; + hr = IMediaEventEx_GetNotifyFlags(media_event, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!flags, "Got flags %#x\n", flags); + hr = IMediaEventEx_SetNotifyFlags(media_event, AM_MEDIAEVENT_NONOTIFY); ok(hr == S_OK, "Got hr %#x.\n", hr); + flags = 0xdeadbeef; + hr = IMediaEventEx_GetNotifyFlags(media_event, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(flags == AM_MEDIAEVENT_NONOTIFY, "Got flags %#x\n", flags); + todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); @@ -5249,6 +5265,11 @@ static void test_set_notify_flags(void) hr = IMediaEventEx_SetNotifyFlags(media_event, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); + flags = 0xdeadbeef; + hr = IMediaEventEx_GetNotifyFlags(media_event, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!flags, "Got flags %#x\n", flags); + hr = IMediaControl_Stop(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_Run(media_control); @@ -5295,6 +5316,8 @@ static void check_events_(unsigned int line, IMediaEventEx *media_event, ++ec_complete_count; if (code == EC_STATUS) ++ec_status_count; + hr = IMediaEventEx_FreeEventParams(media_event, code, param1, param2); + ok(hr == S_OK, "Got hr %#x.\n", hr); } ok(hr == E_ABORT, "Got hr %#x.\n", hr); todo_wine_if(todo) ok_(__FILE__, line)(ec_complete_count == expected_ec_complete_count, @@ -5336,9 +5359,51 @@ static void test_events(void) hr = IMediaEventEx_GetEventHandle(media_event, (OAEVENT *)&event); ok(hr == S_OK, "Got hr %#x.\n", hr); + code = 0xdeadbeef; + param1 = 0xdeadbeef; + param2 = 0xdeadbeef; + hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 0); + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + ok(!code, "Got code %#x.\n", code); + todo_wine ok(!param1, "Got param1 %#Ix.\n", param1); + todo_wine ok(!param2, "Got param2 %#Ix.\n", param2); + + /* EC_COMPLETE is ignored while in stopped or paused state. */ + + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_events(media_event, 0, 2, FALSE); + + hr = IMediaControl_Pause(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_events(media_event, 0, 2, FALSE); + hr = IMediaControl_Run(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); + check_events(media_event, 0, 0, FALSE); + + /* Pausing and then running the graph clears pending EC_COMPLETE events. + * This remains true even with default handling canceled. */ + + hr = IMediaEventEx_CancelDefaultHandling(media_event, EC_COMPLETE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, @@ -5385,6 +5450,25 @@ static void test_events(void) check_events(media_event, 1, 2, FALSE); + hr = IMediaControl_Run(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_Run(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_events(media_event, 0, 2, TRUE); + + /* GetEvent() resets the event object if there are no events available. */ + SetEvent(event); hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50);

1 0

Zebediah Figura : winegstreamer: Reimplement the media source on top of the wg_parser object.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: f9c43fc9fa6e68ac0b886fd03e0425c8862aaa68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9c43fc9fa6e68ac0b886fd0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 18 17:01:27 2021 -0600 winegstreamer: Reimplement the media source on top of the wg_parser object. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 1 - dlls/winegstreamer/audioconvert.c | 12 - dlls/winegstreamer/gst_cbs.c | 235 ------------- dlls/winegstreamer/gst_cbs.h | 110 ------ dlls/winegstreamer/gst_private.h | 8 +- dlls/winegstreamer/gstdemux.c | 19 -- dlls/winegstreamer/main.c | 2 - dlls/winegstreamer/media_source.c | 699 +++++++++----------------------------- dlls/winegstreamer/mfplat.c | 460 +++++++++---------------- dlls/winegstreamer/wg_parser.c | 12 +- 10 files changed, 337 insertions(+), 1221 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f9c43fc9fa6e68ac0b88…

1 0

Derek Lesho : winegstreamer: Implement IMFMediaSource::Stop.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 6f785fa7ce79d48736b78ca4ab2c0c51fe2e0348 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f785fa7ce79d48736b78ca4… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Feb 18 17:01:26 2021 -0600 winegstreamer: Implement IMFMediaSource::Stop. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 6fb2c7f6f48..604e0ef056c 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -64,6 +64,7 @@ struct media_stream enum source_async_op { SOURCE_ASYNC_START, + SOURCE_ASYNC_STOP, SOURCE_ASYNC_REQUEST_SAMPLE, }; @@ -360,6 +361,24 @@ static void start_pipeline(struct media_source *source, struct source_async_comm gst_element_set_state(source->container, GST_STATE_PLAYING); } +static void stop_pipeline(struct media_source *source) +{ + unsigned int i; + + gst_element_set_state(source->container, GST_STATE_PAUSED); + + for (i = 0; i < source->stream_count; i++) + { + struct media_stream *stream = source->streams[i]; + if (stream->state != STREAM_INACTIVE) + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamStopped, &GUID_NULL, S_OK, NULL); + } + + IMFMediaEventQueue_QueueEventParamVar(source->event_queue, MESourceStopped, &GUID_NULL, S_OK, NULL); + + source->state = SOURCE_STOPPED; +} + static void dispatch_end_of_presentation(struct media_source *source) { PROPVARIANT empty = {.vt = VT_EMPTY}; @@ -434,6 +453,9 @@ static HRESULT WINAPI source_async_commands_Invoke(IMFAsyncCallback *iface, IMFA case SOURCE_ASYNC_START: start_pipeline(source, command); break; + case SOURCE_ASYNC_STOP: + stop_pipeline(source); + break; case SOURCE_ASYNC_REQUEST_SAMPLE: wait_on_sample(command->u.request_sample.stream, command->u.request_sample.token); break; @@ -1177,13 +1199,18 @@ static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationD static HRESULT WINAPI media_source_Stop(IMFMediaSource *iface) { struct media_source *source = impl_from_IMFMediaSource(iface); + struct source_async_command *command; + HRESULT hr; - FIXME("(%p): stub\n", source); + TRACE("(%p)\n", source); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; - return E_NOTIMPL; + if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_STOP, &command))) + hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, &command->IUnknown_iface); + + return hr; } static HRESULT WINAPI media_source_Pause(IMFMediaSource *iface)

1 0

Zebediah Figura : winegstreamer: Explicitly translate the channel mask.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 8697c6c0dbc1b6878a6f070b7d6d851d4972e22a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8697c6c0dbc1b6878a6f070b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 18 17:01:25 2021 -0600 winegstreamer: Explicitly translate the channel mask. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/gstdemux.c | 35 +++++++------ dlls/winegstreamer/wg_parser.c | 109 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 129 insertions(+), 16 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 75025fdf7d5..128546a0265 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -128,6 +128,7 @@ struct wg_format } format; uint32_t channels; + uint32_t channel_mask; /* In WinMM format. */ uint32_t rate; } audio; } u; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index d85bb02160e..75b1cece095 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -102,20 +102,6 @@ static HRESULT WINAPI GST_ChangeCurrent(IMediaSeeking *iface); static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface); static HRESULT WINAPI GST_ChangeRate(IMediaSeeking *iface); -static DWORD channel_mask_from_count(uint32_t count) -{ - switch (count) - { - case 1: return KSAUDIO_SPEAKER_MONO; - case 2: return KSAUDIO_SPEAKER_STEREO; - case 4: return KSAUDIO_SPEAKER_SURROUND; - case 5: return KSAUDIO_SPEAKER_5POINT1 & ~SPEAKER_LOW_FREQUENCY; - case 6: return KSAUDIO_SPEAKER_5POINT1; - case 8: return KSAUDIO_SPEAKER_7POINT1; - default: return 0; - } -} - static bool amt_from_wg_format_audio(AM_MEDIA_TYPE *mt, const struct wg_format *format) { mt->majortype = MEDIATYPE_Audio; @@ -220,7 +206,7 @@ static bool amt_from_wg_format_audio(AM_MEDIA_TYPE *mt, const struct wg_format * wave_format->Format.wBitsPerSample = depth; wave_format->Format.cbSize = sizeof(*wave_format) - sizeof(WAVEFORMATEX); wave_format->Samples.wValidBitsPerSample = depth; - wave_format->dwChannelMask = channel_mask_from_count(format->u.audio.channels); + wave_format->dwChannelMask = format->u.audio.channel_mask; wave_format->SubFormat = is_float ? KSDATAFORMAT_SUBTYPE_IEEE_FLOAT : KSDATAFORMAT_SUBTYPE_PCM; mt->lSampleSize = wave_format->Format.nBlockAlign; } @@ -423,6 +409,25 @@ static bool amt_to_wg_format_audio(const AM_MEDIA_TYPE *mt, struct wg_format *fo format->u.audio.channels = audio_format->nChannels; format->u.audio.rate = audio_format->nSamplesPerSec; + if (audio_format->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + { + const WAVEFORMATEXTENSIBLE *ext_format = (const WAVEFORMATEXTENSIBLE *)mt->pbFormat; + + format->u.audio.channel_mask = ext_format->dwChannelMask; + } + else + { + if (audio_format->nChannels == 1) + format->u.audio.channel_mask = KSAUDIO_SPEAKER_MONO; + else if (audio_format->nChannels == 2) + format->u.audio.channel_mask = KSAUDIO_SPEAKER_STEREO; + else + { + ERR("Unexpected channel count %u.\n", audio_format->nChannels); + return false; + } + } + for (i = 0; i < ARRAY_SIZE(format_map); ++i) { if (IsEqualGUID(&mt->subtype, format_map[i].subtype) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 272029217a9..2540ecd80df 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -109,11 +109,70 @@ static enum wg_audio_format wg_audio_format_from_gst(GstAudioFormat format) } } +static uint32_t wg_channel_position_from_gst(GstAudioChannelPosition position) +{ + static const uint32_t position_map[] = + { + SPEAKER_FRONT_LEFT, + SPEAKER_FRONT_RIGHT, + SPEAKER_FRONT_CENTER, + SPEAKER_LOW_FREQUENCY, + SPEAKER_BACK_LEFT, + SPEAKER_BACK_RIGHT, + SPEAKER_FRONT_LEFT_OF_CENTER, + SPEAKER_FRONT_RIGHT_OF_CENTER, + SPEAKER_BACK_CENTER, + 0, + SPEAKER_SIDE_LEFT, + SPEAKER_SIDE_RIGHT, + SPEAKER_TOP_FRONT_LEFT, + SPEAKER_TOP_FRONT_RIGHT, + SPEAKER_TOP_FRONT_CENTER, + SPEAKER_TOP_CENTER, + SPEAKER_TOP_BACK_LEFT, + SPEAKER_TOP_BACK_RIGHT, + 0, + 0, + SPEAKER_TOP_BACK_CENTER, + }; + + if (position < ARRAY_SIZE(position_map)) + return position_map[position]; + return 0; +} + +static uint32_t wg_channel_mask_from_gst(const GstAudioInfo *info) +{ + uint32_t mask = 0, position; + unsigned int i; + + for (i = 0; i < GST_AUDIO_INFO_CHANNELS(info); ++i) + { + if (!(position = wg_channel_position_from_gst(GST_AUDIO_INFO_POSITION(info, i)))) + { + GST_WARNING("Unsupported channel %#x.", GST_AUDIO_INFO_POSITION(info, i)); + return 0; + } + /* Make sure it's also in WinMM order. WinMM mandates that channels be + * ordered, as it were, from least to most significant SPEAKER_* bit. + * Hence we fail if the current channel was already specified, or if any + * higher bit was already specified. */ + if (mask & ~(position - 1)) + { + GST_WARNING("Unsupported channel order."); + return 0; + } + mask |= position; + } + return mask; +} + static void wg_format_from_audio_info(struct wg_format *format, const GstAudioInfo *info) { format->major_type = WG_MAJOR_TYPE_AUDIO; format->u.audio.format = wg_audio_format_from_gst(GST_AUDIO_INFO_FORMAT(info)); format->u.audio.channels = GST_AUDIO_INFO_CHANNELS(info); + format->u.audio.channel_mask = wg_channel_mask_from_gst(info); format->u.audio.rate = GST_AUDIO_INFO_RATE(info); } @@ -273,15 +332,63 @@ static GstAudioFormat wg_audio_format_to_gst(enum wg_audio_format format) } } +static void wg_channel_mask_to_gst(GstAudioChannelPosition *positions, uint32_t mask, uint32_t channel_count) +{ + const uint32_t orig_mask = mask; + unsigned int i; + DWORD bit; + + static const GstAudioChannelPosition position_map[] = + { + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, + GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, + GST_AUDIO_CHANNEL_POSITION_LFE1, + GST_AUDIO_CHANNEL_POSITION_REAR_LEFT, + GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT, + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER, + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER, + GST_AUDIO_CHANNEL_POSITION_REAR_CENTER, + GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, + GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, + GST_AUDIO_CHANNEL_POSITION_TOP_CENTER, + GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_LEFT, + GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_CENTER, + GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_RIGHT, + GST_AUDIO_CHANNEL_POSITION_TOP_REAR_LEFT, + GST_AUDIO_CHANNEL_POSITION_TOP_REAR_CENTER, + GST_AUDIO_CHANNEL_POSITION_TOP_REAR_RIGHT, + }; + + for (i = 0; i < channel_count; ++i) + { + positions[i] = GST_AUDIO_CHANNEL_POSITION_NONE; + if (BitScanForward(&bit, mask)) + { + if (bit < ARRAY_SIZE(position_map)) + positions[i] = position_map[bit]; + else + GST_WARNING("Invalid channel mask %#x.\n", orig_mask); + mask &= ~(1 << bit); + } + else + { + GST_WARNING("Incomplete channel mask %#x.\n", orig_mask); + } + } +} + static GstCaps *wg_format_to_caps_audio(const struct wg_format *format) { + GstAudioChannelPosition positions[32]; GstAudioFormat audio_format; GstAudioInfo info; if ((audio_format = wg_audio_format_to_gst(format->u.audio.format)) == GST_AUDIO_FORMAT_UNKNOWN) return NULL; - gst_audio_info_set_format(&info, audio_format, format->u.audio.rate, format->u.audio.channels, NULL); + wg_channel_mask_to_gst(positions, format->u.audio.channel_mask, format->u.audio.channels); + gst_audio_info_set_format(&info, audio_format, format->u.audio.rate, format->u.audio.channels, positions); return gst_audio_info_to_caps(&info); }

1 0

Zebediah Figura : winegstreamer: Manage our own thread for read requests in the media source.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: b44d3a3908b949332487635b65ab24a98370484a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b44d3a3908b949332487635b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 18 17:01:24 2021 -0600 winegstreamer: Manage our own thread for read requests in the media source. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 139 +++++++++++++++++++++++++++++++++----- 1 file changed, 121 insertions(+), 18 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index ffbf8041ed8..6fb2c7f6f48 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -113,6 +113,21 @@ struct media_source HANDLE no_more_pads_event; uint64_t file_size, next_pull_offset; + + HANDLE read_thread; + bool read_thread_shutdown; + + pthread_mutex_t mutex; + pthread_cond_t read_cond, read_done_cond; + struct + { + void *data; + uint64_t offset; + uint32_t size; + bool done; + bool ret; + } read_request; + bool shutdown; }; static inline struct media_stream *impl_from_IMFMediaStream(IMFMediaStream *iface) @@ -442,42 +457,109 @@ GstFlowReturn bytestream_wrapper_pull(GstPad *pad, GstObject *parent, guint64 of GstBuffer **buf) { struct media_source *source = gst_pad_get_element_private(pad); - IMFByteStream *byte_stream = source->byte_stream; GstBuffer *new_buffer = NULL; - ULONG bytes_read; GstMapInfo info; - BOOL is_eof; - HRESULT hr; + bool ret; TRACE("requesting %u bytes at %s from source %p into buffer %p\n", len, wine_dbgstr_longlong(ofs), source, *buf); if (ofs == GST_BUFFER_OFFSET_NONE) ofs = source->next_pull_offset; source->next_pull_offset = ofs + len; - - if (FAILED(IMFByteStream_SetCurrentPosition(byte_stream, ofs))) - return GST_FLOW_ERROR; - - if (FAILED(IMFByteStream_IsEndOfStream(byte_stream, &is_eof))) - return GST_FLOW_ERROR; - if (is_eof) + if (ofs >= source->file_size) return GST_FLOW_EOS; + if (ofs + len >= source->file_size) + len = source->file_size - ofs; if (!(*buf)) *buf = new_buffer = gst_buffer_new_and_alloc(len); gst_buffer_map(*buf, &info, GST_MAP_WRITE); - hr = IMFByteStream_Read(byte_stream, info.data, len, &bytes_read); + + pthread_mutex_lock(&source->mutex); + + assert(!source->read_request.data); + source->read_request.data = info.data; + source->read_request.offset = ofs; + source->read_request.size = len; + source->read_request.done = false; + pthread_cond_signal(&source->read_cond); + + /* Note that we don't unblock this wait on GST_EVENT_FLUSH_START. We expect + * the upstream pin to flush if necessary. We should never be blocked on + * read_thread() not running. */ + + while (!source->read_request.done) + pthread_cond_wait(&source->read_done_cond, &source->mutex); + + ret = source->read_request.ret; + + pthread_mutex_unlock(&source->mutex); + gst_buffer_unmap(*buf, &info); - gst_buffer_set_size(*buf, bytes_read); + if (!ret && new_buffer) + gst_buffer_unref(new_buffer); + return ret ? GST_FLOW_OK : GST_FLOW_ERROR; +} + +static bool get_read_request(struct media_source *source, void **data, uint64_t *offset, uint32_t *size) +{ + pthread_mutex_lock(&source->mutex); + + while (!source->shutdown && !source->read_request.data) + pthread_cond_wait(&source->read_cond, &source->mutex); + + if (source->shutdown) + { + pthread_mutex_unlock(&source->mutex); + return false; + } + + *data = source->read_request.data; + *offset = source->read_request.offset; + *size = source->read_request.size; + + pthread_mutex_unlock(&source->mutex); + return true; +} + +static void complete_read_request(struct media_source *source, bool ret) +{ + pthread_mutex_lock(&source->mutex); + source->read_request.done = true; + source->read_request.ret = ret; + source->read_request.data = NULL; + pthread_mutex_unlock(&source->mutex); + pthread_cond_signal(&source->read_done_cond); +} - if (FAILED(hr)) +static DWORD CALLBACK read_thread(void *arg) +{ + struct media_source *source = arg; + IMFByteStream *byte_stream = source->byte_stream; + + TRACE("Starting read thread for media source %p.\n", source); + + while (!source->read_thread_shutdown) { - if (new_buffer) - gst_buffer_unref(new_buffer); - return GST_FLOW_ERROR; + uint64_t offset; + ULONG ret_size; + uint32_t size; + HRESULT hr; + void *data; + + if (!get_read_request(source, &data, &offset, &size)) + continue; + + if (SUCCEEDED(hr = IMFByteStream_SetCurrentPosition(byte_stream, offset))) + hr = IMFByteStream_Read(byte_stream, data, size, &ret_size); + if (SUCCEEDED(hr) && ret_size != size) + ERR("Unexpected short read: requested %u bytes, got %u.\n", size, ret_size); + complete_read_request(source, SUCCEEDED(hr)); } - return GST_FLOW_OK; + + TRACE("Media source is shutting down; exiting.\n"); + return 0; } static gboolean bytestream_query(GstPad *pad, GstObject *parent, GstQuery *query) @@ -1164,6 +1246,21 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) IMFMediaStream_Release(&stream->IMFMediaStream_iface); } + if (source->read_thread) + { + source->read_thread_shutdown = true; + pthread_mutex_lock(&source->mutex); + source->shutdown = true; + pthread_mutex_unlock(&source->mutex); + pthread_cond_signal(&source->read_cond); + WaitForSingleObject(source->read_thread, INFINITE); + CloseHandle(source->read_thread); + } + + pthread_mutex_destroy(&source->mutex); + pthread_cond_destroy(&source->read_cond); + pthread_cond_destroy(&source->read_done_cond); + if (source->stream_count) heap_free(source->streams); @@ -1284,6 +1381,12 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (FAILED(hr = MFAllocateWorkQueue(&object->async_commands_queue))) goto fail; + pthread_mutex_init(&object->mutex, NULL); + pthread_cond_init(&object->read_cond, NULL); + pthread_cond_init(&object->read_done_cond, NULL); + + object->read_thread = CreateThread(NULL, 0, read_thread, object, 0, NULL); + object->container = gst_bin_new(NULL); object->bus = gst_bus_new(); gst_bus_set_sync_handler(object->bus, mf_src_bus_watch_wrapper, object, NULL);

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2021