[0.11] gst-plugins-good: matroska: fix printf format compiler warnings

Tim Müller tpm at kemper.freedesktop.org
Sun Jan 15 10:34:27 PST 2012


Module: gst-plugins-good
Branch: 0.11
Commit: d55f75f6f4d40bfaf86418238e4bbb9bbf56361d
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=d55f75f6f4d40bfaf86418238e4bbb9bbf56361d

Author: Matej Knopp <matej.knopp at gmail.com>
Date:   Fri Jan 13 18:12:05 2012 -0500

matroska: fix printf format compiler warnings

https://bugzilla.gnome.org/show_bug.cgi?id=662615

---

 gst/matroska/ebml-write.c           |    6 ++++--
 gst/matroska/matroska-demux.c       |   23 ++++++++++++++---------
 gst/matroska/matroska-mux.c         |    2 +-
 gst/matroska/matroska-parse.c       |    5 +++--
 gst/matroska/matroska-read-common.c |    4 ++--
 gst/multifile/gstmultifilesink.c    |    2 +-
 6 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/gst/matroska/ebml-write.c b/gst/matroska/ebml-write.c
index bf17d62..d02fede 100644
--- a/gst/matroska/ebml-write.c
+++ b/gst/matroska/ebml-write.c
@@ -178,7 +178,8 @@ gst_ebml_stop_streamheader (GstEbmlWrite * ebml)
 
   buffer = gst_byte_writer_free_and_get_buffer (ebml->streamheader);
   ebml->streamheader = NULL;
-  GST_DEBUG ("Streamheader was size %d", gst_buffer_get_size (buffer));
+  GST_DEBUG ("Streamheader was size %" G_GSIZE_FORMAT,
+      gst_buffer_get_size (buffer));
 
   ebml->writing_streamheader = FALSE;
   return buffer;
@@ -245,7 +246,8 @@ gst_ebml_write_flush_cache (GstEbmlWrite * ebml, gboolean is_keyframe,
 
   buffer = gst_byte_writer_free_and_get_buffer (ebml->cache);
   ebml->cache = NULL;
-  GST_DEBUG ("Flushing cache of size %d", gst_buffer_get_size (buffer));
+  GST_DEBUG ("Flushing cache of size %" G_GSIZE_FORMAT,
+      gst_buffer_get_size (buffer));
   GST_BUFFER_TIMESTAMP (buffer) = timestamp;
   GST_BUFFER_OFFSET (buffer) = ebml->pos - gst_buffer_get_size (buffer);
   GST_BUFFER_OFFSET_END (buffer) = ebml->pos;
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index 1559aaf..bf0beb6 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -1636,7 +1636,8 @@ gst_matroska_demux_search_cluster (GstMatroskaDemux * demux, gint64 * pos)
     ret = gst_pad_pull_range (demux->common.sinkpad, newpos, chunk, &buf);
     if (ret != GST_FLOW_OK)
       break;
-    GST_DEBUG_OBJECT (demux, "read buffer size %d at offset %" G_GINT64_FORMAT,
+    GST_DEBUG_OBJECT (demux,
+        "read buffer size %" G_GSIZE_FORMAT " at offset %" G_GINT64_FORMAT,
         gst_buffer_get_size (buf), newpos);
     data = gst_buffer_map (buf, &size, NULL, GST_MAP_READ);
     gst_byte_reader_init (&reader, data, size);
@@ -2470,7 +2471,8 @@ gst_matroska_demux_push_flac_codec_priv_data (GstMatroskaDemux * demux,
   guint8 *pdata;
   guint off, len;
 
-  GST_LOG_OBJECT (demux, "priv data size = %u", stream->codec_priv_size);
+  GST_LOG_OBJECT (demux, "priv data size = %" G_GSIZE_FORMAT,
+      stream->codec_priv_size);
 
   pdata = (guint8 *) stream->codec_priv;
 
@@ -2514,7 +2516,8 @@ gst_matroska_demux_push_speex_codec_priv_data (GstMatroskaDemux * demux,
   GstFlowReturn ret;
   guint8 *pdata = stream->codec_priv;
 
-  GST_LOG_OBJECT (demux, "priv data size = %u", stream->codec_priv_size);
+  GST_LOG_OBJECT (demux, "priv data size = %" G_GSIZE_FORMAT,
+      stream->codec_priv_size);
 
   /* need at least 'fLaC' marker + STREAMINFO metadata block */
   if (stream->codec_priv_size < 80) {
@@ -2556,7 +2559,8 @@ gst_matroska_demux_push_xiph_codec_priv_data (GstMatroskaDemux * demux,
   /* start of the stream and vorbis audio or theora video, need to
    * send the codec_priv data as first three packets */
   num_packets = p[0] + 1;
-  GST_DEBUG_OBJECT (demux, "%u stream headers, total length=%u bytes",
+  GST_DEBUG_OBJECT (demux,
+      "%u stream headers, total length=%" G_GSIZE_FORMAT " bytes",
       (guint) num_packets, stream->codec_priv_size);
 
   length = g_alloca (num_packets * sizeof (guint));
@@ -3036,7 +3040,8 @@ gst_matroska_demux_align_buffer (GstMatroskaDemux * demux,
     memcpy (new_data, data, size);
     gst_buffer_unmap (new_buffer, new_data, -1);
     gst_buffer_copy_into (new_buffer, buffer, GST_BUFFER_COPY_METADATA, 0, -1);
-    GST_DEBUG_OBJECT (demux, "We want output aligned on %d, reallocated",
+    GST_DEBUG_OBJECT (demux,
+        "We want output aligned on %" G_GSIZE_FORMAT ", reallocated",
         alignment);
 
     gst_buffer_unmap (buffer, data, size);
@@ -3280,7 +3285,7 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux,
           }
         }
 
-        GST_DEBUG_OBJECT (demux, "CodecState of %u bytes",
+        GST_DEBUG_OBJECT (demux, "CodecState of %" G_GSIZE_FORMAT " bytes",
             stream->codec_state_size);
         break;
       }
@@ -3571,9 +3576,9 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux,
         stream->from_offset = offset;
 
       GST_DEBUG_OBJECT (demux,
-          "Pushing lace %d, data of size %d for stream %d, time=%"
-          GST_TIME_FORMAT " and duration=%" GST_TIME_FORMAT, n,
-          gst_buffer_get_size (sub), stream_num,
+          "Pushing lace %d, data of size %" G_GSIZE_FORMAT
+          " for stream %d, time=%" GST_TIME_FORMAT " and duration=%"
+          GST_TIME_FORMAT, n, gst_buffer_get_size (sub), stream_num,
           GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (sub)),
           GST_TIME_ARGS (GST_BUFFER_DURATION (sub)));
 
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index 442f64e..cfaa724 100644
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -2030,7 +2030,7 @@ gst_matroska_mux_subtitle_pad_setcaps (GstPad * pad, GstCaps * caps)
     gst_buffer_unmap (buf, priv_buffer_data, priv_data_size);
   }
 
-  GST_DEBUG_OBJECT (pad, "codec_id %s, codec data size %u",
+  GST_DEBUG_OBJECT (pad, "codec_id %s, codec data size %" G_GSIZE_FORMAT,
       GST_STR_NULL (context->codec_id), context->codec_priv_size);
 
 exit:
diff --git a/gst/matroska/matroska-parse.c b/gst/matroska/matroska-parse.c
index 94d3640..284e0d6 100644
--- a/gst/matroska/matroska-parse.c
+++ b/gst/matroska/matroska-parse.c
@@ -1246,7 +1246,8 @@ gst_matroska_parse_search_cluster (GstMatroskaParse * parse, gint64 * pos)
     ret = gst_pad_pull_range (parse->common.sinkpad, newpos, chunk, &buf);
     if (ret != GST_FLOW_OK)
       break;
-    GST_DEBUG_OBJECT (parse, "read buffer size %d at offset %" G_GINT64_FORMAT,
+    GST_DEBUG_OBJECT (parse,
+        "read buffer size %" G_GSIZE_FORMAT " at offset %" G_GINT64_FORMAT,
         gst_buffer_get_size (buf), newpos);
     data = gst_buffer_map (buf, &size, NULL, GST_MAP_READ);
     gst_byte_reader_init (&reader, data, size);
@@ -2509,7 +2510,7 @@ gst_matroska_parse_accumulate_streamheader (GstMatroskaParse * parse,
     parse->streamheader = gst_buffer_ref (buffer);
   }
 
-  GST_DEBUG ("%d", gst_buffer_get_size (parse->streamheader));
+  GST_DEBUG ("%" G_GSIZE_FORMAT, gst_buffer_get_size (parse->streamheader));
 }
 
 static GstFlowReturn
diff --git a/gst/matroska/matroska-read-common.c b/gst/matroska/matroska-read-common.c
index 283b12c..67ea678 100644
--- a/gst/matroska/matroska-read-common.c
+++ b/gst/matroska/matroska-read-common.c
@@ -1670,8 +1670,8 @@ gst_matroska_read_common_peek_bytes (GstMatroskaReadCommon * common, guint64
 
   if (gst_buffer_get_size (common->cached_buffer) < size) {
     GST_WARNING_OBJECT (common, "Dropping short buffer at offset %"
-        G_GUINT64_FORMAT ": wanted %u bytes, got %u bytes", common->offset,
-        size, gst_buffer_get_size (common->cached_buffer));
+        G_GUINT64_FORMAT ": wanted %u bytes, got %" G_GSIZE_FORMAT " bytes",
+        common->offset, size, gst_buffer_get_size (common->cached_buffer));
 
     gst_buffer_unref (common->cached_buffer);
     common->cached_buffer = NULL;
diff --git a/gst/multifile/gstmultifilesink.c b/gst/multifile/gstmultifilesink.c
index af19290..107e978 100644
--- a/gst/multifile/gstmultifilesink.c
+++ b/gst/multifile/gstmultifilesink.c
@@ -672,7 +672,7 @@ static gboolean
 buffer_list_calc_size (GstBuffer ** buf, guint idx, gpointer data)
 {
   guint *p_size = data;
-  guint buf_size;
+  gsize buf_size;
 
   buf_size = gst_buffer_get_size (*buf);
   GST_TRACE ("buffer %u has size %" G_GSIZE_FORMAT, idx, buf_size);



More information about the gstreamer-commits mailing list