Zebediah Figura : winegstreamer: Don't activate our source pad immediately after connecting.
Alexandre Julliard
julliard at winehq.org
Tue Sep 10 16:49:28 CDT 2019
Module: wine
Branch: master
Commit: 9e015a2ad17b98a2bedf076bd31c863e3e8a8d06
URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e015a2ad17b98a2bedf076bd31c863e3e8a8d06
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Mon Sep 9 20:36:14 2019 -0500
winegstreamer: Don't activate our source pad immediately after connecting.
There's not any reason to do this here; this should be handled with state
change transitions. Since the pipeline is in the ready state, the only
effect this will have is push_data() trying to run and failing since the
decodebin sink pad isn't active.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winegstreamer/gstdemux.c | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c
index 61e75b0923..727ffff8a6 100644
--- a/dlls/winegstreamer/gstdemux.c
+++ b/dlls/winegstreamer/gstdemux.c
@@ -66,7 +66,7 @@ typedef struct GSTImpl {
GstBus *bus;
guint64 start, nextofs, nextpullofs, stop;
ALLOCATOR_PROPERTIES props;
- HANDLE no_more_pads_event, push_event;
+ HANDLE no_more_pads_event;
HANDLE push_thread;
} GSTImpl;
@@ -507,10 +507,6 @@ static DWORD CALLBACK push_data(LPVOID iface)
else
maxlen = This->stop;
- TRACE("Waiting..\n");
-
- WaitForSingleObject(This->push_event, INFINITE);
-
TRACE("Starting..\n");
for (;;) {
REFERENCE_TIME tStart, tStop;
@@ -1155,10 +1151,6 @@ static HRESULT GST_Connect(GSTImpl *This, IPin *pConnectPin, ALLOCATOR_PROPERTIE
This->initial = FALSE;
- /* don't set active during test-play, as we don't want to push/pull data
- * from the source yet */
- gst_pad_set_active(This->my_src, 1);
-
This->nextofs = This->nextpullofs = 0;
return S_OK;
}
@@ -1185,7 +1177,6 @@ static void gstdemux_destroy(struct strmbase_filter *iface)
HRESULT hr;
CloseHandle(filter->no_more_pads_event);
- CloseHandle(filter->push_event);
/* Don't need to clean up output pins, disconnecting input pin will do that */
if (filter->sink.pConnectedTo)
@@ -1246,7 +1237,6 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr)
This->ppPins = NULL;
This->push_thread = NULL;
This->no_more_pads_event = CreateEventW(NULL, 0, 0, NULL);
- This->push_event = CreateEventW(NULL, 0, 0, NULL);
This->bus = NULL;
This->sink.dir = PINDIR_INPUT;
@@ -1864,7 +1854,6 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin,
filter->reader = NULL;
filter->alloc = NULL;
- ResetEvent(filter->push_event);
if (SUCCEEDED(hr))
hr = IPin_QueryInterface(pReceivePin, &IID_IAsyncReader, (LPVOID *)&filter->reader);
if (SUCCEEDED(hr))
@@ -1887,7 +1876,6 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin,
filter->sink.pConnectedTo = pReceivePin;
IPin_AddRef(pReceivePin);
hr = IMemAllocator_Commit(filter->alloc);
- SetEvent(filter->push_event);
} else {
GST_RemoveOutputPins(filter);
if (filter->reader)
More information about the wine-cvs
mailing list