FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

eglglessink: Terminate display connection at caps renego

Browse Source
This commit is contained in:
Reynaldo H. Verdejo Pinochet 2012-10-03 23:41:52 -03:00 committed by Sebastian Dröge
parent 734ac85bb4
commit 2ab9de8e4f
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ext/eglgles/gsteglglessink.c
View File

@ -2276,7 +2276,7 @@ gst_eglglessink_setcaps (GstBaseSink * bsink, GstCaps * caps)
g_mutex_unlock (eglglessink->flow_lock); g_mutex_unlock (eglglessink->flow_lock);
if (eglglessink->current_caps) { if (eglglessink->current_caps) {
GST_ERROR_OBJECT (eglglessink, "Caps already set. Won't do it again"); GST_ERROR_OBJECT (eglglessink, "Caps were already set");
if (gst_caps_can_intersect (caps, eglglessink->current_caps)) { if (gst_caps_can_intersect (caps, eglglessink->current_caps)) {
GST_INFO_OBJECT (eglglessink, "Caps are compatible anyway"); GST_INFO_OBJECT (eglglessink, "Caps are compatible anyway");
goto SUCCEED; goto SUCCEED;
@ -2284,6 +2284,7 @@ gst_eglglessink_setcaps (GstBaseSink * bsink, GstCaps * caps)
GST_DEBUG_OBJECT (eglglessink, "Caps are not compatible, reconfiguring"); GST_DEBUG_OBJECT (eglglessink, "Caps are not compatible, reconfiguring");
/* Cleanup */
if (eglglessink->rendering_path == GST_EGLGLESSINK_RENDER_SLOW) { if (eglglessink->rendering_path == GST_EGLGLESSINK_RENDER_SLOW) {
glUseProgram (0); glUseProgram (0);
@ -2326,6 +2327,25 @@ gst_eglglessink_setcaps (GstBaseSink * bsink, GstCaps * caps)
eglglessink->eglglesctx->eglcontext = NULL; eglglessink->eglglesctx->eglcontext = NULL;
} }
/* Terminate display connection */
if (eglMakeCurrent (eglglessink->eglglesctx->display, EGL_NO_SURFACE,
EGL_NO_SURFACE, EGL_NO_CONTEXT) == EGL_FALSE) {
show_egl_error ("eglMakeCurrent");
goto HANDLE_ERROR;
}
if (eglTerminate (eglglessink->eglglesctx->display) == EGL_FALSE) {
show_egl_error ("eglTerminate");
goto HANDLE_ERROR;
}
eglglessink->eglglesctx->display = NULL;
if (!gst_eglglessink_init_egl_display (eglglessink)) {
GST_ERROR_OBJECT (eglglessink, "Could not reinit display connection");
goto HANDLE_ERROR;
}
g_mutex_lock (eglglessink->flow_lock); g_mutex_lock (eglglessink->flow_lock);
gst_caps_unref (eglglessink->current_caps); gst_caps_unref (eglglessink->current_caps);
eglglessink->current_caps = NULL; eglglessink->current_caps = NULL;