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

media-factory: add locking

Browse source
This commit is contained in:
Wim Taymans 2012-11-12 16:14:19 +01:00
parent e61c84c9bb
commit b8cba7719c
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gst/rtsp-server/rtsp-media-factory.c
View file

@ -493,15 +493,15 @@ gst_rtsp_media_factory_set_auth (GstRTSPMediaFactory * factory,
g_return_if_fail (GST_IS_RTSP_MEDIA_FACTORY (factory)); g_return_if_fail (GST_IS_RTSP_MEDIA_FACTORY (factory));
old = factory->auth; GST_RTSP_MEDIA_FACTORY_LOCK (factory);
if ((old = factory->auth) != auth)
factory->auth = auth ? g_object_ref (auth) : NULL;
else
old = NULL;
GST_RTSP_MEDIA_FACTORY_UNLOCK (factory);
if (old != auth) { if (old)
if (auth) g_object_unref (old);
g_object_ref (auth);
factory->auth = auth;
if (old)
g_object_unref (old);
}
} }
/** /**
@ -520,8 +520,10 @@ gst_rtsp_media_factory_get_auth (GstRTSPMediaFactory * factory)
g_return_val_if_fail (GST_IS_RTSP_MEDIA_FACTORY (factory), NULL); g_return_val_if_fail (GST_IS_RTSP_MEDIA_FACTORY (factory), NULL);
GST_RTSP_MEDIA_FACTORY_LOCK (factory);
if ((result = factory->auth)) if ((result = factory->auth))
g_object_ref (result); g_object_ref (result);
GST_RTSP_MEDIA_FACTORY_UNLOCK (factory);
return result; return result;
} }
@ -539,7 +541,9 @@ gst_rtsp_media_factory_set_protocols (GstRTSPMediaFactory * factory,
{ {
g_return_if_fail (GST_IS_RTSP_MEDIA_FACTORY (factory)); g_return_if_fail (GST_IS_RTSP_MEDIA_FACTORY (factory));
GST_RTSP_MEDIA_FACTORY_LOCK (factory);
factory->protocols = protocols; factory->protocols = protocols;
GST_RTSP_MEDIA_FACTORY_UNLOCK (factory);
} }
/** /**
@ -553,10 +557,16 @@ gst_rtsp_media_factory_set_protocols (GstRTSPMediaFactory * factory,
GstRTSPLowerTrans GstRTSPLowerTrans
gst_rtsp_media_factory_get_protocols (GstRTSPMediaFactory * factory) gst_rtsp_media_factory_get_protocols (GstRTSPMediaFactory * factory)
{ {
GstRTSPLowerTrans res;
g_return_val_if_fail (GST_IS_RTSP_MEDIA_FACTORY (factory), g_return_val_if_fail (GST_IS_RTSP_MEDIA_FACTORY (factory),
GST_RTSP_LOWER_TRANS_UNKNOWN); GST_RTSP_LOWER_TRANS_UNKNOWN);
return factory->protocols; GST_RTSP_MEDIA_FACTORY_LOCK (factory);
res = factory->protocols;
GST_RTSP_MEDIA_FACTORY_UNLOCK (factory);
return res;
} }
static gboolean static gboolean