Zebediah Figura : winegstreamer: Initialize GStreamer in wg_parser_create().
Alexandre Julliard
julliard at winehq.org
Fri Oct 1 18:02:24 CDT 2021
Module: wine
Branch: master
Commit: 3643f73ab61f05ddc9a637f8613c933dda0dd232
URL: https://source.winehq.org/git/wine.git/?a=commit;h=3643f73ab61f05ddc9a637f8613c933dda0dd232
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Fri Oct 1 17:18:10 2021 -0500
winegstreamer: Initialize GStreamer in wg_parser_create().
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51086
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winegstreamer/wg_parser.c | 47 +++++++++++++++++++++++-------------------
1 file changed, 26 insertions(+), 21 deletions(-)
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index e1127b9a059..f27ad84df17 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -1846,6 +1846,28 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser)
return TRUE;
}
+static void init_gstreamer_once(void)
+{
+ char arg0[] = "wine";
+ char arg1[] = "--gst-disable-registry-fork";
+ char *args[] = {arg0, arg1, NULL};
+ int argc = ARRAY_SIZE(args) - 1;
+ char **argv = args;
+ GError *err;
+
+ if (!gst_init_check(&argc, &argv, &err))
+ {
+ fprintf(stderr, "winegstreamer: failed to initialize GStreamer: %s\n", debugstr_a(err->message));
+ g_error_free(err);
+ return;
+ }
+
+ GST_DEBUG_CATEGORY_INIT(wine, "WINE", GST_DEBUG_FG_RED, "Wine GStreamer support");
+
+ GST_INFO("GStreamer library version %s; wine built with %d.%d.%d.\n",
+ gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO);
+}
+
static struct wg_parser * CDECL wg_parser_create(enum wg_parser_type type)
{
static const init_gst_cb init_funcs[] =
@@ -1856,8 +1878,12 @@ static struct wg_parser * CDECL wg_parser_create(enum wg_parser_type type)
[WG_PARSER_WAVPARSE] = wave_parser_init_gst,
};
+ static pthread_once_t once = PTHREAD_ONCE_INIT;
struct wg_parser *parser;
+ if (pthread_once(&once, init_gstreamer_once))
+ return NULL;
+
if (!(parser = calloc(1, sizeof(*parser))))
return NULL;
@@ -1923,27 +1949,6 @@ static const struct unix_funcs funcs =
NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out)
{
if (reason == DLL_PROCESS_ATTACH)
- {
- char arg0[] = "wine";
- char arg1[] = "--gst-disable-registry-fork";
- char *args[] = {arg0, arg1, NULL};
- int argc = ARRAY_SIZE(args) - 1;
- char **argv = args;
- GError *err;
-
- if (!gst_init_check(&argc, &argv, &err))
- {
- fprintf(stderr, "winegstreamer: failed to initialize GStreamer: %s\n", debugstr_a(err->message));
- g_error_free(err);
- return STATUS_UNSUCCESSFUL;
- }
-
- GST_DEBUG_CATEGORY_INIT(wine, "WINE", GST_DEBUG_FG_RED, "Wine GStreamer support");
-
- GST_INFO("GStreamer library version %s; wine built with %d.%d.%d.\n",
- gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO);
-
*(const struct unix_funcs **)ptr_out = &funcs;
- }
return STATUS_SUCCESS;
}
More information about the wine-cvs
mailing list