From 5629ed74b30749f7817ef26831825c6e269ee6e4 Mon Sep 17 00:00:00 2001 From: Josep Torra Date: Tue, 9 Aug 2011 16:39:31 +0200 Subject: [PATCH] Fix debug statements Fixes build on MacOSX Signed-off-by: Edward Hervey --- ext/ogg/gstoggaviparse.c | 2 +- ext/ogg/gstoggdemux.c | 4 ++-- ext/ogg/gstoggmux.c | 2 +- ext/ogg/gstoggparse.c | 4 ++-- ext/ogg/gstogmparse.c | 6 +++--- ext/pango/gsttextrender.c | 2 +- ext/theora/gsttheoradec.c | 2 +- ext/vorbis/gstvorbisdec.c | 11 ++++++----- ext/vorbis/gstvorbisenc.c | 4 ++-- gst-libs/gst/audio/gstbaseaudiosink.c | 10 +++++----- gst-libs/gst/riff/riff-media.c | 4 ++-- gst-libs/gst/riff/riff-read.c | 31 ++++++++++++++++--------------- gst-libs/gst/rtp/gstbasertppayload.c | 9 ++++----- gst-libs/gst/tag/gstexiftag.c | 13 +++++++------ gst-libs/gst/tag/gsttagdemux.c | 18 +++++++++--------- gst-libs/gst/video/convertframe.c | 4 ++-- gst-libs/gst/video/gstvideofilter.c | 4 ++-- gst-libs/gst/video/video.h | 2 +- gst/adder/gstadder.c | 4 ++-- gst/audioconvert/gstaudioconvert.c | 3 ++- gst/audioresample/gstaudioresample.c | 15 ++++++++------- gst/playback/gststreamsynchronizer.c | 4 ++-- gst/tcp/gstmultifdsink.c | 9 ++++----- gst/tcp/gsttcp.c | 5 +++-- gst/tcp/gsttcpclientsrc.c | 2 +- gst/tcp/gsttcpserversrc.c | 2 +- gst/videoscale/gstvideoscale.c | 7 ++++--- tests/icles/stress-videooverlay.c | 1 - 28 files changed, 94 insertions(+), 90 deletions(-) diff --git a/ext/ogg/gstoggaviparse.c b/ext/ogg/gstoggaviparse.c index 8abc1f9..3a2b892 100644 --- a/ext/ogg/gstoggaviparse.c +++ b/ext/ogg/gstoggaviparse.c @@ -225,7 +225,7 @@ gst_ogg_avi_parse_setcaps (GstPad * pad, GstCaps * caps) ptr = data; left = size; - GST_LOG_OBJECT (ogg, "configuring codec_data of size %u", left); + GST_LOG_OBJECT (ogg, "configuring codec_data of size %" G_GSIZE_FORMAT, left); /* skip headers */ ptr += 22; diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index 8fb1e59..72e1624 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -1432,8 +1432,8 @@ no_buffer: } write_failed: { - GST_ELEMENT_ERROR (ogg, STREAM, DECODE, - (NULL), ("failed to write %d bytes to the sync buffer", size)); + GST_ELEMENT_ERROR (ogg, STREAM, DECODE, (NULL), + ("failed to write %" G_GSIZE_FORMAT " bytes to the sync buffer", size)); ret = GST_FLOW_ERROR; goto done; } diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c index b33f405..e5e1051 100644 --- a/ext/ogg/gstoggmux.c +++ b/ext/ogg/gstoggmux.c @@ -1053,7 +1053,7 @@ gst_ogg_mux_set_header_on_caps (GstCaps * caps, GList * buffers) walk = walk->next; /* mark buffer */ - GST_LOG ("Setting IN_CAPS on buffer of length %d", + GST_LOG ("Setting IN_CAPS on buffer of length %" G_GSIZE_FORMAT, gst_buffer_get_size (buf)); GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_IN_CAPS); diff --git a/ext/ogg/gstoggparse.c b/ext/ogg/gstoggparse.c index 27738c2..d404b3b 100644 --- a/ext/ogg/gstoggparse.c +++ b/ext/ogg/gstoggparse.c @@ -307,8 +307,8 @@ gst_ogg_parse_submit_buffer (GstOggParse * ogg, GstBuffer * buffer) memcpy (oggbuffer, data, size); if (G_UNLIKELY (ogg_sync_wrote (&ogg->sync, size) < 0)) { - GST_ELEMENT_ERROR (ogg, STREAM, DECODE, - (NULL), ("failed to write %d bytes to the sync buffer", size)); + GST_ELEMENT_ERROR (ogg, STREAM, DECODE, (NULL), + ("failed to write %" G_GSIZE_FORMAT " bytes to the sync buffer", size)); ret = GST_FLOW_ERROR; } diff --git a/ext/ogg/gstogmparse.c b/ext/ogg/gstogmparse.c index 4e9a962..a9da76b 100644 --- a/ext/ogg/gstogmparse.c +++ b/ext/ogg/gstogmparse.c @@ -765,8 +765,8 @@ gst_ogm_parse_data_packet (GstOgmParse * ogm, GstBuffer * buf, xsize = (xsize << 8) | data[n]; } - GST_LOG_OBJECT (ogm, "[0x%02x] samples: %d, hdrbytes: %d, datasize: %d", - data[0], xsize, len, size - len - 1); + GST_LOG_OBJECT (ogm, "[0x%02x] samples: %d, hdrbytes: %d, datasize: %" + G_GSIZE_FORMAT, data[0], xsize, len, size - len - 1); sbuf = gst_buffer_copy_region (buf, GST_BUFFER_COPY_ALL, len + 1, @@ -847,7 +847,7 @@ invalid_startcode: buffer_too_small: { GST_ELEMENT_ERROR (ogm, STREAM, DECODE, (NULL), - ("buffer too small, len+1=%u, size=%u", len + 1, size)); + ("buffer too small, len+1=%u, size=%" G_GSIZE_FORMAT, len + 1, size)); return GST_FLOW_ERROR; } } diff --git a/ext/pango/gsttextrender.c b/ext/pango/gsttextrender.c index 01e453c..a029acb 100644 --- a/ext/pango/gsttextrender.c +++ b/ext/pango/gsttextrender.c @@ -488,7 +488,7 @@ gst_text_render_chain (GstPad * pad, GstBuffer * inbuf) } /* render text */ - GST_DEBUG ("rendering '%*s'", size, data); + GST_DEBUG ("rendering '%*s'", (gint) size, data); pango_layout_set_markup (render->layout, (gchar *) data, size); gst_text_render_render_pangocairo (render); gst_buffer_unmap (inbuf, data, size); diff --git a/ext/theora/gsttheoradec.c b/ext/theora/gsttheoradec.c index cb58c9a..e2c5056 100644 --- a/ext/theora/gsttheoradec.c +++ b/ext/theora/gsttheoradec.c @@ -1548,7 +1548,7 @@ theora_dec_chain_reverse (GstTheoraDec * dec, gboolean discont, GstBuffer * buf) } /* add buffer to gather queue */ - GST_DEBUG_OBJECT (dec, "gathering buffer %p, size %u", buf, + GST_DEBUG_OBJECT (dec, "gathering buffer %p, size %" G_GSIZE_FORMAT, buf, gst_buffer_get_size (buf)); dec->gather = g_list_prepend (dec->gather, buf); diff --git a/ext/vorbis/gstvorbisdec.c b/ext/vorbis/gstvorbisdec.c index 4910c3e..df58a44 100644 --- a/ext/vorbis/gstvorbisdec.c +++ b/ext/vorbis/gstvorbisdec.c @@ -900,8 +900,8 @@ vorbis_handle_data_packet (GstVorbisDec * vd, ogg_packet * packet, goto done; size = sample_count * vd->vi.channels * vd->width; - GST_LOG_OBJECT (vd, "%d samples ready for reading, size %d", sample_count, - size); + GST_LOG_OBJECT (vd, "%d samples ready for reading, size %" G_GSIZE_FORMAT, + sample_count, size); /* alloc buffer for it */ out = gst_buffer_new_and_alloc (size); @@ -923,7 +923,7 @@ vorbis_handle_data_packet (GstVorbisDec * vd, ogg_packet * packet, sample_count, vd->vi.channels, vd->width); #endif - GST_LOG_OBJECT (vd, "setting output size to %d", size); + GST_LOG_OBJECT (vd, "setting output size to %" G_GSIZE_FORMAT, size); gst_buffer_unmap (out, data, size); /* this should not overflow */ @@ -1284,8 +1284,9 @@ vorbis_dec_chain_reverse (GstVorbisDec * vd, gboolean discont, GstBuffer * buf) if (G_LIKELY (buf)) { GST_DEBUG_OBJECT (vd, - "gathering buffer %p of size %u, time %" GST_TIME_FORMAT - ", dur %" GST_TIME_FORMAT, buf, gst_buffer_get_size (buf), + "gathering buffer %p of size %" G_GSIZE_FORMAT + ", time %" GST_TIME_FORMAT ", dur %" GST_TIME_FORMAT, + buf, gst_buffer_get_size (buf), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)), GST_TIME_ARGS (GST_BUFFER_DURATION (buf))); diff --git a/ext/vorbis/gstvorbisenc.c b/ext/vorbis/gstvorbisenc.c index 7d216c0..9862684 100644 --- a/ext/vorbis/gstvorbisenc.c +++ b/ext/vorbis/gstvorbisenc.c @@ -841,7 +841,7 @@ gst_vorbis_enc_buffer_from_packet (GstVorbisEnc * vorbisenc, vorbisenc->next_discont = FALSE; } - GST_LOG_OBJECT (vorbisenc, "encoded buffer of %d bytes", + GST_LOG_OBJECT (vorbisenc, "encoded buffer of %" G_GSIZE_FORMAT " bytes", gst_buffer_get_size (outbuf)); return outbuf; } @@ -861,7 +861,7 @@ gst_vorbis_enc_buffer_from_header_packet (GstVorbisEnc * vorbisenc, GST_BUFFER_TIMESTAMP (outbuf) = GST_CLOCK_TIME_NONE; GST_BUFFER_DURATION (outbuf) = GST_CLOCK_TIME_NONE; - GST_DEBUG ("created header packet buffer, %d bytes", + GST_DEBUG ("created header packet buffer, %" G_GSIZE_FORMAT " bytes", gst_buffer_get_size (outbuf)); return outbuf; } diff --git a/gst-libs/gst/audio/gstbaseaudiosink.c b/gst-libs/gst/audio/gstbaseaudiosink.c index 288f355..9d6df37 100644 --- a/gst-libs/gst/audio/gstbaseaudiosink.c +++ b/gst-libs/gst/audio/gstbaseaudiosink.c @@ -1429,9 +1429,8 @@ gst_base_audio_sink_render (GstBaseSink * bsink, GstBuffer * buf) if (!GST_CLOCK_TIME_IS_VALID (time)) { render_start = gst_base_audio_sink_get_offset (sink); render_stop = render_start + samples; - GST_DEBUG_OBJECT (sink, - "Buffer of size %u has no time. Using render_start=%" G_GUINT64_FORMAT, - size, render_start); + GST_DEBUG_OBJECT (sink, "Buffer of size %" G_GSIZE_FORMAT " has no time." + " Using render_start=%" G_GUINT64_FORMAT, size, render_start); /* we don't have a start so we don't know stop either */ stop = -1; goto no_sync; @@ -1783,7 +1782,7 @@ gst_base_audio_sink_callback (GstRingBuffer * rbuf, guint8 * data, guint len, /* would be nice to arrange for pad_alloc_buffer to return data -- as it is we will copy twice, once into data, once into DMA */ - GST_LOG_OBJECT (basesink, "pulling %d bytes offset %" G_GUINT64_FORMAT + GST_LOG_OBJECT (basesink, "pulling %u bytes offset %" G_GUINT64_FORMAT " to fill audio buffer", len, basesink->offset); ret = gst_pad_pull_range (basesink->sinkpad, basesink->segment.position, len, @@ -1809,7 +1808,8 @@ gst_base_audio_sink_callback (GstRingBuffer * rbuf, guint8 * data, guint len, if (len != size) { GST_INFO_OBJECT (basesink, - "got different size than requested from sink pad: %u != %u", len, size); + "got different size than requested from sink pad: %u" + " != %" G_GSIZE_FORMAT, len, size); len = MIN (size, len); } diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c index 7d4c148..262c558 100644 --- a/gst-libs/gst/riff/riff-media.c +++ b/gst-libs/gst/riff/riff-media.c @@ -1476,8 +1476,8 @@ gst_riff_create_audio_caps (guint16 codec_id, size = gst_buffer_get_size (strf_data); if (strf_data == NULL || size < 22) { - GST_WARNING ("WAVE_FORMAT_EXTENSIBLE data size is %d (expected: 22)", - (strf_data) ? size : -1); + GST_WARNING ("WAVE_FORMAT_EXTENSIBLE data size is %" G_GSIZE_FORMAT + " (expected: 22)", (strf_data) ? size : -1); return NULL; } diff --git a/gst-libs/gst/riff/riff-read.c b/gst-libs/gst/riff/riff-read.c index 5fc6df5..ab37e39 100644 --- a/gst-libs/gst/riff/riff-read.c +++ b/gst-libs/gst/riff/riff-read.c @@ -102,8 +102,8 @@ skip_junk: too_small: { /* short read, we return UNEXPECTED to mark the EOS case */ - GST_DEBUG_OBJECT (element, "not enough data (available=%u, needed=%u)", - gst_buffer_get_size (buf), size); + GST_DEBUG_OBJECT (element, "not enough data (available=%" G_GSIZE_FORMAT + ", needed=%u)", gst_buffer_get_size (buf), size); gst_buffer_unref (buf); return GST_FLOW_UNEXPECTED; } @@ -249,8 +249,8 @@ gst_riff_parse_file_header (GstElement * element, too_small: { GST_ELEMENT_ERROR (element, STREAM, WRONG_TYPE, (NULL), - ("Not enough data to parse RIFF header (%d available, %d needed)", - size, 12)); + ("Not enough data to parse RIFF header (%" G_GSIZE_FORMAT " available," + " %d needed)", size, 12)); gst_buffer_unmap (buf, data, size); gst_buffer_unref (buf); return FALSE; @@ -345,7 +345,7 @@ gst_riff_parse_strh (GstElement * element, too_small: { GST_ERROR_OBJECT (element, - "Too small strh (%d available, %d needed)", + "Too small strh (%" G_GSIZE_FORMAT " available, %d needed)", size, (int) sizeof (gst_riff_strh)); gst_buffer_unmap (buf, data, size); gst_buffer_unref (buf); @@ -407,8 +407,8 @@ gst_riff_parse_strf_vids (GstElement * element, *data = NULL; if (strf->size > size) { GST_WARNING_OBJECT (element, - "strf_vids header gave %d bytes data, only %d available", - strf->size, size); + "strf_vids header gave %d bytes data, only %" G_GSIZE_FORMAT + " available", strf->size, size); strf->size = size; } if (sizeof (gst_riff_strf_vids) < size) { @@ -433,7 +433,7 @@ gst_riff_parse_strf_vids (GstElement * element, GST_INFO_OBJECT (element, " num_colors %d", strf->num_colors); GST_INFO_OBJECT (element, " imp_colors %d", strf->imp_colors); if (*data) - GST_INFO_OBJECT (element, " %d bytes extradata", + GST_INFO_OBJECT (element, " %" G_GSIZE_FORMAT " bytes extradata", gst_buffer_get_size (*data)); *_strf = strf; @@ -444,7 +444,7 @@ gst_riff_parse_strf_vids (GstElement * element, too_small: { GST_ERROR_OBJECT (element, - "Too small strf_vids (%d available, %d needed)", + "Too small strf_vids (%" G_GSIZE_FORMAT " available, %d needed)", size, (int) sizeof (gst_riff_strf_vids)); gst_buffer_unmap (buf, data, size); gst_buffer_unref (buf); @@ -522,7 +522,7 @@ gst_riff_parse_strf_auds (GstElement * element, GST_INFO_OBJECT (element, " blockalign %d", strf->blockalign); GST_INFO_OBJECT (element, " size %d", strf->size); if (*data) - GST_INFO_OBJECT (element, " %d bytes extradata", + GST_INFO_OBJECT (element, " %" G_GSIZE_FORMAT " bytes extradata", gst_buffer_get_size (*data)); gst_buffer_unmap (buf, bdata, bsize); @@ -536,8 +536,8 @@ gst_riff_parse_strf_auds (GstElement * element, too_small: { GST_ERROR_OBJECT (element, - "Too small strf_auds (%d available, %" G_GSSIZE_FORMAT " needed)", - bsize, sizeof (gst_riff_strf_auds)); + "Too small strf_auds (%" G_GSIZE_FORMAT " available" + ", %" G_GSSIZE_FORMAT " needed)", bsize, sizeof (gst_riff_strf_auds)); gst_buffer_unmap (buf, bdata, bsize); gst_buffer_unref (buf); return FALSE; @@ -613,8 +613,8 @@ gst_riff_parse_strf_iavs (GstElement * element, too_small: { GST_ERROR_OBJECT (element, - "Too small strf_iavs (%d available, %" G_GSSIZE_FORMAT " needed)", - bsize, sizeof (gst_riff_strf_iavs)); + "Too small strf_iavs (%" G_GSIZE_FORMAT "available" + ", %" G_GSSIZE_FORMAT " needed)", bsize, sizeof (gst_riff_strf_iavs)); gst_buffer_unmap (buf, bdata, bsize); gst_buffer_unref (buf); return FALSE; @@ -666,7 +666,8 @@ gst_riff_parse_info (GstElement * element, if (tsize > left) { GST_WARNING_OBJECT (element, - "Tagsize %d is larger than available data %d", tsize, left); + "Tagsize %d is larger than available data %" G_GSIZE_FORMAT, + tsize, left); tsize = left; } diff --git a/gst-libs/gst/rtp/gstbasertppayload.c b/gst-libs/gst/rtp/gstbasertppayload.c index 8b87f68..112f9a4 100644 --- a/gst-libs/gst/rtp/gstbasertppayload.c +++ b/gst-libs/gst/rtp/gstbasertppayload.c @@ -815,11 +815,10 @@ gst_basertppayload_prepare_push (GstBaseRTPPayload * payload, priv->next_seqnum = data.seqnum; payload->timestamp = data.rtptime; - GST_LOG_OBJECT (payload, - "Preparing to push packet with size %d, seq=%d, rtptime=%u, timestamp %" - GST_TIME_FORMAT, (is_list) ? -1 : - gst_buffer_get_size (GST_BUFFER (obj)), payload->seqnum, data.rtptime, - GST_TIME_ARGS (data.timestamp)); + GST_LOG_OBJECT (payload, "Preparing to push packet with size %" + G_GSIZE_FORMAT ", seq=%d, rtptime=%u, timestamp %" GST_TIME_FORMAT, + (is_list) ? -1 : gst_buffer_get_size (GST_BUFFER (obj)), + payload->seqnum, data.rtptime, GST_TIME_ARGS (data.timestamp)); if (g_atomic_int_compare_and_exchange (&payload->priv-> notified_first_timestamp, 1, 0)) { diff --git a/gst-libs/gst/tag/gstexiftag.c b/gst-libs/gst/tag/gstexiftag.c index 0acc77c..ac13520 100644 --- a/gst-libs/gst/tag/gstexiftag.c +++ b/gst-libs/gst/tag/gstexiftag.c @@ -1180,8 +1180,8 @@ parse_exif_ascii_tag (GstExifReader * reader, const GstExifTagMatch * tag, data = gst_buffer_map (reader->buffer, &size, NULL, GST_MAP_READ); if (real_offset >= size) { - GST_WARNING ("Invalid offset %u for buffer of size %u, not adding tag %s", - real_offset, size, tag->gst_tag); + GST_WARNING ("Invalid offset %u for buffer of size %" G_GSIZE_FORMAT + ", not adding tag %s", real_offset, size, tag->gst_tag); gst_buffer_unmap (reader->buffer, data, size); return; } @@ -1262,8 +1262,8 @@ parse_exif_undefined_tag (GstExifReader * reader, const GstExifTagMatch * tag, bdata = gst_buffer_map (reader->buffer, &bsize, NULL, GST_MAP_READ); if (real_offset >= bsize) { - GST_WARNING ("Invalid offset %u for buffer of size %u, not adding tag %s", - real_offset, bsize, tag->gst_tag); + GST_WARNING ("Invalid offset %u for buffer of size %" G_GSIZE_FORMAT + ", not adding tag %s", real_offset, bsize, tag->gst_tag); gst_buffer_unmap (reader->buffer, bdata, bsize); return; } @@ -1329,7 +1329,8 @@ exif_reader_read_rational_tag (GstExifReader * exif_reader, data = gst_buffer_map (exif_reader->buffer, &size, NULL, GST_MAP_READ); if (real_offset >= size) { - GST_WARNING ("Invalid offset %u for buffer of size %u", real_offset, size); + GST_WARNING ("Invalid offset %u for buffer of size %" G_GSIZE_FORMAT, + real_offset, size); goto reader_fail; } @@ -1830,7 +1831,7 @@ gst_tag_list_from_exif_buffer_with_tiff_header (GstBuffer * buffer) data = gst_buffer_map (buffer, &size, NULL, GST_MAP_READ); - GST_LOG ("Parsing exif tags with tiff header of size %u", size); + GST_LOG ("Parsing exif tags with tiff header of size %" G_GSIZE_FORMAT, size); gst_byte_reader_init (&reader, data, size); diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c index 3e25088..ab4bbc4 100644 --- a/gst-libs/gst/tag/gsttagdemux.c +++ b/gst-libs/gst/tag/gsttagdemux.c @@ -619,7 +619,7 @@ gst_tag_demux_chain (GstPad * pad, GstBuffer * buf) TYPE_FIND_MIN_SIZE + demux->priv->strip_start) break; /* Go get more data first */ - GST_DEBUG_OBJECT (demux, "Typefinding with size %d", + GST_DEBUG_OBJECT (demux, "Typefinding with size %" G_GSIZE_FORMAT, demux->priv->collect_size); /* Trim the buffer and adjust offset for typefinding */ @@ -914,8 +914,8 @@ gst_tag_demux_pull_end_tag (GstTagDemux * demux, GstTagList ** tags) bsize = gst_buffer_get_size (buffer); if (bsize < klass->min_end_size) { - GST_DEBUG_OBJECT (demux, "Only managed to read %u bytes from file " - "(required: %u bytes)", bsize, klass->min_end_size); + GST_DEBUG_OBJECT (demux, "Only managed to read %" G_GSIZE_FORMAT " bytes" + "from file (required: %u bytes)", bsize, klass->min_end_size); goto done; } @@ -956,8 +956,8 @@ gst_tag_demux_pull_end_tag (GstTagDemux * demux, GstTagList ** tags) bsize = gst_buffer_get_size (buffer); if (bsize < tagsize) { - GST_DEBUG_OBJECT (demux, "Only managed to read %u bytes from file", - bsize); + GST_DEBUG_OBJECT (demux, "Only managed to read %" G_GSIZE_FORMAT + " bytes from file", bsize); goto done; } } @@ -1043,8 +1043,8 @@ gst_tag_demux_pull_start_tag (GstTagDemux * demux, GstTagList ** tags) bsize = gst_buffer_get_size (buffer); if (bsize < klass->min_start_size) { - GST_DEBUG_OBJECT (demux, "Only managed to read %u bytes from file - " - "no tag in this file", bsize); + GST_DEBUG_OBJECT (demux, "Only managed to read %" G_GSIZE_FORMAT + " bytes from file - no tag in this file", bsize); goto done; } @@ -1080,8 +1080,8 @@ gst_tag_demux_pull_start_tag (GstTagDemux * demux, GstTagList ** tags) bsize = gst_buffer_get_size (buffer); if (bsize < tagsize) { - GST_DEBUG_OBJECT (demux, "Only managed to read %u bytes from file", - bsize); + GST_DEBUG_OBJECT (demux, "Only managed to read %" G_GSIZE_FORMAT + " bytes from file", bsize); GST_ELEMENT_ERROR (demux, STREAM, DECODE, (_("Failed to read tag: not enough data")), (NULL)); goto done; diff --git a/gst-libs/gst/video/convertframe.c b/gst-libs/gst/video/convertframe.c index c752c70..a71efd8 100644 --- a/gst-libs/gst/video/convertframe.c +++ b/gst-libs/gst/video/convertframe.c @@ -289,8 +289,8 @@ gst_video_convert_frame (GstBuffer * buf, GstCaps * from_caps, gst_element_set_state (pipeline, GST_STATE_PAUSED); /* feed buffer in appsrc */ - GST_DEBUG ("feeding buffer %p, size %u, caps %" GST_PTR_FORMAT, - buf, gst_buffer_get_size (buf), from_caps); + GST_DEBUG ("feeding buffer %p, size %" G_GSIZE_FORMAT ", caps %" + GST_PTR_FORMAT, buf, gst_buffer_get_size (buf), from_caps); g_signal_emit_by_name (src, "push-buffer", buf, &ret); /* now see what happens. We either got an error somewhere or the pipeline diff --git a/gst-libs/gst/video/gstvideofilter.c b/gst-libs/gst/video/gstvideofilter.c index 81ad9ba..16b0cb2 100644 --- a/gst-libs/gst/video/gstvideofilter.c +++ b/gst-libs/gst/video/gstvideofilter.c @@ -86,8 +86,8 @@ gst_video_filter_get_unit_size (GstBaseTransform * btrans, GstCaps * caps, *size = info.size; - GST_DEBUG_OBJECT (btrans, "Returning size %u bytes for caps %" - GST_PTR_FORMAT, *size, caps); + GST_DEBUG_OBJECT (btrans, "Returning size %" G_GSIZE_FORMAT " bytes" + "for caps %" GST_PTR_FORMAT, *size, caps); return TRUE; } diff --git a/gst-libs/gst/video/video.h b/gst-libs/gst/video/video.h index dfad7b6..6fa1ec7 100644 --- a/gst-libs/gst/video/video.h +++ b/gst-libs/gst/video/video.h @@ -356,7 +356,7 @@ struct _GstVideoInfo { GstVideoFlags flags; gint width; gint height; - guint size; + gsize size; const gchar *color_matrix; const gchar *chroma_site; diff --git a/gst/adder/gstadder.c b/gst/adder/gstadder.c index df1d3a7..4502609 100644 --- a/gst/adder/gstadder.c +++ b/gst/adder/gstadder.c @@ -1158,8 +1158,8 @@ gst_adder_collected (GstCollectPads * pads, gpointer user_data) * asked for the max size above */ g_assert (insize == outsize); - GST_LOG_OBJECT (adder, "channel %p: mixing %d bytes from data %p", - collect_data, insize, indata); + GST_LOG_OBJECT (adder, "channel %p: mixing %" G_GSIZE_FORMAT " bytes" + " from data %p", collect_data, insize, indata); /* further buffers, need to add them */ adder->func ((gpointer) outdata, (gpointer) indata, diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c index 99ad1a2..1562088 100644 --- a/gst/audioconvert/gstaudioconvert.c +++ b/gst/audioconvert/gstaudioconvert.c @@ -1143,7 +1143,8 @@ wrong_size: { GST_ELEMENT_ERROR (this, STREAM, FORMAT, (NULL), - ("input/output buffers are of wrong size in: %d < %d or out: %d < %d", + ("input/output buffers are of wrong size in: %" G_GSIZE_FORMAT " < %d" + " or out: %" G_GSIZE_FORMAT " < %d", srcsize, insize, dstsize, outsize)); ret = GST_FLOW_ERROR; goto done; diff --git a/gst/audioresample/gstaudioresample.c b/gst/audioresample/gstaudioresample.c index 3884a33..e44190f 100644 --- a/gst/audioresample/gstaudioresample.c +++ b/gst/audioresample/gstaudioresample.c @@ -535,8 +535,8 @@ gst_audio_resample_transform_size (GstBaseTransform * base, gint inrate, outrate, gcd; gint bytes_per_samp, channels; - GST_LOG_OBJECT (base, "asked to transform size %d in direction %s", - size, direction == GST_PAD_SINK ? "SINK" : "SRC"); + GST_LOG_OBJECT (base, "asked to transform size %" G_GSIZE_FORMAT + " in direction %s", size, direction == GST_PAD_SINK ? "SINK" : "SRC"); /* Get sample width -> bytes_per_samp, channels, inrate, outrate */ ret = @@ -567,8 +567,9 @@ gst_audio_resample_transform_size (GstBaseTransform * base, *othersize *= bytes_per_samp; } - GST_LOG_OBJECT (base, "transformed size %d to %d", size * bytes_per_samp, - *othersize); + GST_LOG_OBJECT (base, + "transformed size %" G_GSIZE_FORMAT " to %" G_GSIZE_FORMAT, + size * bytes_per_samp, *othersize); return ret; } @@ -1162,9 +1163,9 @@ gst_audio_resample_process (GstAudioResample * resample, GstBuffer * inbuf, GST_LOG_OBJECT (resample, "Converted to buffer of %" G_GUINT32_FORMAT - " samples (%u bytes) with timestamp %" GST_TIME_FORMAT ", duration %" - GST_TIME_FORMAT ", offset %" G_GUINT64_FORMAT ", offset_end %" - G_GUINT64_FORMAT, out_processed, out_size, + " samples (%" G_GSIZE_FORMAT " bytes) with timestamp %" GST_TIME_FORMAT + ", duration %" GST_TIME_FORMAT ", offset %" G_GUINT64_FORMAT + ", offset_end %" G_GUINT64_FORMAT, out_processed, out_size, GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)), GST_TIME_ARGS (GST_BUFFER_DURATION (outbuf)), GST_BUFFER_OFFSET (outbuf), GST_BUFFER_OFFSET_END (outbuf)); diff --git a/gst/playback/gststreamsynchronizer.c b/gst/playback/gststreamsynchronizer.c index aed51c0..00aeda3 100644 --- a/gst/playback/gststreamsynchronizer.c +++ b/gst/playback/gststreamsynchronizer.c @@ -560,8 +560,8 @@ gst_stream_synchronizer_sink_chain (GstPad * pad, GstBuffer * buffer) goto done; } - GST_LOG_OBJECT (pad, "Handling buffer %p: size=%u, timestamp=%" - GST_TIME_FORMAT " duration=%" GST_TIME_FORMAT + GST_LOG_OBJECT (pad, "Handling buffer %p: size=%" G_GSIZE_FORMAT + ", timestamp=%" GST_TIME_FORMAT " duration=%" GST_TIME_FORMAT " offset=%" G_GUINT64_FORMAT " offset_end=%" G_GUINT64_FORMAT, buffer, gst_buffer_get_size (buffer), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer)), diff --git a/gst/tcp/gstmultifdsink.c b/gst/tcp/gstmultifdsink.c index 7f40e35..e4e6310 100644 --- a/gst/tcp/gstmultifdsink.c +++ b/gst/tcp/gstmultifdsink.c @@ -1391,7 +1391,7 @@ gst_multi_fd_sink_client_queue_buffer (GstMultiFdSink * sink, g_assert (G_VALUE_TYPE (bufval) == GST_TYPE_BUFFER); buffer = g_value_peek_pointer (bufval); GST_DEBUG_OBJECT (sink, - "[fd %5d] queueing streamheader buffer of length %d", + "[fd %5d] queueing streamheader buffer of length %" G_GSIZE_FORMAT, client->fd.fd, gst_buffer_get_size (buffer)); gst_buffer_ref (buffer); @@ -1403,7 +1403,7 @@ gst_multi_fd_sink_client_queue_buffer (GstMultiFdSink * sink, gst_caps_unref (caps); caps = NULL; - GST_LOG_OBJECT (sink, "[fd %5d] queueing buffer of length %d", + GST_LOG_OBJECT (sink, "[fd %5d] queueing buffer of length %" G_GSIZE_FORMAT, client->fd.fd, gst_buffer_get_size (buffer)); gst_buffer_ref (buffer); @@ -2560,9 +2560,8 @@ gst_multi_fd_sink_render (GstBaseSink * bsink, GstBuffer * buf) * We don't send the buffer to the client, since streamheaders are sent * separately when necessary. */ if (in_caps) { - GST_DEBUG_OBJECT (sink, - "appending IN_CAPS buffer with length %d to streamheader", - gst_buffer_get_size (buf)); + GST_DEBUG_OBJECT (sink, "appending IN_CAPS buffer with length %" + G_GSIZE_FORMAT " to streamheader", gst_buffer_get_size (buf)); sink->streamheader = g_slist_append (sink->streamheader, buf); } else { /* queue the buffer, this is a regular data buffer. */ diff --git a/gst/tcp/gsttcp.c b/gst/tcp/gsttcp.c index 471b217..f1b83a4 100644 --- a/gst/tcp/gsttcp.c +++ b/gst/tcp/gsttcp.c @@ -226,7 +226,7 @@ gst_tcp_read_buffer (GstElement * this, int socket, GstPoll * fdset, GstBuffer ** buf) { int ret; - ssize_t bytes_read; + gssize bytes_read; int readsize; guint8 *data; @@ -263,7 +263,8 @@ gst_tcp_read_buffer (GstElement * this, int socket, GstPoll * fdset, /* but mom, you promised to give me readsize bytes! */ goto short_read; - GST_LOG_OBJECT (this, "returning buffer of size %d", bytes_read); + GST_LOG_OBJECT (this, + "returning buffer of size %" G_GSSIZE_FORMAT, bytes_read); return GST_FLOW_OK; /* ERRORS */ diff --git a/gst/tcp/gsttcpclientsrc.c b/gst/tcp/gsttcpclientsrc.c index acd54cd..3a83fba 100644 --- a/gst/tcp/gsttcpclientsrc.c +++ b/gst/tcp/gsttcpclientsrc.c @@ -195,7 +195,7 @@ gst_tcp_client_src_create (GstPushSrc * psrc, GstBuffer ** outbuf) if (ret == GST_FLOW_OK) { GST_LOG_OBJECT (src, - "Returning buffer from _get of size %d, ts %" + "Returning buffer from _get of size %" G_GSIZE_FORMAT ", ts %" GST_TIME_FORMAT ", dur %" GST_TIME_FORMAT ", offset %" G_GINT64_FORMAT ", offset_end %" G_GINT64_FORMAT, gst_buffer_get_size (*outbuf), diff --git a/gst/tcp/gsttcpserversrc.c b/gst/tcp/gsttcpserversrc.c index 4575441..786557e 100644 --- a/gst/tcp/gsttcpserversrc.c +++ b/gst/tcp/gsttcpserversrc.c @@ -198,7 +198,7 @@ restart: if (ret == GST_FLOW_OK) { GST_LOG_OBJECT (src, - "Returning buffer from _get of size %d, ts %" + "Returning buffer from _get of size %" G_GSIZE_FORMAT ", ts %" GST_TIME_FORMAT ", dur %" GST_TIME_FORMAT ", offset %" G_GINT64_FORMAT ", offset_end %" G_GINT64_FORMAT, gst_buffer_get_size (*outbuf), diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c index 8ab4dc6..06e4681 100644 --- a/gst/videoscale/gstvideoscale.c +++ b/gst/videoscale/gstvideoscale.c @@ -430,8 +430,9 @@ gst_video_scale_set_caps (GstBaseTransform * trans, GstCaps * in, GstCaps * out) gst_base_transform_set_passthrough (trans, (in_info.width == out_info.width && in_info.height == out_info.height)); - GST_DEBUG_OBJECT (videoscale, "from=%dx%d (par=%d/%d dar=%d/%d), size %d " - "-> to=%dx%d (par=%d/%d dar=%d/%d borders=%d:%d), size %d", + GST_DEBUG_OBJECT (videoscale, "from=%dx%d (par=%d/%d dar=%d/%d), size %" + G_GSIZE_FORMAT " -> to=%dx%d (par=%d/%d dar=%d/%d borders=%d:%d), " + "size %" G_GSIZE_FORMAT, in_info.width, in_info.height, out_info.par_n, out_info.par_d, from_dar_n, from_dar_d, in_info.size, out_info.width, out_info.height, out_info.par_n, out_info.par_d, to_dar_n, to_dar_d, @@ -1248,7 +1249,7 @@ gst_video_scale_transform (GstBaseTransform * trans, GstBuffer * in, goto unsupported; } - GST_LOG_OBJECT (videoscale, "pushing buffer of %d bytes", + GST_LOG_OBJECT (videoscale, "pushing buffer of %" G_GSIZE_FORMAT " bytes", gst_buffer_get_size (out)); done: diff --git a/tests/icles/stress-videooverlay.c b/tests/icles/stress-videooverlay.c index eadb7c5..bcbe7dc 100644 --- a/tests/icles/stress-videooverlay.c +++ b/tests/icles/stress-videooverlay.c @@ -142,7 +142,6 @@ cycle_window (GstVideoOverlay * ov) static GstBusSyncReply create_window (GstBus * bus, GstMessage * message, GstPipeline * pipeline) { - const GstStructure *s; GstVideoOverlay *ov = NULL; if (!gst_is_video_overlay_prepare_window_handle_message (message)) -- 2.7.4