Module: wine Branch: master Commit: e36e384cb4d96fd47763332f93c2b213f6556287 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e36e384cb4d96fd47763332f9...
Author: Zebediah Figura z.figura12@gmail.com Date: Sat Jul 10 19:22:20 2021 -0500
winegstreamer: Avoid using Wine debugging functions at all in the Unix library.
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/winegstreamer/wg_parser.c | 46 +++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 21 deletions(-)
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 1ff82836184..92e4fae034a 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -34,7 +34,10 @@ #include <gst/video/video.h> #include <gst/audio/audio.h>
-WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); +/* GStreamer callbacks may be called on threads not created by Wine, and + * therefore cannot access the Wine TEB. This means that we must use GStreamer + * debug logging instead of Wine debug logging. In order to be safe we forbid + * any use of Wine debug logging in this entire file. */
GST_DEBUG_CATEGORY_STATIC(wine); #define GST_CAT_DEFAULT wine @@ -609,7 +612,7 @@ static bool CDECL wg_parser_stream_get_event(struct wg_parser_stream *stream, st if (parser->flushing) { pthread_mutex_unlock(&parser->mutex); - TRACE("Filter is flushing.\n"); + GST_DEBUG("Filter is flushing.\n"); return false; }
@@ -706,13 +709,13 @@ static void CDECL wg_parser_stream_notify_qos(struct wg_parser_stream *stream, /* This can happen legitimately if the sample falls outside of the * segment bounds. GStreamer elements shouldn't present the sample in * that case, but DirectShow doesn't care. */ - TRACE("Ignoring QoS event.\n"); + GST_LOG("Ignoring QoS event.\n"); return; }
if (!(event = gst_event_new_qos(underflow ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, proportion, diff * 100, stream_time))) - ERR("Failed to create QOS event.\n"); + GST_ERROR("Failed to create QOS event.\n"); gst_pad_push_event(stream->my_sink, event); }
@@ -721,7 +724,7 @@ static GstAutoplugSelectResult autoplug_select_cb(GstElement *bin, GstPad *pad, { const char *name = gst_element_factory_get_longname(fact);
- GST_TRACE("Using "%s".", name); + GST_INFO("Using "%s".", name);
if (strstr(name, "Player protection")) { @@ -1493,7 +1496,7 @@ static LONGLONG query_duration(GstPad *pad) if (gst_pad_query_duration(pad, GST_FORMAT_TIME, &duration)) return duration / 100;
- WARN("Failed to query time duration; trying to convert from byte length.\n"); + GST_INFO("Failed to query time duration; trying to convert from byte length.\n");
/* To accurately get a duration for the stream, we want to only consider the * length of that stream. Hence, query for the pad duration, instead of @@ -1502,7 +1505,7 @@ static LONGLONG query_duration(GstPad *pad) && gst_pad_query_convert(pad, GST_FORMAT_BYTES, byte_length, GST_FORMAT_TIME, &duration)) return duration / 100;
- ERR("Failed to query duration.\n"); + GST_WARNING("Failed to query duration.\n"); return 0; }
@@ -1648,7 +1651,7 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser)
if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - ERR("Failed to link pads, error %d.\n", ret); + GST_ERROR("Failed to link pads, error %d.\n", ret); return FALSE; }
@@ -1656,7 +1659,7 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) ret = gst_element_get_state(parser->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) { - ERR("Failed to play stream.\n"); + GST_ERROR("Failed to play stream.\n"); return FALSE; }
@@ -1695,7 +1698,7 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser)
if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - ERR("Failed to link pads, error %d.\n", ret); + GST_ERROR("Failed to link pads, error %d.\n", ret); return FALSE; }
@@ -1703,7 +1706,7 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser) ret = gst_element_get_state(parser->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) { - ERR("Failed to play stream.\n"); + GST_ERROR("Failed to play stream.\n"); return FALSE; }
@@ -1734,7 +1737,7 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - ERR("Failed to link sink pads, error %d.\n", ret); + GST_ERROR("Failed to link sink pads, error %d.\n", ret); return FALSE; }
@@ -1744,7 +1747,7 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) gst_object_ref(stream->their_src = gst_element_get_static_pad(element, "src")); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) { - ERR("Failed to link source pads, error %d.\n", ret); + GST_ERROR("Failed to link source pads, error %d.\n", ret); return FALSE; }
@@ -1753,7 +1756,7 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) ret = gst_element_get_state(parser->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) { - ERR("Failed to play stream.\n"); + GST_ERROR("Failed to play stream.\n"); return FALSE; }
@@ -1783,7 +1786,7 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - ERR("Failed to link sink pads, error %d.\n", ret); + GST_ERROR("Failed to link sink pads, error %d.\n", ret); return FALSE; }
@@ -1794,7 +1797,7 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) gst_object_ref(stream->their_src); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) { - ERR("Failed to link source pads, error %d.\n", ret); + GST_ERROR("Failed to link source pads, error %d.\n", ret); return FALSE; }
@@ -1803,7 +1806,7 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) ret = gst_element_get_state(parser->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) { - ERR("Failed to play stream.\n"); + GST_ERROR("Failed to play stream.\n"); return FALSE; }
@@ -1823,7 +1826,7 @@ static struct wg_parser *wg_parser_create(void) pthread_cond_init(&parser->read_done_cond, NULL); parser->flushing = true;
- TRACE("Created winegstreamer parser %p.\n", parser); + GST_DEBUG("Created winegstreamer parser %p.\n", parser); return parser; }
@@ -1927,15 +1930,16 @@ NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *pt
if (!gst_init_check(&argc, &argv, &err)) { - ERR("Failed to initialize GStreamer: %s\n", debugstr_a(err->message)); + fprintf(stderr, "winegstreamer: failed to initialize GStreamer: %s\n", debugstr_a(err->message)); g_error_free(err); return STATUS_UNSUCCESSFUL; } - TRACE("GStreamer library version %s; wine built with %d.%d.%d.\n", - gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO);
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;