mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

launch: Make enabling validate opt-in

Browse source 
Instead of opt-out.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-editing-services/-/merge_requests/264>
This commit is contained in:
Thibault Saunier 2021-08-10 17:10:43 -04:00
parent 0ec4893c8e
commit aff2b3ea0a
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/check/meson.build
View file

@ -112,7 +112,7 @@ if gstvalidate_dep.found()
endif
endforeach
test('simple_playback_test', ges_launch, env: env, args: ['+test-clip', 'blue', 'd=0.1', '--disable-validate', '--videosink=fakevideosink', '--audiosink=fakeaudiosink'])
test('simple_playback_test', ges_launch, env: env, args: ['+test-clip', 'blue', 'd=0.1', '--videosink=fakevideosink', '--audiosink=fakeaudiosink'])
endif
if build_gir

9
tools/ges-launcher.c
View file

@ -1374,9 +1374,8 @@ ges_launcher_parse_options (GESLauncher * self,
"scenarios, " "and --inspect-action-type.",
"<scenario_name>"
},
{"disable-validate", 'n', 0, G_OPTION_ARG_NONE, &opts->disable_validate,
"Do not run inside GstValidate.",
"<scenario_name>"
{"enable-validate", 0, 0, G_OPTION_ARG_NONE, &opts->enable_validate,
"Run inside GstValidate.", NULL,
},
#endif
{
@ -1386,6 +1385,7 @@ ges_launcher_parse_options (GESLauncher * self,
G_OPTION_ARG_NONE,
&opts->embed_nesteds,
"Embed nested timelines when saving.",
NULL,
},
{"no-interactive", 0, G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE,
&opts->interactive,
@ -1437,6 +1437,9 @@ ges_launcher_parse_options (GESLauncher * self,
if (err)
g_propagate_error (error, err);
opts->enable_validate |= opts->testfile || opts->scenario
|| g_getenv ("GST_VALIDATE_SCENARIO");
if (owns_ctx) {
g_option_context_free (ctx);
/* sinks passed in the command line are preferred. */

5
tools/ges-validate.c
View file

@ -125,10 +125,7 @@ ges_validate_activate (GstPipeline * pipeline, GESLauncher * launcher,
GstValidateRunner *runner = NULL;
GstValidateMonitor *monitor = NULL;
if (opts->disable_validate) {
if (opts->scenario)
g_error ("Trying to run scenario: %s but validate is deactivated",
opts->scenario);
if (!opts->enable_validate) {
opts->needs_set_state = TRUE;
g_object_set_data (G_OBJECT (pipeline), "pposition-id",
GUINT_TO_POINTER (g_timeout_add (200,

2
tools/utils.h
View file

@ -47,7 +47,7 @@ typedef struct
gchar *video_track_caps;
gchar *audio_track_caps;
gboolean embed_nesteds;
gboolean disable_validate;
gboolean enable_validate;
gboolean ignore_eos;
gboolean interactive;