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

media: take the right lock in gst_rtsp_media_set_pipeline_state()

Browse source 
We need to take the state_lock when calling this method.
This commit is contained in:
Wim Taymans 2013-11-26 16:25:37 +01:00
parent 9da7b5eeb5
commit b8ae2570d9
1 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2138,15 +2138,8 @@ gst_rtsp_media_get_time_provider (GstRTSPMedia * media, const gchar * address,
return provider; return provider;
} }
/** static void
* gst_rtsp_media_set_pipeline_state: media_set_pipeline_state_locked (GstRTSPMedia * media, GstState state)
* @media: a #GstRTSPMedia
* @state: the target state of the pipeline
*
* Set the state of the pipeline managed by @media to @state
*/
void
gst_rtsp_media_set_pipeline_state (GstRTSPMedia * media, GstState state)
{ {
GstRTSPMediaPrivate *priv = media->priv; GstRTSPMediaPrivate *priv = media->priv;
@ -2165,6 +2158,23 @@ gst_rtsp_media_set_pipeline_state (GstRTSPMedia * media, GstState state)
} }
} }
/**
* gst_rtsp_media_set_pipeline_state:
* @media: a #GstRTSPMedia
* @state: the target state of the pipeline
*
* Set the state of the pipeline managed by @media to @state
*/
void
gst_rtsp_media_set_pipeline_state (GstRTSPMedia * media, GstState state)
{
g_return_if_fail (GST_IS_RTSP_MEDIA (media));
g_rec_mutex_lock (&media->priv->state_lock);
media_set_pipeline_state_locked (media, state);
g_rec_mutex_unlock (&media->priv->state_lock);
}
/** /**
* gst_rtsp_media_set_state: * gst_rtsp_media_set_state:
* @media: a #GstRTSPMedia * @media: a #GstRTSPMedia
@ -2254,7 +2264,7 @@ gst_rtsp_media_set_state (GstRTSPMedia * media, GstState state,
if (priv->target_state != state) { if (priv->target_state != state) {
if (do_state) if (do_state)
gst_rtsp_media_set_pipeline_state (media, state); media_set_pipeline_state_locked (media, state);
g_signal_emit (media, gst_rtsp_media_signals[SIGNAL_NEW_STATE], 0, state, g_signal_emit (media, gst_rtsp_media_signals[SIGNAL_NEW_STATE], 0, state,
NULL); NULL);