From 0ac7e16066a83eaa1aa2b7d5d90aab32a55c763b Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Tue, 15 Sep 2009 19:44:46 +0200
Subject: [PATCH] mpegtspacketizer/parse: Don't use gst_structure_to_string()
 for debugging.

There's GST_PTR_FORMAT for that, and too bad for the systems that don't have
support for that. It just costs too much cpu.
---
 gst/mpegdemux/mpegtspacketizer.c | 15 +++------------
 gst/mpegdemux/mpegtsparse.c      | 20 ++++----------------
 2 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/gst/mpegdemux/mpegtspacketizer.c b/gst/mpegdemux/mpegtspacketizer.c
index da53a9264a..38c26993dd 100644
--- a/gst/mpegdemux/mpegtspacketizer.c
+++ b/gst/mpegdemux/mpegtspacketizer.c
@@ -599,7 +599,6 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer * packetizer,
   GValue transports = { 0 };
   GValue transport_value = { 0 };
   GValueArray *descriptors = NULL;
-  gchar *dbg_str;
 
   GST_DEBUG ("NIT");
   /* fixed header + CRC == 16 */
@@ -1205,9 +1204,7 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer * packetizer,
   gst_structure_set_value (nit, "transports", &transports);
   g_value_unset (&transports);
 
-  dbg_str = gst_structure_to_string (nit);
-  GST_DEBUG ("NIT %s", dbg_str);
-  g_free (dbg_str);
+  GST_DEBUG ("NIT %" GST_PTR_FORMAT, nit);
 
   return nit;
 
@@ -1237,7 +1234,6 @@ mpegts_packetizer_parse_sdt (MpegTSPacketizer * packetizer,
   GValue services = { 0 };
   GValueArray *descriptors = NULL;
   GValue service_value = { 0 };
-  gchar *dbg_str;
 
   GST_DEBUG ("SDT");
   /* fixed header + CRC == 16 */
@@ -1414,9 +1410,6 @@ mpegts_packetizer_parse_sdt (MpegTSPacketizer * packetizer,
   gst_structure_set_value (sdt, "services", &services);
   g_value_unset (&services);
 
-  dbg_str = gst_structure_to_string (sdt);
-  g_free (dbg_str);
-
   return sdt;
 
 error:
@@ -1447,7 +1440,7 @@ mpegts_packetizer_parse_eit (MpegTSPacketizer * packetizer,
   GValue events = { 0 };
   GValue event_value = { 0 };
   GValueArray *descriptors = NULL;
-  gchar *dbg_str, *event_name;
+  gchar *event_name;
   guint tmp;
 
   /* fixed header + CRC == 16 */
@@ -1876,9 +1869,7 @@ mpegts_packetizer_parse_eit (MpegTSPacketizer * packetizer,
   gst_structure_set_value (eit, "events", &events);
   g_value_unset (&events);
 
-  dbg_str = gst_structure_to_string (eit);
-  GST_DEBUG ("EIT %s", dbg_str);
-  g_free (dbg_str);
+  GST_DEBUG ("EIT %" GST_PTR_FORMAT, eit);
 
   return eit;
 
diff --git a/gst/mpegdemux/mpegtsparse.c b/gst/mpegdemux/mpegtsparse.c
index 90a8ea3b1e..e3f905a824 100644
--- a/gst/mpegdemux/mpegtsparse.c
+++ b/gst/mpegdemux/mpegtsparse.c
@@ -889,14 +889,11 @@ mpegts_parse_apply_pat (MpegTSParse * parse, GstStructure * pat_info)
   MpegTSParseProgram *program;
   gint i;
   const GValue *programs;
-  gchar *dbg;
 
   old_pat = parse->pat;
   parse->pat = gst_structure_copy (pat_info);
 
-  dbg = gst_structure_to_string (pat_info);
-  GST_INFO_OBJECT (parse, "PAT %s", dbg);
-  g_free (dbg);
+  GST_INFO_OBJECT (parse, "PAT %" GST_PTR_FORMAT, pat_info);
 
   gst_element_post_message (GST_ELEMENT_CAST (parse),
       gst_message_new_element (GST_OBJECT (parse),
@@ -958,12 +955,8 @@ mpegts_parse_apply_pat (MpegTSParse * parse, GstStructure * pat_info)
         /* the program has been referenced by the new pat, keep it */
         continue;
 
-      {
-        gchar *dbg = gst_structure_to_string (program_info);
-
-        GST_INFO_OBJECT (parse, "PAT removing program %s", dbg);
-        g_free (dbg);
-      }
+      GST_INFO_OBJECT (parse, "PAT removing program %" GST_PTR_FORMAT,
+          program_info);
 
       if (program->active)
         parse->pads_to_remove = g_list_append (parse->pads_to_remove,
@@ -1038,12 +1031,7 @@ mpegts_parse_apply_pmt (MpegTSParse * parse,
   }
   GST_OBJECT_UNLOCK (parse);
 
-  {
-    gchar *dbg = gst_structure_to_string (pmt_info);
-
-    GST_DEBUG_OBJECT (parse, "new pmt %s", dbg);
-    g_free (dbg);
-  }
+  GST_DEBUG_OBJECT (parse, "new pmt %" GST_PTR_FORMAT, pmt_info);
 
   gst_element_post_message (GST_ELEMENT_CAST (parse),
       gst_message_new_element (GST_OBJECT (parse),