mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-23 08:46:40 +00:00
gst/gstminiobject.c (gst_value_mini_object_collect): Use gst_value_set_mini_object so as to add a ref on the object (...
Original commit message from CVS: 2005-05-26 Andy Wingo <wingo@pobox.com> * gst/gstminiobject.c (gst_value_mini_object_collect): Use gst_value_set_mini_object so as to add a ref on the object (which will be removed when the value is unset). * gst/elements/gstfakesink.c (gst_fakesink_class_init): Fix signal arg type in ::handoff. * gst/gstelement.c (gst_element_change_state): Also deactivate pads in READY->NULL, just in case the element didn't make it to PAUSED. Wingo tested, Wim approved.
This commit is contained in:
parent
61167c9097
commit
1457b69cb7
7 changed files with 29 additions and 30 deletions
13
ChangeLog
13
ChangeLog
|
@ -1,3 +1,16 @@
|
|||
2005-05-26 Andy Wingo <wingo@pobox.com>
|
||||
|
||||
* gst/gstminiobject.c (gst_value_mini_object_collect): Use
|
||||
gst_value_set_mini_object so as to add a ref on the object (which
|
||||
will be removed when the value is unset).
|
||||
|
||||
* gst/elements/gstfakesink.c (gst_fakesink_class_init): Fix signal
|
||||
arg type in ::handoff.
|
||||
|
||||
* gst/gstelement.c (gst_element_change_state): Also deactivate
|
||||
pads in READY->NULL, just in case the element didn't make it to
|
||||
PAUSED. Wingo tested, Wim approved.
|
||||
|
||||
2005-05-26 Wim Taymans <wim@fluendo.com>
|
||||
|
||||
* gst/gstpad.c: (gst_pad_set_active), (gst_pad_link_prepare),
|
||||
|
|
|
@ -278,6 +278,16 @@ Tests if you can safely write data into a buffer's data array.
|
|||
@Returns:
|
||||
|
||||
|
||||
<!-- ##### FUNCTION gst_buffer_join ##### -->
|
||||
<para>
|
||||
|
||||
</para>
|
||||
|
||||
@buf1:
|
||||
@buf2:
|
||||
@Returns:
|
||||
|
||||
|
||||
<!-- ##### FUNCTION gst_buffer_merge ##### -->
|
||||
<para>
|
||||
|
||||
|
@ -310,23 +320,6 @@ Tests if you can safely write data into a buffer's data array.
|
|||
@Returns:
|
||||
|
||||
|
||||
<!-- ##### FUNCTION gst_buffer_default_free ##### -->
|
||||
<para>
|
||||
|
||||
</para>
|
||||
|
||||
@buffer:
|
||||
|
||||
|
||||
<!-- ##### FUNCTION gst_buffer_default_copy ##### -->
|
||||
<para>
|
||||
|
||||
</para>
|
||||
|
||||
@buffer:
|
||||
@Returns:
|
||||
|
||||
|
||||
<!-- ##### MACRO GST_BUFFER_TRACE_NAME ##### -->
|
||||
<para>
|
||||
The name used for tracing memory allocations
|
||||
|
|
|
@ -243,7 +243,6 @@ The direction of a pad.
|
|||
|
||||
</para>
|
||||
|
||||
@GST_PAD_ACTIVE:
|
||||
@GST_PAD_BLOCKED:
|
||||
@GST_PAD_FLUSHING:
|
||||
@GST_PAD_IN_GETCAPS:
|
||||
|
@ -354,14 +353,6 @@ Checks if the pad is linked.
|
|||
@pad: a #GstPad to check.
|
||||
|
||||
|
||||
<!-- ##### MACRO GST_PAD_IS_ACTIVE ##### -->
|
||||
<para>
|
||||
Checks if the pad is active.
|
||||
</para>
|
||||
|
||||
@pad: a #GstPad to check
|
||||
|
||||
|
||||
<!-- ##### MACRO GST_PAD_IS_USABLE ##### -->
|
||||
<para>
|
||||
Checks if a pad is usable. A usable pad is both linked and active.
|
||||
|
|
|
@ -173,7 +173,7 @@ gst_fakesink_class_init (GstFakeSinkClass * klass)
|
|||
g_signal_new ("handoff", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (GstFakeSinkClass, handoff), NULL, NULL,
|
||||
gst_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2,
|
||||
G_TYPE_OBJECT, GST_TYPE_PAD);
|
||||
GST_TYPE_BUFFER, GST_TYPE_PAD);
|
||||
|
||||
gstelement_class->change_state =
|
||||
GST_DEBUG_FUNCPTR (gst_fakesink_change_state);
|
||||
|
|
|
@ -1956,13 +1956,15 @@ gst_element_change_state (GstElement * element)
|
|||
case GST_STATE_PLAYING_TO_PAUSED:
|
||||
break;
|
||||
case GST_STATE_PAUSED_TO_READY:
|
||||
case GST_STATE_READY_TO_NULL:
|
||||
/* deactivate pads in both cases, since they are activated on
|
||||
ready->paused but the element might not have made it to paused */
|
||||
if (!gst_element_pads_activate (element, FALSE)) {
|
||||
result = GST_STATE_FAILURE;
|
||||
} else {
|
||||
element->base_time = 0;
|
||||
}
|
||||
break;
|
||||
case GST_STATE_READY_TO_NULL:
|
||||
break;
|
||||
default:
|
||||
/* this will catch real but unhandled state changes;
|
||||
|
|
|
@ -249,7 +249,7 @@ static gchar *
|
|||
gst_value_mini_object_collect (GValue * value, guint n_collect_values,
|
||||
GTypeCValue * collect_values, guint collect_flags)
|
||||
{
|
||||
value->data[0].v_pointer = collect_values[0].v_pointer;
|
||||
gst_value_set_mini_object (value, collect_values[0].v_pointer);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
@ -173,7 +173,7 @@ gst_fakesink_class_init (GstFakeSinkClass * klass)
|
|||
g_signal_new ("handoff", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (GstFakeSinkClass, handoff), NULL, NULL,
|
||||
gst_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2,
|
||||
G_TYPE_OBJECT, GST_TYPE_PAD);
|
||||
GST_TYPE_BUFFER, GST_TYPE_PAD);
|
||||
|
||||
gstelement_class->change_state =
|
||||
GST_DEBUG_FUNCPTR (gst_fakesink_change_state);
|
||||
|
|
Loading…
Reference in a new issue