mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 16:21:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

[880/906] glimagesink: remove unused stored_buffer field

Browse source 
It has the potential to cause deadlocks.
This commit is contained in:
Matthew Waters 2014-02-05 00:44:18 +11:00
parent 75825b3626
commit af3a68db7d
2 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst/gl/gstglimagesink.c
View file

@ -274,7 +274,6 @@ gst_glimage_sink_init (GstGLImageSink * glimage_sink)
glimage_sink->par_n = 0; glimage_sink->par_n = 0;
glimage_sink->par_d = 1; glimage_sink->par_d = 1;
glimage_sink->pool = NULL; glimage_sink->pool = NULL;
glimage_sink->stored_buffer = NULL;
glimage_sink->redisplay_texture = 0; glimage_sink->redisplay_texture = 0;
g_mutex_init (&glimage_sink->drawing_lock); g_mutex_init (&glimage_sink->drawing_lock);
@ -547,10 +546,6 @@ gst_glimage_sink_change_state (GstElement * element, GstStateChange transition)
*/ */
GST_GLIMAGE_SINK_LOCK (glimage_sink); GST_GLIMAGE_SINK_LOCK (glimage_sink);
glimage_sink->redisplay_texture = 0; glimage_sink->redisplay_texture = 0;
if (glimage_sink->stored_buffer) {
gst_buffer_unref (glimage_sink->stored_buffer);
glimage_sink->stored_buffer = NULL;
}
GST_GLIMAGE_SINK_UNLOCK (glimage_sink); GST_GLIMAGE_SINK_UNLOCK (glimage_sink);
if (glimage_sink->upload) { if (glimage_sink->upload) {
@ -758,7 +753,6 @@ gst_glimage_sink_render (GstBaseSink * bsink, GstBuffer * buf)
/* Avoid to release the texture while drawing */ /* Avoid to release the texture while drawing */
GST_GLIMAGE_SINK_LOCK (glimage_sink); GST_GLIMAGE_SINK_LOCK (glimage_sink);
glimage_sink->redisplay_texture = tex_id; glimage_sink->redisplay_texture = tex_id;
gst_buffer_replace (&glimage_sink->stored_buffer, buf);
GST_GLIMAGE_SINK_UNLOCK (glimage_sink); GST_GLIMAGE_SINK_UNLOCK (glimage_sink);
/* Ask the underlying window to redraw its content */ /* Ask the underlying window to redraw its content */

1
gst/gl/gstglimagesink.h
View file

@ -77,7 +77,6 @@ struct _GstGLImageSink
/* avoid replacing the stored_buffer while drawing */ /* avoid replacing the stored_buffer while drawing */
GMutex drawing_lock; GMutex drawing_lock;
GstBuffer *stored_buffer;
GLuint redisplay_texture; GLuint redisplay_texture;
#if GST_GL_HAVE_GLES2 #if GST_GL_HAVE_GLES2