mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-06 10:42:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

mssdemux: improve state changing

Browse source 
Keep a ref on pad to prevent it being unreffed while the mssdemux
streams are still using it. Also reset the element when going to
ready instead of when going to null.
This commit is contained in:
Thiago Santos 2012-11-22 13:01:09 -03:00
parent b4f994d47c
commit 91dd173f3c
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ext/smoothstreaming/gstmssdemux.c
View file

@ -153,7 +153,9 @@ gst_mss_demux_stream_free (GstMssDemuxStream * stream)
gst_task_stop (stream->stream_task);
g_static_rec_mutex_lock (&stream->stream_lock);
g_static_rec_mutex_unlock (&stream->stream_lock);
GST_LOG_OBJECT (stream->parent, "Waiting for task to finish");
gst_task_join (stream->stream_task);
GST_LOG_OBJECT (stream->parent, "Finished");
}
gst_object_unref (stream->stream_task);
g_static_rec_mutex_free (&stream->stream_lock);
@ -164,6 +166,10 @@ gst_mss_demux_stream_free (GstMssDemuxStream * stream)
g_object_unref (stream->downloader);
stream->downloader = NULL;
}
if (stream->pad) {
gst_object_unref (stream->pad);
stream->pad = NULL;
}
g_free (stream);
}
@ -210,9 +216,9 @@ gst_mss_demux_change_state (GstElement * element, GstStateChange transition)
switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_mss_demux_reset (mssdemux);
break;
case GST_STATE_CHANGE_READY_TO_NULL:
gst_mss_demux_reset (mssdemux);
break;
default:
break;
@ -349,6 +355,7 @@ gst_mss_demux_expose_stream (GstMssDemux * mssdemux, GstMssDemuxStream * stream)
gst_pad_set_active (pad, TRUE);
GST_INFO_OBJECT (mssdemux, "Adding srcpad %s:%s with caps %" GST_PTR_FORMAT,
GST_DEBUG_PAD_NAME (pad), caps);
gst_object_ref (pad);
gst_element_add_pad (GST_ELEMENT_CAST (mssdemux), pad);
} else {
GST_WARNING_OBJECT (mssdemux, "Not exposing stream of unrecognized format");