mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 16:26:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

ximagesink/xvimagesink: use GST_XINITTHREADS to ensure call to XInitThreads

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2098>
This commit is contained in:
Haihua Hu 2022-04-01 21:47:59 +08:00
parent 1842ffc906
commit df0958e855
10 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/gst-devtools/validate/launcher/baseclasses.py
View file

@ -933,6 +933,8 @@ class GstValidateTest(Test):
# Ensure XInitThreads is called, see bgo#731525
subproc_env['GST_GL_XINITTHREADS'] = '1'
self.add_env_variable('GST_GL_XINITTHREADS', '1')
subproc_env['GST_XINITTHREADS'] = '1'
self.add_env_variable('GST_XINITTHREADS', '1')
if self.scenario is not None:
scenario = self.scenario.get_execution_name()

2
subprojects/gst-plugins-base/ext/gl/gstglelement.c
View file

@ -62,7 +62,7 @@ gl_element_init (GstPlugin * plugin)
#endif
#if GST_GL_HAVE_WINDOW_X11
if (g_getenv ("GST_GL_XINITTHREADS"))
if (g_getenv ("GST_GL_XINITTHREADS") || g_getenv ("GST_XINITTHREADS"))
XInitThreads ();
#endif
g_once_init_leave (&res, TRUE);

3
subprojects/gst-plugins-base/sys/ximage/ximage.c
View file

@ -27,6 +27,9 @@
static gboolean
plugin_init (GstPlugin * plugin)
{
if (g_getenv ("GST_XINITTHREADS"))
XInitThreads ();
return GST_ELEMENT_REGISTER (ximagesink, plugin);
}

3
subprojects/gst-plugins-base/sys/xvimage/xvimage.c
View file

@ -27,6 +27,9 @@
static gboolean
plugin_init (GstPlugin * plugin)
{
if (g_getenv ("GST_XINITTHREADS"))
XInitThreads ();
return GST_ELEMENT_REGISTER (xvimagesink, plugin);;
}

1
subprojects/gst-plugins-base/tests/check/elements/glfilter.c
View file

@ -125,6 +125,7 @@ main (int argc, char **argv)
{
Suite *s;
g_setenv ("GST_GL_XINITTHREADS", "1", TRUE);
g_setenv ("GST_XINITTHREADS", "1", TRUE);
gst_check_init (&argc, &argv);
s = glfilter_suite ();
return gst_check_run_suite (s, "glfilter", __FILE__);

1
subprojects/gst-plugins-base/tests/check/elements/glimagesink.c
View file

@ -277,6 +277,7 @@ main (int argc, char **argv)
{
Suite *s;
g_setenv ("GST_GL_XINITTHREADS", "1", TRUE);
g_setenv ("GST_XINITTHREADS", "1", TRUE);
gst_check_init (&argc, &argv);
s = glimagesink_suite ();
return gst_check_run_suite (s, "glimagesink", __FILE__);

1
subprojects/gst-plugins-base/tests/check/elements/glmixer.c
View file

@ -144,6 +144,7 @@ main (int argc, char **argv)
{
Suite *s;
g_setenv ("GST_GL_XINITTHREADS", "1", TRUE);
g_setenv ("GST_XINITTHREADS", "1", TRUE);
gst_check_init (&argc, &argv);
s = glmixer_suite ();
return gst_check_run_suite (s, "glmixer", __FILE__);

1
subprojects/gst-plugins-base/tests/check/elements/glstereo.c
View file

@ -70,6 +70,7 @@ main (int argc, char **argv)
{
Suite *s;
g_setenv ("GST_GL_XINITTHREADS", "1", TRUE);
g_setenv ("GST_XINITTHREADS", "1", TRUE);
gst_check_init (&argc, &argv);
s = glstereo_suite ();
return gst_check_run_suite (s, "glstereo", __FILE__);

1
subprojects/gst-plugins-base/tools/gst-play.c
View file

@ -1659,6 +1659,7 @@ main (int argc, char **argv)
g_set_prgname ("gst-play-" GST_API_VERSION);
/* Ensure XInitThreads() is called if/when needed */
g_setenv ("GST_GL_XINITTHREADS", "1", TRUE);
g_setenv ("GST_XINITTHREADS", "1", TRUE);
ctx = g_option_context_new ("FILE1|URI1 [FILE2|URI2] [FILE3|URI3] ...");
g_option_context_add_main_entries (ctx, options, GETTEXT_PACKAGE);

1
subprojects/gstreamer/tools/gst-launch.c
View file

@ -1149,6 +1149,7 @@ main (int argc, char *argv[])
g_set_prgname ("gst-launch-" GST_API_VERSION);
/* Ensure XInitThreads() is called if/when needed */
g_setenv ("GST_GL_XINITTHREADS", "1", TRUE);
g_setenv ("GST_XINITTHREADS", "1", TRUE);
#ifndef GST_DISABLE_OPTION_PARSING
ctx = g_option_context_new ("PIPELINE-DESCRIPTION");