mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

media: let the source unref the last media ref

Browse source 
the last ref to the media is held by the source so we don't need to add more ref
and unrefs, we simply destroy the media when the source is gone.
This commit is contained in:
Wim Taymans 2012-11-30 13:35:05 +01:00
parent 339ea9b085
commit 119674a828
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst/rtsp-server/rtsp-media.c
View file

@ -1236,7 +1236,6 @@ default_handle_message (GstRTSPMedia * media, GstMessage * message)
if (priv->status == GST_RTSP_MEDIA_STATUS_UNPREPARING) {
GST_DEBUG ("shutting down after EOS");
finish_unprepare (media);
g_object_unref (media);
}
break;
default:
@ -1523,15 +1522,16 @@ finish_unprepare (GstRTSPMedia * media)
priv->reused = TRUE;
priv->status = GST_RTSP_MEDIA_STATUS_UNPREPARED;
if (priv->source) {
g_source_destroy (priv->source);
g_source_unref (priv->source);
priv->source = NULL;
}
/* when the media is not reusable, this will effectively unref the media and
* recreate it */
g_signal_emit (media, gst_rtsp_media_signals[SIGNAL_UNPREPARED], 0, NULL);
/* the source has the last ref to the media */
if (priv->source) {
GST_DEBUG ("destroy source");
g_source_destroy (priv->source);
g_source_unref (priv->source);
}
}
/* called with state-lock */
@ -1543,7 +1543,6 @@ default_unprepare (GstRTSPMedia * media)
if (priv->eos_shutdown) {
GST_DEBUG ("sending EOS for shutdown");
/* ref so that we don't disappear */
g_object_ref (media);
gst_element_send_event (priv->pipeline, gst_event_new_eos ());
/* we need to go to playing again for the EOS to propagate, normally in this
* state, nothing is receiving data from us anymore so this is ok. */