diff --git a/ext/gl/gstglbumper.c b/ext/gl/gstglbumper.c index a60944de74..188663b468 100644 --- a/ext/gl/gstglbumper.c +++ b/ext/gl/gstglbumper.c @@ -283,7 +283,7 @@ gst_gl_bumper_class_init (GstGLBumperClass * klass) GST_GL_FILTER_CLASS (klass)->filter_texture = gst_gl_bumper_filter_texture; GST_GL_FILTER_CLASS (klass)->display_init_cb = gst_gl_bumper_init_resources; GST_GL_FILTER_CLASS (klass)->display_reset_cb = gst_gl_bumper_reset_resources; - GST_GL_FILTER_CLASS (klass)->onInitFBO = gst_gl_bumper_init_shader; + GST_GL_FILTER_CLASS (klass)->init_fbo = gst_gl_bumper_init_shader; GST_GL_FILTER_CLASS (klass)->onReset = gst_gl_bumper_reset; g_object_class_install_property (gobject_class, diff --git a/ext/gl/gstglcolorscale.c b/ext/gl/gstglcolorscale.c index ce85e8a140..a79e524c3a 100644 --- a/ext/gl/gstglcolorscale.c +++ b/ext/gl/gstglcolorscale.c @@ -97,7 +97,7 @@ gst_gl_colorscale_class_init (GstGLColorscaleClass * klass) "Filter/Effect/Video", "Colorspace converter and video scaler", "Julien Isorce "); - filter_class->onInitFBO = + filter_class->init_fbo = GST_DEBUG_FUNCPTR (gst_gl_colorscale_gen_gl_resources); filter_class->filter_texture = gst_gl_colorscale_filter_texture; diff --git a/ext/gl/gstgldeinterlace.c b/ext/gl/gstgldeinterlace.c index 74f27efdc3..ce66666fee 100644 --- a/ext/gl/gstgldeinterlace.c +++ b/ext/gl/gstgldeinterlace.c @@ -168,7 +168,7 @@ gst_gl_deinterlace_class_init (GstGLDeinterlaceClass * klass) GST_GL_FILTER_CLASS (klass)->filter = gst_gl_deinterlace_filter; GST_GL_FILTER_CLASS (klass)->filter_texture = gst_gl_deinterlace_filter_texture; - GST_GL_FILTER_CLASS (klass)->onInitFBO = gst_gl_deinterlace_init_shader; + GST_GL_FILTER_CLASS (klass)->init_fbo = gst_gl_deinterlace_init_shader; GST_GL_BASE_FILTER_CLASS (klass)->supported_gl_api = GST_GL_API_OPENGL; } diff --git a/ext/gl/gstgleffects.c b/ext/gl/gstgleffects.c index 532e65f829..02878d229d 100644 --- a/ext/gl/gstgleffects.c +++ b/ext/gl/gstgleffects.c @@ -327,7 +327,7 @@ gst_gl_effects_class_init (GstGLEffectsClass * klass) gst_gl_effects_init_gl_resources; GST_GL_FILTER_CLASS (klass)->display_reset_cb = gst_gl_effects_reset_gl_resources; - GST_GL_FILTER_CLASS (klass)->onInitFBO = gst_gl_effects_on_init_gl_context; + GST_GL_FILTER_CLASS (klass)->init_fbo = gst_gl_effects_on_init_gl_context; klass->filter_descriptor = NULL; diff --git a/ext/gl/gstglfiltercube.c b/ext/gl/gstglfiltercube.c index beb5e50e40..a17b5dfb8a 100644 --- a/ext/gl/gstglfiltercube.c +++ b/ext/gl/gstglfiltercube.c @@ -141,7 +141,7 @@ gst_gl_filter_cube_class_init (GstGLFilterCubeClass * klass) GST_BASE_TRANSFORM_CLASS (klass)->stop = gst_gl_filter_cube_stop; - GST_GL_FILTER_CLASS (klass)->onInitFBO = gst_gl_filter_cube_init_shader; + GST_GL_FILTER_CLASS (klass)->init_fbo = gst_gl_filter_cube_init_shader; GST_GL_FILTER_CLASS (klass)->display_reset_cb = gst_gl_filter_cube_reset_gl; GST_GL_FILTER_CLASS (klass)->set_caps = gst_gl_filter_cube_set_caps; GST_GL_FILTER_CLASS (klass)->filter_texture = diff --git a/ext/gl/gstglfilterglass.c b/ext/gl/gstglfilterglass.c index 4470d28d5f..0709954c95 100644 --- a/ext/gl/gstglfilterglass.c +++ b/ext/gl/gstglfilterglass.c @@ -161,7 +161,7 @@ gst_gl_filter_glass_class_init (GstGLFilterGlassClass * klass) GST_GL_FILTER_CLASS (klass)->filter_texture = gst_gl_filter_glass_filter_texture; - GST_GL_FILTER_CLASS (klass)->onInitFBO = gst_gl_filter_glass_init_shader; + GST_GL_FILTER_CLASS (klass)->init_fbo = gst_gl_filter_glass_init_shader; GST_BASE_TRANSFORM_CLASS (klass)->stop = gst_gl_filter_glass_reset; GST_GL_BASE_FILTER_CLASS (klass)->supported_gl_api = GST_GL_API_OPENGL; diff --git a/ext/gl/gstglfiltershader.c b/ext/gl/gstglfiltershader.c index 037e7fab25..0b96ebbd63 100644 --- a/ext/gl/gstglfiltershader.c +++ b/ext/gl/gstglfiltershader.c @@ -149,7 +149,7 @@ gst_gl_filtershader_class_init (GstGLFilterShaderClass * klass) gst_gl_filtershader_init_resources; GST_GL_FILTER_CLASS (klass)->display_reset_cb = gst_gl_filtershader_reset_resources; - GST_GL_FILTER_CLASS (klass)->onInitFBO = gst_gl_filtershader_init_shader; + GST_GL_FILTER_CLASS (klass)->init_fbo = gst_gl_filtershader_init_shader; GST_GL_BASE_FILTER_CLASS (klass)->supported_gl_api = GST_GL_API_OPENGL | GST_GL_API_GLES2 | GST_GL_API_OPENGL3; diff --git a/ext/gl/gstgloverlay.c b/ext/gl/gstgloverlay.c index e119bd304d..916389bbb7 100644 --- a/ext/gl/gstgloverlay.c +++ b/ext/gl/gstgloverlay.c @@ -185,7 +185,7 @@ gst_gl_overlay_class_init (GstGLOverlayClass * klass) GST_GL_FILTER_CLASS (klass)->filter_texture = gst_gl_overlay_filter_texture; GST_GL_FILTER_CLASS (klass)->display_reset_cb = gst_gl_overlay_reset_gl_resources; - GST_GL_FILTER_CLASS (klass)->onInitFBO = gst_gl_overlay_init_gl_resources; + GST_GL_FILTER_CLASS (klass)->init_fbo = gst_gl_overlay_init_gl_resources; GST_BASE_TRANSFORM_CLASS (klass)->before_transform = GST_DEBUG_FUNCPTR (gst_gl_overlay_before_transform); diff --git a/ext/gl/gstgltransformation.c b/ext/gl/gstgltransformation.c index f112d9e13f..cb10cad04d 100644 --- a/ext/gl/gstgltransformation.c +++ b/ext/gl/gstgltransformation.c @@ -128,7 +128,7 @@ gst_gl_transformation_class_init (GstGLTransformationClass * klass) gobject_class->set_property = gst_gl_transformation_set_property; gobject_class->get_property = gst_gl_transformation_get_property; - GST_GL_FILTER_CLASS (klass)->onInitFBO = 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_transformation_reset_gl; GST_GL_FILTER_CLASS (klass)->onReset = gst_gl_transformation_reset; diff --git a/gst-libs/gst/gl/gstglfilter.c b/gst-libs/gst/gl/gstglfilter.c index b7791e907b..169ded9f9f 100644 --- a/gst-libs/gst/gl/gstglfilter.c +++ b/gst-libs/gst/gl/gstglfilter.c @@ -197,8 +197,8 @@ gst_gl_filter_gl_start (GstGLBaseFilter * base_filter) if (filter_class->display_init_cb) filter_class->display_init_cb (filter); - if (filter_class->onInitFBO) { - if (!filter_class->onInitFBO (filter)) + if (filter_class->init_fbo) { + if (!filter_class->init_fbo (filter)) goto error; } diff --git a/gst-libs/gst/gl/gstglfilter.h b/gst-libs/gst/gl/gstglfilter.h index 55a522da51..a5caf3211a 100644 --- a/gst-libs/gst/gl/gstglfilter.h +++ b/gst-libs/gst/gl/gstglfilter.h @@ -90,8 +90,7 @@ struct _GstGLFilter * Note: If @filter exists, then @filter_texture is not run * @filter_texture: given @in_tex, transform it into @out_tex. Not used * if @filter exists - * @onInitFBO: perform initialization when the Framebuffer object is created - * @onReset: called on inizialation and after @onStop + * @init_fbo: perform initialization when the Framebuffer object is created * @display_init_cb: execute arbitrary gl code on start * @display_reset_cb: execute arbitrary gl code at stop */ @@ -102,7 +101,7 @@ struct _GstGLFilterClass gboolean (*set_caps) (GstGLFilter* filter, GstCaps* incaps, GstCaps* outcaps); gboolean (*filter) (GstGLFilter *filter, GstBuffer *inbuf, GstBuffer *outbuf); gboolean (*filter_texture) (GstGLFilter *filter, guint in_tex, guint out_tex); - gboolean (*onInitFBO) (GstGLFilter *filter); + gboolean (*init_fbo) (GstGLFilter *filter); /* useful to init and cleanup custom gl resources */ void (*display_init_cb) (GstGLFilter *filter);