mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

gltransformation: Unref shader in ::stop()

Browse source
This commit is contained in:
Matthieu Bouron 2015-04-27 10:01:53 +02:00 committed by Sebastian Dröge
parent bd940327ef
commit c6ec145a95
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
ext/gl/gstgltransformation.c
View file

@ -52,6 +52,8 @@
#define GST_CAT_DEFAULT gst_gl_transformation_debug #define GST_CAT_DEFAULT gst_gl_transformation_debug
GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
#define gst_gl_transformation_parent_class parent_class
enum enum
{ {
PROP_0, PROP_0,
@ -83,7 +85,7 @@ static gboolean gst_gl_transformation_set_caps (GstGLFilter * filter,
GstCaps * incaps, GstCaps * outcaps); GstCaps * incaps, GstCaps * outcaps);
static void gst_gl_transformation_reset_gl (GstGLFilter * filter); static void gst_gl_transformation_reset_gl (GstGLFilter * filter);
static void gst_gl_transformation_reset (GstGLFilter * filter); static gboolean gst_gl_transformation_stop (GstBaseTransform * trans);
static gboolean gst_gl_transformation_init_shader (GstGLFilter * filter); static gboolean gst_gl_transformation_init_shader (GstGLFilter * filter);
static void gst_gl_transformation_callback (gpointer stuff); static void gst_gl_transformation_callback (gpointer stuff);
static void gst_gl_transformation_build_mvp (GstGLTransformation * static void gst_gl_transformation_build_mvp (GstGLTransformation *
@ -131,10 +133,10 @@ gst_gl_transformation_class_init (GstGLTransformationClass * klass)
GST_GL_FILTER_CLASS (klass)->init_fbo = gst_gl_transformation_init_shader; GST_GL_FILTER_CLASS (klass)->init_fbo = gst_gl_transformation_init_shader;
GST_GL_FILTER_CLASS (klass)->display_reset_cb = GST_GL_FILTER_CLASS (klass)->display_reset_cb =
gst_gl_transformation_reset_gl; gst_gl_transformation_reset_gl;
GST_GL_FILTER_CLASS (klass)->onReset = gst_gl_transformation_reset;
GST_GL_FILTER_CLASS (klass)->set_caps = gst_gl_transformation_set_caps; GST_GL_FILTER_CLASS (klass)->set_caps = gst_gl_transformation_set_caps;
GST_GL_FILTER_CLASS (klass)->filter_texture = GST_GL_FILTER_CLASS (klass)->filter_texture =
gst_gl_transformation_filter_texture; gst_gl_transformation_filter_texture;
GST_BASE_TRANSFORM_CLASS (klass)->stop = gst_gl_transformation_stop;
g_object_class_install_property (gobject_class, PROP_FOV, g_object_class_install_property (gobject_class, PROP_FOV,
g_param_spec_float ("fov", "Fov", "Field of view angle in degrees", g_param_spec_float ("fov", "Fov", "Field of view angle in degrees",
@ -405,20 +407,25 @@ gst_gl_transformation_reset_gl (GstGLFilter * filter)
transformation->vertex_buffer = 0; transformation->vertex_buffer = 0;
} }
gst_object_unref (transformation->shader); if (transformation->shader) {
transformation->shader = NULL; gst_object_unref (transformation->shader);
transformation->shader = NULL;
}
} }
static void static gboolean
gst_gl_transformation_reset (GstGLFilter * filter) gst_gl_transformation_stop (GstBaseTransform * trans)
{ {
GstGLTransformation *transformation = GST_GL_TRANSFORMATION (filter); GstGLBaseFilter *basefilter = GST_GL_BASE_FILTER (trans);
GstGLTransformation *transformation = GST_GL_TRANSFORMATION (trans);
/* blocking call, wait until the opengl thread has destroyed the shader */ /* blocking call, wait until the opengl thread has destroyed the shader */
if (transformation->shader) if (basefilter->context && transformation->shader) {
gst_gl_context_del_shader (GST_GL_BASE_FILTER (filter)->context, gst_gl_context_del_shader (basefilter->context, transformation->shader);
transformation->shader); transformation->shader = NULL;
transformation->shader = NULL; }
return GST_BASE_TRANSFORM_CLASS (parent_class)->stop (trans);
} }
static gboolean static gboolean