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

Pad: post STREAM_STATUS_TYPE_CREATE

Browse source 
Post a stream-status message indicating that a new task was created so that the
application has a chance to change the properties of the task.

Fix unit test to take into account the new ref of the message.
This commit is contained in:
Wim Taymans 2009-04-23 17:48:08 +02:00 committed by Wim Taymans
parent 88d158f6f3
commit 4b604f7da6
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gst/gstpad.c
View file

@ -4878,13 +4878,32 @@ gst_pad_start_task (GstPad * pad, GstTaskFunction func, gpointer data)
task = gst_task_create (func, data); task = gst_task_create (func, data);
gst_task_set_lock (task, GST_PAD_GET_STREAM_LOCK (pad)); gst_task_set_lock (task, GST_PAD_GET_STREAM_LOCK (pad));
gst_task_set_thread_callbacks (task, &thr_callbacks, pad, NULL); gst_task_set_thread_callbacks (task, &thr_callbacks, pad, NULL);
GST_PAD_TASK (pad) = task;
GST_DEBUG_OBJECT (pad, "created task"); GST_DEBUG_OBJECT (pad, "created task");
/* release lock to post the message */
GST_OBJECT_UNLOCK (pad);
do_stream_status (pad, GST_STREAM_STATUS_TYPE_CREATE, NULL, task);
GST_OBJECT_LOCK (pad);
/* nobody else is supposed to have changed the pad now */
if (GST_PAD_TASK (pad) != NULL)
goto concurrent_start;
GST_PAD_TASK (pad) = task;
} }
res = gst_task_set_state (task, GST_TASK_STARTED); res = gst_task_set_state (task, GST_TASK_STARTED);
GST_OBJECT_UNLOCK (pad); GST_OBJECT_UNLOCK (pad);
return res; return res;
/* ERRORS */
concurrent_start:
{
g_warning ("two threads started pad %s:%s at the same time",
GST_DEBUG_PAD_NAME (pad));
GST_OBJECT_UNLOCK (pad);
gst_object_unref (task);
return FALSE;
}
} }
/** /**

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

@ -301,8 +301,8 @@ GST_START_TEST (test_message_state_changed_children)
* base_src is blocked in the push and has an extra refcount. * base_src is blocked in the push and has an extra refcount.
* base_sink_chain has taken a refcount on the sink, and is blocked on * base_sink_chain has taken a refcount on the sink, and is blocked on
* preroll * preroll
* The stream-status message holds another ref to the element */ * The stream-status messages holds 2 more refs to the element */
ASSERT_OBJECT_REFCOUNT (src, "src", 3); ASSERT_OBJECT_REFCOUNT (src, "src", 4);
/* refcount can be 4 if the bin is still processing the async_done message of /* refcount can be 4 if the bin is still processing the async_done message of
* the sink. */ * the sink. */
ASSERT_OBJECT_REFCOUNT_BETWEEN (sink, "sink", 2, 3); ASSERT_OBJECT_REFCOUNT_BETWEEN (sink, "sink", 2, 3);