mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-11 16:55:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate-scenario: Use GLib functions to make sure GMainContext is used

Browse source
This commit is contained in:
Olivier Crête 2015-07-24 16:25:38 -04:00
parent 0a17bfc2be
commit ae9dec4cc3
1 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
validate/gst/validate/gst-validate-scenario.c
View file

@ -94,8 +94,6 @@ static void gst_validate_scenario_dispose (GObject * object);
static void gst_validate_scenario_finalize (GObject * object); static void gst_validate_scenario_finalize (GObject * object);
static GstValidateActionType *_find_action_type (const gchar * type_name); static GstValidateActionType *_find_action_type (const gchar * type_name);
static GPrivate main_thread_priv;
/* GstValidateScenario is not really thread safe and /* GstValidateScenario is not really thread safe and
* everything should be done from the thread GstValidate * everything should be done from the thread GstValidate
* was inited from, unless stated otherwize. * was inited from, unless stated otherwize.
@ -2928,14 +2926,11 @@ gst_validate_action_set_done (GstValidateAction * action)
gst_validate_action_unref (action); gst_validate_action_unref (action);
} }
if (GPOINTER_TO_INT (g_private_get (&main_thread_priv))) { g_main_context_invoke_full (NULL, G_PRIORITY_DEFAULT_IDLE,
_action_set_done (action); (GSourceFunc) _action_set_done,
} else {
g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, (GSourceFunc) _action_set_done,
gst_mini_object_ref (GST_MINI_OBJECT (action)), gst_mini_object_ref (GST_MINI_OBJECT (action)),
(GDestroyNotify) gst_validate_action_unref); (GDestroyNotify) gst_validate_action_unref);
} }
}
/** /**
* gst_validate_register_action_type: * gst_validate_register_action_type:
@ -3149,15 +3144,18 @@ gst_validate_print_action_types (const gchar ** wanted_types,
GList * GList *
gst_validate_scenario_get_actions (GstValidateScenario * scenario) gst_validate_scenario_get_actions (GstValidateScenario * scenario)
{ {
if (GPOINTER_TO_INT (g_private_get (&main_thread_priv))) { GList *ret;
return g_list_copy_deep (scenario->priv->actions, gboolean main_context_acquired;
(GCopyFunc) gst_mini_object_ref, NULL);
} else {
GST_WARNING_OBJECT (scenario, "Trying to get next action from outside"
" the 'main' thread");
}
return NULL; main_context_acquired = g_main_context_acquire (g_main_context_default ());
g_return_val_if_fail (main_context_acquired, NULL);
ret = g_list_copy_deep (scenario->priv->actions,
(GCopyFunc) gst_mini_object_ref, NULL);
g_main_context_release (g_main_context_default ());
return ret;
} }
void void
@ -3169,8 +3167,6 @@ init_scenarios (void)
_gst_validate_action_type = gst_validate_action_get_type (); _gst_validate_action_type = gst_validate_action_get_type ();
_gst_validate_action_type_type = gst_validate_action_type_get_type (); _gst_validate_action_type_type = gst_validate_action_type_get_type ();
g_private_set (&main_thread_priv, GUINT_TO_POINTER (TRUE));
/* *INDENT-OFF* */ /* *INDENT-OFF* */
REGISTER_ACTION_TYPE ("description", NULL, REGISTER_ACTION_TYPE ("description", NULL,
((GstValidateActionParameter []) { ((GstValidateActionParameter []) {