X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gst%2Fgstelement.c;h=64aa39a04fd1db11d99c795e5e1e8d83e2e29869;hb=e6bd5b41935f125bf43e030dcb909c3537d33b31;hp=a18363f0e2c75d5c61cd20748283ddee199de090;hpb=1a5a5709ad92c6488c7fd8e4d30be54f4f9627c0;p=platform%2Fupstream%2Fgstreamer.git diff --git a/gst/gstelement.c b/gst/gstelement.c index a18363f..64aa39a 100644 --- a/gst/gstelement.c +++ b/gst/gstelement.c @@ -444,7 +444,7 @@ gst_element_set_clock (GstElement * element, GstClock * clock) * Elements in a pipeline will only have their clock set when the * pipeline is in the PLAYING state. * - * Returns: (transfer full): the #GstClock of the element. unref after usage. + * Returns: (transfer full) (nullable): the #GstClock of the element. unref after usage. * * MT safe. */ @@ -640,9 +640,8 @@ gst_element_get_index (GstElement * element) * Adds a pad (link point) to @element. @pad's parent will be set to @element; * see gst_object_set_parent() for refcounting information. * - * Pads are not automatically activated so elements should perform the needed - * steps to activate the pad in case this pad is added in the PAUSED or PLAYING - * state. See gst_pad_set_active() for more information about activating pads. + * Pads are automatically activated when added in the PAUSED or PLAYING + * state. * * The pad and the element should be unlocked when calling this function. * @@ -685,9 +684,6 @@ gst_element_add_pad (GstElement * element, GstPad * pad) /* check for active pads */ if (!active && (GST_STATE (element) > GST_STATE_READY || GST_STATE_NEXT (element) == GST_STATE_PAUSED)) { - g_warning ("adding inactive pad '%s' to running element '%s', you need to " - "use gst_pad_set_active(pad,TRUE) before adding it.", - GST_STR_NULL (pad_name), GST_ELEMENT_NAME (element)); gst_pad_set_active (pad, TRUE); } @@ -1734,7 +1730,7 @@ gst_element_class_get_request_pad_template (GstElementClass * } /* get a random pad on element of the given direction. - * The pad is random in a sense that it is the first pad that is (optionaly) linked. + * The pad is random in a sense that it is the first pad that is (optionally) linked. */ static GstPad * gst_element_get_random_pad (GstElement * element, @@ -2245,6 +2241,10 @@ gst_element_is_locked_state (GstElement * element) * Locks the state of an element, so state changes of the parent don't affect * this element anymore. * + * Note that this is racy if the state lock of the parent bin is not taken. + * The parent bin might've just checked the flag in another thread and as the + * next step proceed to change the child element's state. + * * MT safe. * * Returns: %TRUE if the state was changed, %FALSE if bad parameters were given @@ -2448,7 +2448,7 @@ interrupted: if (pending) *pending = GST_STATE_VOID_PENDING; - GST_CAT_INFO_OBJECT (GST_CAT_STATES, element, "interruped"); + GST_CAT_INFO_OBJECT (GST_CAT_STATES, element, "interrupted"); GST_OBJECT_UNLOCK (element); @@ -2986,14 +2986,14 @@ gst_element_change_state (GstElement * element, GstStateChange transition) case GST_STATE_CHANGE_SUCCESS: GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, element, "element changed state SUCCESS"); - /* we can commit the state now which will proceeed to + /* we can commit the state now which will proceed to * the next state */ ret = gst_element_continue_state (element, ret); break; case GST_STATE_CHANGE_NO_PREROLL: GST_CAT_DEBUG_OBJECT (GST_CAT_STATES, element, "element changed state NO_PREROLL"); - /* we can commit the state now which will proceeed to + /* we can commit the state now which will proceed to * the next state */ ret = gst_element_continue_state (element, ret); break; @@ -3226,8 +3226,8 @@ was_ok: * * Retrieves the factory that was used to create this element. * - * Returns: (transfer none): the #GstElementFactory used for creating this - * element. no refcounting is needed. + * Returns: (transfer none) (nullable): the #GstElementFactory used for creating this + * element or %NULL if element has not been registered (static element). no refcounting is needed. */ GstElementFactory * gst_element_get_factory (GstElement * element) @@ -3381,7 +3381,8 @@ gst_element_set_bus (GstElement * element, GstBus * bus) * Returns the bus of the element. Note that only a #GstPipeline will provide a * bus for the application. * - * Returns: (transfer full): the element's #GstBus. unref after usage. + * Returns: (transfer full) (nullable): the element's #GstBus. unref after + * usage. * * MT safe. */ @@ -3505,7 +3506,7 @@ _match_context_type (GstContext * c1, const gchar * context_type) * * Gets the context with @context_type set on the element or NULL. * - * Returns: (transfer full): A #GstContext or NULL + * Returns: (transfer full) (nullable): A #GstContext or NULL * * Since: 1.8 */