mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

player: Protect setter/getter for the configuration with a mutex

Browse source
This commit is contained in:
Sebastian Dröge 2016-08-23 14:33:11 +03:00
parent a0f6105204
commit fa8bfb3991
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst-libs/gst/player/gstplayer.c
View file

@ -4080,15 +4080,19 @@ gst_player_set_config (GstPlayer * self, GstStructure * config)
g_return_val_if_fail (GST_IS_PLAYER (self), FALSE); g_return_val_if_fail (GST_IS_PLAYER (self), FALSE);
g_return_val_if_fail (config != NULL, FALSE); g_return_val_if_fail (config != NULL, FALSE);
g_mutex_lock (&self->lock);
if (self->app_state != GST_PLAYER_STATE_STOPPED) { if (self->app_state != GST_PLAYER_STATE_STOPPED) {
GST_INFO_OBJECT (self, "can't change config while player is %s", GST_INFO_OBJECT (self, "can't change config while player is %s",
gst_player_state_get_name (self->app_state)); gst_player_state_get_name (self->app_state));
g_mutex_unlock (&self->lock);
return FALSE; return FALSE;
} }
if (self->config) if (self->config)
gst_structure_free (self->config); gst_structure_free (self->config);
self->config = config; self->config = config;
g_mutex_unlock (&self->lock);
return TRUE; return TRUE;
} }
@ -4103,14 +4107,21 @@ gst_player_set_config (GstPlayer * self, GstStructure * config)
* *
* Returns: (transfer full): a copy of the current configuration of @player. Use * Returns: (transfer full): a copy of the current configuration of @player. Use
* gst_structure_free() after usage or gst_player_set_config(). * gst_structure_free() after usage or gst_player_set_config().
*
* Since 1.10 * Since 1.10
*/ */
GstStructure * GstStructure *
gst_player_get_config (GstPlayer * self) gst_player_get_config (GstPlayer * self)
{ {
GstStructure *ret;
g_return_val_if_fail (GST_IS_PLAYER (self), NULL); g_return_val_if_fail (GST_IS_PLAYER (self), NULL);
return gst_structure_copy (self->config); g_mutex_lock (&self->lock);
ret = gst_structure_copy (self->config);
g_mutex_unlock (&self->lock);
return ret;
} }
/** /**