mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-23 14:36:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

sctp: Do downward state change logic after chaining up.

Browse source 
Call the parent state_change function first when changing state
downward, to make sure that the element has stopped before cleaning
it up.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1741>
This commit is contained in:
Jan Schmidt 2020-10-30 22:52:18 +11:00 committed by GStreamer Merge Bot
parent 760592a29c
commit dbeb576531
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ext/sctp/gstsctpdec.c
View file

@ -299,8 +299,7 @@ gst_sctp_dec_change_state (GstElement * element, GstStateChange transition)
ret = GST_STATE_CHANGE_FAILURE; ret = GST_STATE_CHANGE_FAILURE;
break; break;
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
sctpdec_cleanup (self); stop_all_srcpad_tasks (self);
gst_flow_combiner_reset (self->flow_combiner);
break; break;
default: default:
break; break;
@ -309,6 +308,15 @@ gst_sctp_dec_change_state (GstElement * element, GstStateChange transition)
if (ret != GST_STATE_CHANGE_FAILURE) if (ret != GST_STATE_CHANGE_FAILURE)
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY:
sctpdec_cleanup (self);
gst_flow_combiner_reset (self->flow_combiner);
break;
default:
break;
}
return ret; return ret;
} }
@ -424,7 +432,7 @@ gst_sctp_data_srcpad_loop (GstPad * pad)
GST_OBJECT_UNLOCK (self); GST_OBJECT_UNLOCK (self);
if (G_UNLIKELY (flow_ret == GST_FLOW_FLUSHING if (G_UNLIKELY (flow_ret == GST_FLOW_FLUSHING
|| flow_ret == GST_FLOW_NOT_LINKED)) { || flow_ret == GST_FLOW_NOT_LINKED) || flow_ret == GST_FLOW_EOS) {
GST_DEBUG_OBJECT (pad, "Push failed on packet source pad. Error: %s", GST_DEBUG_OBJECT (pad, "Push failed on packet source pad. Error: %s",
gst_flow_get_name (flow_ret)); gst_flow_get_name (flow_ret));
} else if (G_UNLIKELY (flow_ret != GST_FLOW_OK)) { } else if (G_UNLIKELY (flow_ret != GST_FLOW_OK)) {
@ -705,7 +713,6 @@ sctpdec_cleanup (GstSctpDec * self)
NULL, NULL); NULL, NULL);
g_signal_handler_disconnect (self->sctp_association, g_signal_handler_disconnect (self->sctp_association,
self->signal_handler_stream_reset); self->signal_handler_stream_reset);
stop_all_srcpad_tasks (self);
gst_sctp_association_force_close (self->sctp_association); gst_sctp_association_force_close (self->sctp_association);
g_object_unref (self->sctp_association); g_object_unref (self->sctp_association);
self->sctp_association = NULL; self->sctp_association = NULL;

3
ext/sctp/gstsctpenc.c
View file

@ -346,7 +346,7 @@ gst_sctp_enc_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_PLAYING_TO_PAUSED: case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
break; break;
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
sctpenc_cleanup (self); stop_srcpad_task (self->src_pad, self);
self->src_ret = GST_FLOW_FLUSHING; self->src_ret = GST_FLOW_FLUSHING;
break; break;
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
@ -368,6 +368,7 @@ gst_sctp_enc_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_PLAYING_TO_PAUSED: case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
break; break;
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
sctpenc_cleanup (self);
break; break;
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;