[PATCH v9 5/8] winegstreamer: Improve and clean up some debug logs.

[Alfred Agrell]

From: Alfred Agrell

---
 dlls/winegstreamer/unixlib.c      |  9 +--------
 dlls/winegstreamer/wg_format.c    | 11 ++++-------
 dlls/winegstreamer/wg_parser.c    | 14 ++++----------
 dlls/winegstreamer/wg_transform.c | 10 ++--------
 4 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/dlls/winegstreamer/unixlib.c b/dlls/winegstreamer/unixlib.c
index 513ece95a90..46f2c79da4d 100644
--- a/dlls/winegstreamer/unixlib.c
+++ b/dlls/winegstreamer/unixlib.c
@@ -124,16 +124,9 @@ GstElement *find_element(GstElementFactoryListType type, GstCaps *src_caps, GstC

done:
     if (element)
-    {
         GST_DEBUG("Created %s element %p.", name, element);
-    }
     else
-    {
-        gchar *src_str = gst_caps_to_string(src_caps), *sink_str = gst_caps_to_string(sink_caps);
-        GST_WARNING("Failed to create element matching caps %s / %s.", src_str, sink_str);
-        g_free(sink_str);
-        g_free(src_str);
-    }
+        GST_WARNING("Failed to create element matching caps %" GST_PTR_FORMAT " / %" GST_PTR_FORMAT ".", src_caps, sink_caps);

return element;
 }
diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c
index 4969b2564d4..d5a72f40bf1 100644
--- a/dlls/winegstreamer/wg_format.c
+++ b/dlls/winegstreamer/wg_format.c
@@ -181,17 +181,17 @@ static void wg_format_from_caps_audio_mpeg1(struct wg_format *format, const GstC

if (!gst_structure_get_int(structure, "layer", &layer))
     {
-        GST_WARNING("Missing "layer" value.");
+        GST_WARNING("Missing "layer" value in %" GST_PTR_FORMAT ".", caps);
         return;
     }
     if (!gst_structure_get_int(structure, "channels", &channels))
     {
-        GST_WARNING("Missing "channels" value.");
+        GST_WARNING("Missing "channels" value in %" GST_PTR_FORMAT ".", caps);
         return;
     }
     if (!gst_structure_get_int(structure, "rate", &rate))
     {
-        GST_WARNING("Missing "rate" value.");
+        GST_WARNING("Missing "rate" value in %" GST_PTR_FORMAT ".", caps);
         return;
     }

@@ -350,10 +350,7 @@ void wg_format_from_caps(struct wg_format *format, const GstCaps *caps)
     }
     else
     {
-        gchar *str = gst_caps_to_string(caps);
-
-        GST_FIXME("Unhandled caps %s.", str);
-        g_free(str);
+        GST_FIXME("Unhandled caps %" GST_PTR_FORMAT ".", caps);
     }
 }

diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index efac26b4fb3..ad654bfbefc 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -674,6 +674,7 @@ static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *bu

if (!stream->enabled)
     {
+        GST_LOG("Stream is disabled; discarding buffer.");
         pthread_mutex_unlock(&parser->mutex);
         gst_buffer_unref(buffer);
         return GST_FLOW_OK;
@@ -720,7 +721,6 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query)
         case GST_QUERY_CAPS:
         {
             GstCaps *caps, *filter, *temp;
-            gchar *str;
             gsize i;

gst_query_parse_caps(query, &filter);
@@ -737,9 +737,7 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query)
                 gst_structure_remove_fields(gst_caps_get_structure(caps, i),
                         "framerate", "pixel-aspect-ratio", NULL);

-            str = gst_caps_to_string(caps);
-            GST_LOG("Stream caps are "%s".", str);
-            g_free(str);
+            GST_LOG("Stream caps are "%" GST_PTR_FORMAT "".", caps);

if (filter)
             {
@@ -774,12 +772,8 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query)

pthread_mutex_unlock(&parser->mutex);

-            if (!ret && gst_debug_category_get_threshold(GST_CAT_DEFAULT) >= GST_LEVEL_WARNING)
-            {
-                gchar *str = gst_caps_to_string(caps);
-                GST_WARNING("Rejecting caps "%s".", str);
-                g_free(str);
-            }
+            if (!ret)
+                GST_WARNING("Rejecting caps "%" GST_PTR_FORMAT "".", caps);
             gst_query_set_accept_caps_result(query, ret);
             return TRUE;
         }
diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c
index 1610f27b981..6b2910740d3 100644
--- a/dlls/winegstreamer/wg_transform.c
+++ b/dlls/winegstreamer/wg_transform.c
@@ -196,7 +196,6 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery
         case GST_QUERY_CAPS:
         {
             GstCaps *caps, *filter, *temp;
-            gchar *str;

gst_query_parse_caps(query, &filter);
             if (!(caps = wg_format_to_caps(&transform->output_format)))
@@ -209,9 +208,7 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery
                 caps = temp;
             }

-            str = gst_caps_to_string(caps);
-            GST_INFO("Returning caps %s", str);
-            g_free(str);
+            GST_INFO("Returning caps %" GST_PTR_FORMAT, caps);

gst_query_set_caps_result(query, caps);
             gst_caps_unref(caps);
@@ -500,7 +497,6 @@ NTSTATUS wg_transform_set_output_format(void *args)
     const struct wg_format *format = params->format;
     GstSample *sample;
     GstCaps *caps;
-    gchar *str;

if (!(caps = wg_format_to_caps(format)))
     {
@@ -539,9 +535,7 @@ NTSTATUS wg_transform_set_output_format(void *args)
         return STATUS_UNSUCCESSFUL;
     }

-    str = gst_caps_to_string(caps);
-    GST_INFO("Configured new caps %s.", str);
-    g_free(str);
+    GST_INFO("Configured new caps %" GST_PTR_FORMAT ".", caps);

/* Ideally and to be fully compatible with native transform, the queued
      * output buffers will need to be converted to the new output format and