mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 23:48:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

eglglessink: Fix xOverlay logic

Browse source 
Several fixes dealing with correct window
creation and set_handle() ops. Tested on
X11/mesa with internal window creation.
This commit is contained in:
Reynaldo H. Verdejo Pinochet 2012-09-13 23:23:08 -03:00 committed by Sebastian Dröge
parent 9e18b29be2
commit 289f388085
1 changed files with 31 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
ext/eglgles/gsteglglessink.c
View file

@ -846,6 +846,9 @@ gst_eglglessink_start (GstBaseSink * sink)
goto HANDLE_ERROR; goto HANDLE_ERROR;
} }
/* Ask for a window to render to */
gst_x_overlay_prepare_xwindow_id (GST_X_OVERLAY (eglglessink));
g_mutex_unlock (eglglessink->flow_lock); g_mutex_unlock (eglglessink->flow_lock);
return TRUE; return TRUE;
@ -1325,28 +1328,20 @@ gst_eglglessink_set_window_handle (GstXOverlay * overlay, guintptr id)
g_return_if_fail (GST_IS_EGLGLESSINK (eglglessink)); g_return_if_fail (GST_IS_EGLGLESSINK (eglglessink));
GST_DEBUG_OBJECT (eglglessink, "We got a window handle!"); GST_DEBUG_OBJECT (eglglessink, "We got a window handle!");
if (!id) { if (eglglessink->have_window) {
/* We are being requested to create our own window.
* 0x0 fires default size creation.
*/
GST_WARNING_OBJECT (eglglessink, "OH NOES they want a new window");
g_mutex_lock (eglglessink->flow_lock);
eglglessink->window = gst_eglglessink_create_window (eglglessink, 0, 0);
if (!eglglessink->window) {
GST_ERROR_OBJECT (eglglessink, "Got a NULL window");
goto HANDLE_ERROR_LOCKED;
}
} else if (eglglessink->window == id) { /* Already used window */
GST_WARNING_OBJECT (eglglessink, GST_WARNING_OBJECT (eglglessink,
"We've got the same %x window handle again", id); "We already have a window. Ignoring request");
GST_INFO_OBJECT (eglglessink, "Skipping surface setup"); return;
}
if (!id) {
GST_ERROR_OBJECT (eglglessink, "Window handle is invalid");
goto HANDLE_ERROR; goto HANDLE_ERROR;
} else {
g_mutex_lock (eglglessink->flow_lock);
eglglessink->window = (EGLNativeWindowType) id;
} }
/* OK, we have a new window */ /* OK, we have a new window */
g_mutex_lock (eglglessink->flow_lock);
eglglessink->window = (EGLNativeWindowType) id;
eglglessink->have_window = TRUE; eglglessink->have_window = TRUE;
g_mutex_unlock (eglglessink->flow_lock); g_mutex_unlock (eglglessink->flow_lock);
@ -1361,8 +1356,6 @@ gst_eglglessink_set_window_handle (GstXOverlay * overlay, guintptr id)
return; return;
/* Errors */ /* Errors */
HANDLE_ERROR_LOCKED:
g_mutex_unlock (eglglessink->flow_lock);
HANDLE_ERROR: HANDLE_ERROR:
GST_ERROR_OBJECT (eglglessink, "Couldn't setup window/surface from handle"); GST_ERROR_OBJECT (eglglessink, "Couldn't setup window/surface from handle");
return; return;
@ -1509,6 +1502,7 @@ gst_eglglessink_setcaps (GstBaseSink * bsink, GstCaps * caps)
GstEglGlesSink *eglglessink; GstEglGlesSink *eglglessink;
gboolean ret = TRUE; gboolean ret = TRUE;
gint width, height; gint width, height;
EGLNativeWindowType window;
eglglessink = GST_EGLGLESSINK (bsink); eglglessink = GST_EGLGLESSINK (bsink);
@ -1548,30 +1542,30 @@ gst_eglglessink_setcaps (GstBaseSink * bsink, GstCaps * caps)
goto HANDLE_ERROR; goto HANDLE_ERROR;
} }
/* OK, got caps and had none. Ask application to give us a window */
if (!eglglessink->have_window) {
gst_x_overlay_prepare_xwindow_id (GST_X_OVERLAY (eglglessink));
}
g_mutex_lock (eglglessink->flow_lock); g_mutex_lock (eglglessink->flow_lock);
GST_VIDEO_SINK_WIDTH (eglglessink) = width; GST_VIDEO_SINK_WIDTH (eglglessink) = width;
GST_VIDEO_SINK_HEIGHT (eglglessink) = height; GST_VIDEO_SINK_HEIGHT (eglglessink) = height;
if (!eglglessink->have_window) {
/* Window creation for no x11/mesa hasn't been implemented yet */
GST_INFO_OBJECT (eglglessink,
"No window. Will attempt internal window creation");
if (!(eglglessink->window = gst_eglglessink_create_window (eglglessink,
width, height))) {
GST_ERROR_OBJECT (eglglessink, "Internal window creation failed!");
goto HANDLE_ERROR_LOCKED;
}
}
eglglessink->have_window = TRUE;
eglglessink->current_caps = gst_caps_ref (caps); eglglessink->current_caps = gst_caps_ref (caps);
g_mutex_unlock (eglglessink->flow_lock); g_mutex_unlock (eglglessink->flow_lock);
/* By now the application should have set a window
* already if it meant to do so
*/
if (!eglglessink->have_window) {
if (!eglglessink->can_create_window) {
GST_ERROR_OBJECT (eglglessink,
"Have no window and we have been told not to create one!");
goto HANDLE_ERROR;
}
GST_INFO_OBJECT (eglglessink,
"No window. Will attempt internal window creation");
if (!(window = gst_eglglessink_create_window (eglglessink, width, height))) {
GST_ERROR_OBJECT (eglglessink, "Internal window creation failed!");
goto HANDLE_ERROR;
}
gst_eglglessink_set_window_handle (GST_X_OVERLAY (eglglessink), window);
}
if (!gst_eglglessink_init_egl_surface (eglglessink)) { if (!gst_eglglessink_init_egl_surface (eglglessink)) {
GST_ERROR_OBJECT (eglglessink, "Couldn't init EGL surface from window"); GST_ERROR_OBJECT (eglglessink, "Couldn't init EGL surface from window");
goto HANDLE_ERROR; goto HANDLE_ERROR;