mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst-launch: handle ERROR messages in the sync handler

Browse source 
Errors causing the pipeline to fail going from NULL to PAUSED
were not displayed, and the pipeline was not dumped either in
those cases.

In addition, dumping the pipeline from the sync handler means
the dump matches exactly the state of the pipeline at the
moment the error was posted.
This commit is contained in:
Mathieu Duponchelle 2019-12-26 15:08:09 +01:00 committed by Mathieu Duponchelle
parent b5c19c7426
commit 4f9cac06e4
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
tools/gst-launch.c
View file

@ -711,24 +711,6 @@ bus_handler (GstBus * bus, GstMessage * message, gpointer data)
g_free (name);
break;
}
case GST_MESSAGE_ERROR:{
/* dump graph on error */
GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS (GST_BIN (pipeline),
GST_DEBUG_GRAPH_SHOW_ALL, "gst-launch.error");
print_error_message (message);
if (target_state == GST_STATE_PAUSED) {
gst_printerr (_("ERROR: pipeline doesn't want to preroll.\n"));
} else if (interrupting) {
PRINT (_("An error happened while waiting for EOS\n"));
}
/* we have an error */
last_launch_code = LEC_ERROR;
g_main_loop_quit (loop);
break;
}
case GST_MESSAGE_STATE_CHANGED:{
GstState old, new, pending;
@ -990,6 +972,24 @@ bus_sync_handler (GstBus * bus, GstMessage * message, gpointer data)
g_free (state_transition_name);
}
break;
case GST_MESSAGE_ERROR:{
/* dump graph on error */
GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS (GST_BIN (pipeline),
GST_DEBUG_GRAPH_SHOW_ALL, "gst-launch.error");
print_error_message (message);
if (target_state == GST_STATE_PAUSED) {
gst_printerr (_("ERROR: pipeline doesn't want to preroll.\n"));
} else if (interrupting) {
PRINT (_("An error happened while waiting for EOS\n"));
}
/* we have an error */
last_launch_code = LEC_ERROR;
g_main_loop_quit (loop);
break;
}
default:
break;
}
@ -1206,7 +1206,7 @@ main (int argc, char *argv[])
switch (ret) {
case GST_STATE_CHANGE_FAILURE:
gst_printerr (_("ERROR: Pipeline doesn't want to pause.\n"));
gst_printerr (_("Failed to set pipeline to PAUSED.\n"));
last_launch_code = LEC_STATE_CHANGE_FAILURE;
goto end;
case GST_STATE_CHANGE_NO_PREROLL: