mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 18:05:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

opengl: gbm: Adds missing unrefs for gl context and drm node release in finalizer

Browse source 
This adds a few missing gst_object_unref calls for the opengl context in
gstglwindow_gbm_egl.c, as well as the missing close call for the
drm node fd in gst_gl_display_gbm_finalize.
This commit is contained in:
Freyr666 2018-11-23 16:30:30 +03:00 committed by Nicolas Dufresne
parent de69fc148d
commit 5d7ceeae61
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst-libs/gst/gl/gbm/gstgldisplay_gbm.c
View file

@ -82,6 +82,9 @@ gst_gl_display_gbm_finalize (GObject * object)
gst_gl_display_gbm_shutdown_gbm (display_gbm);
gst_gl_display_gbm_shutdown_drm (display_gbm);
if (display_gbm->drm_fd >= 0)
close (display_gbm->drm_fd);
G_OBJECT_CLASS (gst_gl_display_gbm_parent_class)->finalize (object);
}

11
gst-libs/gst/gl/gbm/gstglwindow_gbm_egl.c
View file

@ -155,6 +155,7 @@ draw_cb (gpointer data)
/* No display connected */
if (!display->drm_mode_info) {
GST_ERROR ("No display connected");
gst_object_unref (context);
return;
};
@ -205,6 +206,7 @@ draw_cb (gpointer data)
if (ret != 0) {
GST_ERROR ("Could not set DRM CRTC: %s (%d)", g_strerror (errno), errno);
gst_object_unref (context);
/* XXX: it is not possible to communicate the error to the pipeline */
return;
}
@ -305,6 +307,7 @@ gst_gl_window_gbm_init_surface (GstGLWindowGBMEGL * window_egl)
GstGLContextEGL *context_egl = GST_GL_CONTEXT_EGL (context);
EGLint gbm_format;
int hdisplay, vdisplay;
gboolean ret = TRUE;
if (drm_mode_info) {
vdisplay = drm_mode_info->vdisplay;
@ -320,7 +323,8 @@ gst_gl_window_gbm_init_surface (GstGLWindowGBMEGL * window_egl)
EGL_NATIVE_VISUAL_ID, &gbm_format)) {
GST_ERROR ("eglGetConfigAttrib failed: %s",
gst_egl_get_error_string (eglGetError ()));
return FALSE;
ret = FALSE;
goto cleanup;
}
/* Create a GBM surface that shall contain the BOs we are
@ -333,7 +337,10 @@ gst_gl_window_gbm_init_surface (GstGLWindowGBMEGL * window_egl)
GST_DEBUG ("Successfully created GBM surface");
return TRUE;
cleanup:
gst_object_unref (context);
return ret;
}