mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 23:36:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

glmixer: remove redundant/unused lock

Browse source 
Use the GstObject lock instead
This commit is contained in:
Matthew Waters 2014-06-26 11:15:56 +10:00 committed by Tim-Philipp Müller
parent 21ea062cc8
commit 251c8a98ed
2 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst-libs/gst/gl/gstglmixer.c
View file

@ -45,13 +45,6 @@ static gboolean gst_gl_mixer_do_bufferpool (GstGLMixer * mix,
#define GST_CAT_DEFAULT gst_gl_mixer_debug #define GST_CAT_DEFAULT gst_gl_mixer_debug
GST_DEBUG_CATEGORY (gst_gl_mixer_debug); GST_DEBUG_CATEGORY (gst_gl_mixer_debug);
#define GST_GL_MIXER_GET_LOCK(mix) \
(GST_GL_MIXER(mix)->lock)
#define GST_GL_MIXER_LOCK(mix) \
(g_mutex_lock(&GST_GL_MIXER_GET_LOCK (mix)))
#define GST_GL_MIXER_UNLOCK(mix) \
(g_mutex_unlock(&GST_GL_MIXER_GET_LOCK (mix)))
static void gst_gl_mixer_pad_get_property (GObject * object, guint prop_id, static void gst_gl_mixer_pad_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static void gst_gl_mixer_pad_set_property (GObject * object, guint prop_id, static void gst_gl_mixer_pad_set_property (GObject * object, guint prop_id,
@ -429,7 +422,6 @@ static void
gst_gl_mixer_init (GstGLMixer * mix) gst_gl_mixer_init (GstGLMixer * mix)
{ {
mix->priv = GST_GL_MIXER_GET_PRIVATE (mix); mix->priv = GST_GL_MIXER_GET_PRIVATE (mix);
g_mutex_init (&mix->lock);
mix->array_buffers = 0; mix->array_buffers = 0;
mix->display = NULL; mix->display = NULL;
mix->fbo = 0; mix->fbo = 0;
@ -442,14 +434,9 @@ gst_gl_mixer_init (GstGLMixer * mix)
static void static void
gst_gl_mixer_finalize (GObject * object) gst_gl_mixer_finalize (GObject * object)
{ {
GstGLMixer *mix = GST_GL_MIXER (object);
g_mutex_clear (&mix->lock);
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
static void static void
gst_gl_mixer_set_context (GstElement * element, GstContext * context) gst_gl_mixer_set_context (GstElement * element, GstContext * context)
{ {

3
gst-libs/gst/gl/gstglmixer.h
View file

@ -59,9 +59,6 @@ struct _GstGLMixer
GstGLMixerPrivate *priv; GstGLMixerPrivate *priv;
/* Lock to prevent the state to change while blending */
GMutex lock;
GPtrArray *array_buffers; GPtrArray *array_buffers;
GPtrArray *frames; GPtrArray *frames;