mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-10 08:35:58 +00:00
Code Issues 1 Projects Releases Wiki Activity

matroska: fix printf format compiler warnings

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=662615
This commit is contained in:
Matej Knopp 2012-01-13 18:12:05 -05:00 committed by Tim-Philipp Müller
parent 7002edbe2b
commit d55f75f6f4
6 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst/matroska/ebml-write.c
View file

@ -178,7 +178,8 @@ gst_ebml_stop_streamheader (GstEbmlWrite * ebml)
buffer = gst_byte_writer_free_and_get_buffer (ebml->streamheader); buffer = gst_byte_writer_free_and_get_buffer (ebml->streamheader);
ebml->streamheader = NULL; 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; ebml->writing_streamheader = FALSE;
return buffer; 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); buffer = gst_byte_writer_free_and_get_buffer (ebml->cache);
ebml->cache = NULL; 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_TIMESTAMP (buffer) = timestamp;
GST_BUFFER_OFFSET (buffer) = ebml->pos - gst_buffer_get_size (buffer); GST_BUFFER_OFFSET (buffer) = ebml->pos - gst_buffer_get_size (buffer);
GST_BUFFER_OFFSET_END (buffer) = ebml->pos; GST_BUFFER_OFFSET_END (buffer) = ebml->pos;

23
gst/matroska/matroska-demux.c
View file

@ -1636,7 +1636,8 @@ gst_matroska_demux_search_cluster (GstMatroskaDemux * demux, gint64 * pos)
ret = gst_pad_pull_range (demux->common.sinkpad, newpos, chunk, &buf); ret = gst_pad_pull_range (demux->common.sinkpad, newpos, chunk, &buf);
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
break; 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); gst_buffer_get_size (buf), newpos);
data = gst_buffer_map (buf, &size, NULL, GST_MAP_READ); data = gst_buffer_map (buf, &size, NULL, GST_MAP_READ);
gst_byte_reader_init (&reader, data, size); gst_byte_reader_init (&reader, data, size);
@ -2470,7 +2471,8 @@ gst_matroska_demux_push_flac_codec_priv_data (GstMatroskaDemux * demux,
guint8 *pdata; guint8 *pdata;
guint off, len; 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; pdata = (guint8 *) stream->codec_priv;
@ -2514,7 +2516,8 @@ gst_matroska_demux_push_speex_codec_priv_data (GstMatroskaDemux * demux,
GstFlowReturn ret; GstFlowReturn ret;
guint8 *pdata = stream->codec_priv; 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 */ /* need at least 'fLaC' marker + STREAMINFO metadata block */
if (stream->codec_priv_size < 80) { 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 /* start of the stream and vorbis audio or theora video, need to
* send the codec_priv data as first three packets */ * send the codec_priv data as first three packets */
num_packets = p[0] + 1; 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); (guint) num_packets, stream->codec_priv_size);
length = g_alloca (num_packets * sizeof (guint)); length = g_alloca (num_packets * sizeof (guint));
@ -3036,7 +3040,8 @@ gst_matroska_demux_align_buffer (GstMatroskaDemux * demux,
memcpy (new_data, data, size); memcpy (new_data, data, size);
gst_buffer_unmap (new_buffer, new_data, -1); gst_buffer_unmap (new_buffer, new_data, -1);
gst_buffer_copy_into (new_buffer, buffer, GST_BUFFER_COPY_METADATA, 0, -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); alignment);
gst_buffer_unmap (buffer, data, size); 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); stream->codec_state_size);
break; break;
} }
@ -3571,9 +3576,9 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux,
stream->from_offset = offset; stream->from_offset = offset;
GST_DEBUG_OBJECT (demux, GST_DEBUG_OBJECT (demux,
"Pushing lace %d, data of size %d for stream %d, time=%" "Pushing lace %d, data of size %" G_GSIZE_FORMAT
GST_TIME_FORMAT " and duration=%" GST_TIME_FORMAT, n, " for stream %d, time=%" GST_TIME_FORMAT " and duration=%"
gst_buffer_get_size (sub), stream_num, GST_TIME_FORMAT, n, gst_buffer_get_size (sub), stream_num,
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (sub)), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (sub)),
GST_TIME_ARGS (GST_BUFFER_DURATION (sub))); GST_TIME_ARGS (GST_BUFFER_DURATION (sub)));

2
gst/matroska/matroska-mux.c
View file

@ -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_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); GST_STR_NULL (context->codec_id), context->codec_priv_size);
exit: exit:

5
gst/matroska/matroska-parse.c
View file

@ -1246,7 +1246,8 @@ gst_matroska_parse_search_cluster (GstMatroskaParse * parse, gint64 * pos)
ret = gst_pad_pull_range (parse->common.sinkpad, newpos, chunk, &buf); ret = gst_pad_pull_range (parse->common.sinkpad, newpos, chunk, &buf);
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
break; 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); gst_buffer_get_size (buf), newpos);
data = gst_buffer_map (buf, &size, NULL, GST_MAP_READ); data = gst_buffer_map (buf, &size, NULL, GST_MAP_READ);
gst_byte_reader_init (&reader, data, size); gst_byte_reader_init (&reader, data, size);
@ -2509,7 +2510,7 @@ gst_matroska_parse_accumulate_streamheader (GstMatroskaParse * parse,
parse->streamheader = gst_buffer_ref (buffer); 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 static GstFlowReturn

4
gst/matroska/matroska-read-common.c
View file

@ -1670,8 +1670,8 @@ gst_matroska_read_common_peek_bytes (GstMatroskaReadCommon * common, guint64
if (gst_buffer_get_size (common->cached_buffer) < size) { if (gst_buffer_get_size (common->cached_buffer) < size) {
GST_WARNING_OBJECT (common, "Dropping short buffer at offset %" GST_WARNING_OBJECT (common, "Dropping short buffer at offset %"
G_GUINT64_FORMAT ": wanted %u bytes, got %u bytes", common->offset, G_GUINT64_FORMAT ": wanted %u bytes, got %" G_GSIZE_FORMAT " bytes",
size, gst_buffer_get_size (common->cached_buffer)); common->offset, size, gst_buffer_get_size (common->cached_buffer));
gst_buffer_unref (common->cached_buffer); gst_buffer_unref (common->cached_buffer);
common->cached_buffer = NULL; common->cached_buffer = NULL;

2
gst/multifile/gstmultifilesink.c
View file

@ -672,7 +672,7 @@ static gboolean
buffer_list_calc_size (GstBuffer ** buf, guint idx, gpointer data) buffer_list_calc_size (GstBuffer ** buf, guint idx, gpointer data)
{ {
guint *p_size = data; guint *p_size = data;
guint buf_size; gsize buf_size;
buf_size = gst_buffer_get_size (*buf); buf_size = gst_buffer_get_size (*buf);
GST_TRACE ("buffer %u has size %" G_GSIZE_FORMAT, idx, buf_size); GST_TRACE ("buffer %u has size %" G_GSIZE_FORMAT, idx, buf_size);