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

tools: launch: Wait for the project to be loaded to activate gst-validate

Browse source 
Otherwize we could have a race where GstValidate actions are launched
even before the project has been loaded
This commit is contained in:
Thibault Saunier 2014-10-31 11:56:16 +01:00
parent aac186a742
commit b14b5d92ca
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tools/ges-launch.c
View file

@ -49,6 +49,7 @@ static GHashTable *tried_uris;
static GESTrackType track_types = GES_TRACK_TYPE_AUDIO | GES_TRACK_TYPE_VIDEO;
static GESTimeline *timeline;
static gboolean needs_set_state;
static const gchar *scenario = NULL;
#ifdef G_OS_UNIX
static gboolean
@ -253,6 +254,13 @@ project_loaded_cb (GESProject * project, GESTimeline * timeline)
}
}
if (ges_validate_activate (GST_PIPELINE (pipeline), scenario,
&needs_set_state) == FALSE) {
g_error ("Could not activate scenario %s", scenario);
seenerrors = TRUE;
g_main_loop_quit (mainloop);
}
if (needs_set_state && gst_element_set_state (GST_ELEMENT (pipeline),
GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE) {
g_error ("Failed to start the pipeline\n");
@ -785,7 +793,6 @@ main (int argc, gchar ** argv)
static gboolean verbose = FALSE;
gchar *load_path = NULL;
gchar *videosink = NULL, *audiosink = NULL;
const gchar *scenario = NULL;
gboolean inspect_action_type = FALSE;
gchar *encoding_profile = NULL;
@ -1013,10 +1020,12 @@ main (int argc, gchar ** argv)
g_timeout_add (1000 * thumbinterval, thumbnail_cb, pipeline);
}
if (ges_validate_activate (GST_PIPELINE (pipeline), scenario,
&needs_set_state) == FALSE) {
g_error ("Could not activate scenario %s", scenario);
return 29;
if (!load_path) {
if (ges_validate_activate (GST_PIPELINE (pipeline), scenario,
&needs_set_state) == FALSE) {
g_error ("Could not activate scenario %s", scenario);
return 29;
}
}
bus = gst_pipeline_get_bus (GST_PIPELINE (pipeline));