mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-04 21:55:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate: scenario: Ensure all pipelines with scenarios are stopped when exiting runner

Browse source 
Otherwise we end up with "dangling" sub pipelines on SIGINT

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5803>
This commit is contained in:
Thibault Saunier 2023-12-12 11:14:11 -03:00 committed by GStreamer Marge Bot
parent 805641fe70
commit a5a65b74ff
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
subprojects/gst-devtools/validate/gst/validate/gst-validate-scenario.c
View file

@ -5238,6 +5238,17 @@ message_cb (GstBus * bus, GstMessage * message, GstValidateScenario * scenario)
(GSourceFunc) handle_bus_message, d, (GDestroyNotify) message_data_free); (GSourceFunc) handle_bus_message, d, (GDestroyNotify) message_data_free);
} }
static void
runner_stopping (GstValidateRunner * runner, GstValidateScenario * scenario)
{
GstElement *pipeline = gst_validate_scenario_get_pipeline (scenario);
if (pipeline) {
gst_element_set_state (pipeline, GST_STATE_NULL);
gst_object_unref (pipeline);
}
}
static gboolean static gboolean
_action_type_has_parameter (GstValidateActionType * atype, _action_type_has_parameter (GstValidateActionType * atype,
const gchar * paramname) const gchar * paramname)
@ -5540,7 +5551,6 @@ one_actions_scenario_max:
} }
} }
static void static void
gst_validate_scenario_set_property (GObject * object, guint prop_id, gst_validate_scenario_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec) const GValue * value, GParamSpec * pspec)
@ -5549,11 +5559,15 @@ gst_validate_scenario_set_property (GObject * object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_RUNNER: case PROP_RUNNER:
{
GstValidateRunner *runner = g_value_get_object (value);
/* we assume the runner is valid as long as this scenario is, /* we assume the runner is valid as long as this scenario is,
* no ref taken */ * no ref taken */
gst_validate_reporter_set_runner (GST_VALIDATE_REPORTER (object), gst_validate_reporter_set_runner (GST_VALIDATE_REPORTER (object), runner);
g_value_get_object (value));
g_signal_connect (runner, "stopping", G_CALLBACK (runner_stopping), self);
break; break;
}
case PROP_HANDLES_STATE: case PROP_HANDLES_STATE:
g_assert_not_reached (); g_assert_not_reached ();
break; break;
@ -5674,11 +5688,15 @@ gst_validate_scenario_init (GstValidateScenario * scenario)
g_main_context_ref (scenario->priv->context); g_main_context_ref (scenario->priv->context);
} }
static void static void
gst_validate_scenario_dispose (GObject * object) gst_validate_scenario_dispose (GObject * object)
{ {
GstValidateScenarioPrivate *priv = GST_VALIDATE_SCENARIO (object)->priv; GstValidateScenarioPrivate *priv = GST_VALIDATE_SCENARIO (object)->priv;
GstValidateRunner *runner =
gst_validate_reporter_get_runner (GST_VALIDATE_REPORTER (object));
g_signal_handlers_disconnect_by_func (runner, runner_stopping, object);
g_weak_ref_clear (&priv->ref_pipeline); g_weak_ref_clear (&priv->ref_pipeline);
if (priv->bus) { if (priv->bus) {