mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 14:08:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

glmixer: remove reset vfunc

Browse source 
This functionality is covered by GstGLBaseMixer's gl_stop() vfunc.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4608>
This commit is contained in:
Matthew Waters 2023-05-08 17:50:23 +10:00 committed by GStreamer Marge Bot
parent 14e7e991d3
commit 331b1af468
3 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
subprojects/gst-plugins-base/ext/gl/gstglmosaic.c
View file

@ -73,7 +73,7 @@ static GstPad *gst_gl_mosaic_request_new_pad (GstElement * element,
GstPadTemplate * temp, const gchar * req_name, const GstCaps * caps); GstPadTemplate * temp, const gchar * req_name, const GstCaps * caps);
static void gst_gl_mosaic_release_pad (GstElement * element, GstPad * pad); static void gst_gl_mosaic_release_pad (GstElement * element, GstPad * pad);
static void gst_gl_mosaic_reset (GstGLMixer * mixer); static void gst_gl_mosaic_gl_stop (GstGLBaseMixer * base_mix);
static gboolean gst_gl_mosaic_set_caps (GstGLMixer * mixer, GstCaps * outcaps); static gboolean gst_gl_mosaic_set_caps (GstGLMixer * mixer, GstCaps * outcaps);
static gboolean gst_gl_mosaic_process_textures (GstGLMixer * mixer, static gboolean gst_gl_mosaic_process_textures (GstGLMixer * mixer,
@ -137,7 +137,7 @@ gst_gl_mosaic_class_init (GstGLMosaicClass * klass)
"Julien Isorce <julien.isorce@gmail.com>"); "Julien Isorce <julien.isorce@gmail.com>");
GST_GL_MIXER_CLASS (klass)->set_caps = gst_gl_mosaic_set_caps; GST_GL_MIXER_CLASS (klass)->set_caps = gst_gl_mosaic_set_caps;
GST_GL_MIXER_CLASS (klass)->reset = gst_gl_mosaic_reset; GST_GL_BASE_MIXER_CLASS (klass)->gl_stop = gst_gl_mosaic_gl_stop;
GST_GL_MIXER_CLASS (klass)->process_textures = gst_gl_mosaic_process_textures; GST_GL_MIXER_CLASS (klass)->process_textures = gst_gl_mosaic_process_textures;
} }
@ -189,19 +189,19 @@ gst_gl_mosaic_release_pad (GstElement * element, GstPad * pad)
} }
static void static void
gst_gl_mosaic_reset (GstGLMixer * mixer) gst_gl_mosaic_gl_stop (GstGLBaseMixer * mixer)
{ {
GstGLMosaic *mosaic = GST_GL_MOSAIC (mixer); GstGLMosaic *mosaic = GST_GL_MOSAIC (mixer);
if (mosaic->shader) gst_clear_object (&mosaic->shader);
gst_object_unref (mosaic->shader);
mosaic->shader = NULL;
mosaic->attr_position_loc = -1; mosaic->attr_position_loc = -1;
mosaic->attr_texture_loc = -1; mosaic->attr_texture_loc = -1;
mosaic->xrot = 0.0; mosaic->xrot = 0.0;
mosaic->yrot = 0.0; mosaic->yrot = 0.0;
mosaic->zrot = 0.0; mosaic->zrot = 0.0;
GST_GL_BASE_MIXER_CLASS (gst_gl_mosaic_parent_class)->gl_stop (mixer);
} }
static gboolean static gboolean

4
subprojects/gst-plugins-base/gst-libs/gst/gl/gstglmixer.c
View file

@ -568,10 +568,6 @@ static void
gst_gl_mixer_gl_stop (GstGLBaseMixer * base_mix) gst_gl_mixer_gl_stop (GstGLBaseMixer * base_mix)
{ {
GstGLMixer *mix = GST_GL_MIXER (base_mix); GstGLMixer *mix = GST_GL_MIXER (base_mix);
GstGLMixerClass *mixer_class = GST_GL_MIXER_GET_CLASS (mix);
if (mixer_class->reset)
mixer_class->reset (mix);
g_mutex_lock (&mix->priv->gl_resource_lock); g_mutex_lock (&mix->priv->gl_resource_lock);
gst_clear_object (&mix->priv->fbo); gst_clear_object (&mix->priv->fbo);

2
subprojects/gst-plugins-base/gst-libs/gst/gl/gstglmixer.h
View file

@ -78,7 +78,6 @@ GType gst_gl_mixer_pad_get_type (void);
typedef gboolean (*GstGLMixerSetCaps) (GstGLMixer* mixer, typedef gboolean (*GstGLMixerSetCaps) (GstGLMixer* mixer,
GstCaps* outcaps); GstCaps* outcaps);
typedef void (*GstGLMixerReset) (GstGLMixer *mixer);
typedef gboolean (*GstGLMixerProcessFunc) (GstGLMixer *mix, GstBuffer *outbuf); typedef gboolean (*GstGLMixerProcessFunc) (GstGLMixer *mix, GstBuffer *outbuf);
typedef gboolean (*GstGLMixerProcessTextures) (GstGLMixer *mix, GstGLMemory *out_tex); typedef gboolean (*GstGLMixerProcessTextures) (GstGLMixer *mix, GstGLMemory *out_tex);
@ -96,7 +95,6 @@ struct _GstGLMixerClass
GstGLBaseMixerClass parent_class; GstGLBaseMixerClass parent_class;
GstGLMixerSetCaps set_caps; GstGLMixerSetCaps set_caps;
GstGLMixerReset reset;
GstGLMixerProcessFunc process_buffers; GstGLMixerProcessFunc process_buffers;
GstGLMixerProcessTextures process_textures; GstGLMixerProcessTextures process_textures;
}; };