mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-04 14:38:48 +00:00
[MOVED FROM GOOD] sys/: Wait until the window is created before using it; guard unistd.h includes with HAVE_UNISTD_H. (#366523)
Original commit message from CVS: Patch by: Sergey Scobich <sergey dot scobich at gmail com> * sys/directdraw/gstdirectdrawsink.c: (gst_directdrawsink_window_thread), (gst_directdrawsink_create_default_window): * sys/directdraw/gstdirectdrawsink.h: * sys/directsound/gstdirectsoundsink.c: Wait until the window is created before using it; guard unistd.h includes with HAVE_UNISTD_H. (#366523) * win32/vs8/libgstdirectdraw.vcproj: * win32/vs8/libgstdirectsound.vcproj: Update project files.
This commit is contained in:
parent
622a56c937
commit
c807b70709
2 changed files with 19 additions and 2 deletions
|
@ -28,7 +28,9 @@
|
||||||
|
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
#ifdef HAVE_UNISTD_H
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#endif
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
GST_DEBUG_CATEGORY_STATIC (directdrawsink_debug);
|
GST_DEBUG_CATEGORY_STATIC (directdrawsink_debug);
|
||||||
|
@ -1366,6 +1368,8 @@ gst_directdrawsink_window_thread (GstDirectDrawSink * ddrawsink)
|
||||||
if (ddrawsink->video_window == NULL)
|
if (ddrawsink->video_window == NULL)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
ReleaseSemaphore (ddrawsink->window_created_signal, 1, NULL);
|
||||||
|
|
||||||
/*start message loop processing our default window messages */
|
/*start message loop processing our default window messages */
|
||||||
while (1) {
|
while (1) {
|
||||||
MSG msg;
|
MSG msg;
|
||||||
|
@ -1381,15 +1385,27 @@ gst_directdrawsink_window_thread (GstDirectDrawSink * ddrawsink)
|
||||||
static gboolean
|
static gboolean
|
||||||
gst_directdrawsink_create_default_window (GstDirectDrawSink * ddrawsink)
|
gst_directdrawsink_create_default_window (GstDirectDrawSink * ddrawsink)
|
||||||
{
|
{
|
||||||
|
ddrawsink->window_created_signal = CreateSemaphore (NULL, 0, 1, NULL);
|
||||||
|
if (ddrawsink->window_created_signal == NULL)
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
ddrawsink->window_thread = g_thread_create (
|
ddrawsink->window_thread = g_thread_create (
|
||||||
(GThreadFunc) gst_directdrawsink_window_thread, ddrawsink, TRUE, NULL);
|
(GThreadFunc) gst_directdrawsink_window_thread, ddrawsink, TRUE, NULL);
|
||||||
|
|
||||||
if (ddrawsink->window_thread == NULL)
|
if (ddrawsink->window_thread == NULL)
|
||||||
return FALSE;
|
goto failed;
|
||||||
|
|
||||||
/*TODO:wait for the window to be created with timeout */
|
/* wait maximum 10 seconds for windows creating */
|
||||||
|
if (WaitForSingleObject (ddrawsink->window_created_signal,
|
||||||
|
10000) != WAIT_OBJECT_0)
|
||||||
|
goto failed;
|
||||||
|
|
||||||
|
CloseHandle (ddrawsink->window_created_signal);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
|
failed:
|
||||||
|
CloseHandle (ddrawsink->window_created_signal);
|
||||||
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
|
|
|
@ -104,6 +104,7 @@ struct _GstDirectDrawSink
|
||||||
|
|
||||||
/*handle of the video window */
|
/*handle of the video window */
|
||||||
HWND video_window;
|
HWND video_window;
|
||||||
|
HANDLE window_created_signal;
|
||||||
gboolean resize_window;
|
gboolean resize_window;
|
||||||
|
|
||||||
/*video properties */
|
/*video properties */
|
||||||
|
|
Loading…
Reference in a new issue