mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 08:41:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

check: Avoid deadlock

Browse source 
Queries will be sent when pipeline goes down to NULL, which would
result in the probe being called ... but can't take the lock.
This commit is contained in:
Edward Hervey 2012-07-17 15:52:53 +02:00
parent 75066960e3
commit 028b9a8dbb
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/check/gst/gstghostpad.c
View file

@ -521,8 +521,8 @@ GST_START_TEST (test_ghost_pads_block)
gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING); gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING);
/* and wait now */ /* and wait now */
g_cond_wait (block_data.cond, block_data.mutex); g_cond_wait (block_data.cond, block_data.mutex);
gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL);
g_mutex_unlock (block_data.mutex); g_mutex_unlock (block_data.mutex);
gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL);
g_mutex_free (block_data.mutex); g_mutex_free (block_data.mutex);
g_cond_free (block_data.cond); g_cond_free (block_data.cond);
@ -563,8 +563,8 @@ GST_START_TEST (test_ghost_pads_probes)
gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING); gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING);
/* and wait now */ /* and wait now */
g_cond_wait (block_data.cond, block_data.mutex); g_cond_wait (block_data.cond, block_data.mutex);
gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL);
g_mutex_unlock (block_data.mutex); g_mutex_unlock (block_data.mutex);
gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL);
g_mutex_free (block_data.mutex); g_mutex_free (block_data.mutex);
g_cond_free (block_data.cond); g_cond_free (block_data.cond);