mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 20:51:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

glviewconvert: also remove GL buffers on a reset

Browse source 
Fixes a possible memory leak on renegotiation
This commit is contained in:
Matthew Waters 2020-02-04 13:59:37 +11:00
parent 9461d178ea
commit cbffe13d60
1 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gst-libs/gst/gl/gstglviewconvert.c
View file

@ -324,6 +324,27 @@ gst_gl_view_convert_new (void)
return convert; return convert;
} }
static void
_reset_gl (GstGLContext * context, GstGLViewConvert * viewconvert)
{
const GstGLFuncs *gl = context->gl_vtable;
if (viewconvert->priv->vao) {
gl->DeleteVertexArrays (1, &viewconvert->priv->vao);
viewconvert->priv->vao = 0;
}
if (viewconvert->priv->vertex_buffer) {
gl->DeleteBuffers (1, &viewconvert->priv->vertex_buffer);
viewconvert->priv->vertex_buffer = 0;
}
if (viewconvert->priv->vbo_indices) {
gl->DeleteBuffers (1, &viewconvert->priv->vbo_indices);
viewconvert->priv->vbo_indices = 0;
}
}
/** /**
* gst_gl_view_convert_set_context: * gst_gl_view_convert_set_context:
* @viewconvert: a #GstGLViewConvert * @viewconvert: a #GstGLViewConvert
@ -1336,13 +1357,14 @@ void
gst_gl_view_convert_reset (GstGLViewConvert * viewconvert) gst_gl_view_convert_reset (GstGLViewConvert * viewconvert)
{ {
g_return_if_fail (GST_IS_GL_VIEW_CONVERT (viewconvert)); g_return_if_fail (GST_IS_GL_VIEW_CONVERT (viewconvert));
if (viewconvert->shader)
gst_object_unref (viewconvert->shader);
viewconvert->shader = NULL;
if (viewconvert->fbo) gst_clear_object (&viewconvert->shader);
gst_object_unref (viewconvert->fbo); gst_clear_object (&viewconvert->fbo);
viewconvert->fbo = NULL;
if (viewconvert->context) {
gst_gl_context_thread_add (viewconvert->context,
(GstGLContextThreadFunc) _reset_gl, viewconvert);
}
viewconvert->initted = FALSE; viewconvert->initted = FALSE;
viewconvert->reconfigure = FALSE; viewconvert->reconfigure = FALSE;