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

playsink: Fix deadlock caused from an additional lock instead of unlock

Browse source 
Also improve debug output for the playsink lock.
This commit is contained in:
Sebastian Dröge 2010-05-14 17:13:17 +02:00
parent a6a125e4ba
commit e5304c3040
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/playback/gstplaysink.c
View file

@ -112,8 +112,15 @@ typedef struct
} GstPlayTextChain; } GstPlayTextChain;
#define GST_PLAY_SINK_GET_LOCK(playsink) (&((GstPlaySink *)playsink)->lock) #define GST_PLAY_SINK_GET_LOCK(playsink) (&((GstPlaySink *)playsink)->lock)
#define GST_PLAY_SINK_LOCK(playsink) g_static_rec_mutex_lock (GST_PLAY_SINK_GET_LOCK (playsink)) #define GST_PLAY_SINK_LOCK(playsink) G_STMT_START { \
#define GST_PLAY_SINK_UNLOCK(playsink) g_static_rec_mutex_unlock (GST_PLAY_SINK_GET_LOCK (playsink)) GST_LOG_OBJECT (playsink, "locking from thread %p", g_thread_self ()); \
g_static_rec_mutex_lock (GST_PLAY_SINK_GET_LOCK (playsink)); \
GST_LOG_OBJECT (playsink, "locked from thread %p", g_thread_self ()); \
} G_STMT_END
#define GST_PLAY_SINK_UNLOCK(playsink) G_STMT_START { \
GST_LOG_OBJECT (playsink, "unlocking from thread %p", g_thread_self ()); \
g_static_rec_mutex_unlock (GST_PLAY_SINK_GET_LOCK (playsink)); \
} G_STMT_END
struct _GstPlaySink struct _GstPlaySink
{ {
@ -1995,7 +2002,7 @@ gst_play_sink_reconfigure (GstPlaySink * playsink)
GST_ELEMENT_ERROR (playsink, STREAM, FORMAT, GST_ELEMENT_ERROR (playsink, STREAM, FORMAT,
(_("Can't play a text file without video or visualizations.")), (_("Can't play a text file without video or visualizations.")),
("Have text pad but no video pad or visualizations")); ("Have text pad but no video pad or visualizations"));
GST_PLAY_SINK_LOCK (playsink); GST_PLAY_SINK_UNLOCK (playsink);
return FALSE; return FALSE;
} }
} }