diff --git a/configure.ac b/configure.ac index 3910086cf2..9a2409cd35 100644 --- a/configure.ac +++ b/configure.ac @@ -318,7 +318,8 @@ GST_PLUGINS_NONPORTED="deinterlace flx goom2k1 \ videobox videomixer \ cairo cairo_gobject dv1394 gdk_pixbuf libdv libpng \ oss oss4 shout2 \ - taglib wavpack " + taglib wavpack \ + osx_video osx_audio " AC_SUBST(GST_PLUGINS_NONPORTED) dnl these are all the gst plug-ins, compilable without additional libs diff --git a/gst/alpha/gstalpha.c b/gst/alpha/gstalpha.c index 0edaf6d2bb..a97c6812a7 100644 --- a/gst/alpha/gstalpha.c +++ b/gst/alpha/gstalpha.c @@ -445,8 +445,9 @@ gst_alpha_get_unit_size (GstBaseTransform * btrans, *size = info.size; - GST_DEBUG_OBJECT (btrans, "unit size = %d for format %s w %d height %d", - *size, GST_VIDEO_INFO_NAME (&info), GST_VIDEO_INFO_WIDTH (&info), + GST_DEBUG_OBJECT (btrans, + "unit size = %" G_GSIZE_FORMAT " for format %s w %d height %d", *size, + GST_VIDEO_INFO_NAME (&info), GST_VIDEO_INFO_WIDTH (&info), GST_VIDEO_INFO_HEIGHT (&info)); return TRUE; diff --git a/gst/audiofx/audiofxbasefirfilter.c b/gst/audiofx/audiofxbasefirfilter.c index ff64e19f23..5022af5342 100644 --- a/gst/audiofx/audiofxbasefirfilter.c +++ b/gst/audiofx/audiofxbasefirfilter.c @@ -717,7 +717,8 @@ gst_audio_fx_base_fir_filter_push_residue (GstAudioFXBaseFIRFilter * self) GST_BUFFER_OFFSET_END (outbuf) = GST_BUFFER_OFFSET (outbuf) + outsamples; } - GST_DEBUG_OBJECT (self, "Pushing residue buffer of size %d with timestamp: %" + GST_DEBUG_OBJECT (self, + "Pushing residue buffer of size %" G_GSIZE_FORMAT " with timestamp: %" GST_TIME_FORMAT ", duration: %" GST_TIME_FORMAT ", offset: %" G_GUINT64_FORMAT ", offset_end: %" G_GUINT64_FORMAT ", nsamples_out: %d", gst_buffer_get_size (outbuf), @@ -902,7 +903,8 @@ gst_audio_fx_base_fir_filter_transform (GstBaseTransform * base, GST_BUFFER_OFFSET_END (outbuf) = GST_BUFFER_OFFSET_NONE; } - GST_DEBUG_OBJECT (self, "Pushing buffer of size %d with timestamp: %" + GST_DEBUG_OBJECT (self, + "Pushing buffer of size %" G_GSIZE_FORMAT " with timestamp: %" GST_TIME_FORMAT ", duration: %" GST_TIME_FORMAT ", offset: %" G_GUINT64_FORMAT ", offset_end: %" G_GUINT64_FORMAT ", nsamples_out: %d", gst_buffer_get_size (outbuf), diff --git a/gst/audioparsers/gstdcaparse.c b/gst/audioparsers/gstdcaparse.c index 7ebbc701fe..4aa071c186 100644 --- a/gst/audioparsers/gstdcaparse.c +++ b/gst/audioparsers/gstdcaparse.c @@ -391,8 +391,9 @@ gst_dca_parse_check_valid_frame (GstBaseParse * parse, } else { /* FIXME: baseparse always seems to hand us buffers of min_frame_size * bytes, which is unhelpful here */ - GST_LOG_OBJECT (dcaparse, "next sync out of reach (%u < %u)", - bufsize, size + 16); + GST_LOG_OBJECT (dcaparse, + "next sync out of reach (%" G_GSIZE_FORMAT " < %u)", bufsize, + size + 16); /* *skipsize = 0; */ /* return FALSE; */ } diff --git a/gst/audioparsers/gstflacparse.c b/gst/audioparsers/gstflacparse.c index 3935169ce8..c91e3c0642 100644 --- a/gst/audioparsers/gstflacparse.c +++ b/gst/audioparsers/gstflacparse.c @@ -770,7 +770,7 @@ gst_flac_parse_check_valid_frame (GstBaseParse * parse, goto cleanup; } else { GST_ERROR_OBJECT (flacparse, - "Giving up on invalid frame (%d bytes)", bufsize); + "Giving up on invalid frame (%" G_GSIZE_FORMAT " bytes)", bufsize); result = FALSE; goto cleanup; } @@ -815,8 +815,8 @@ gst_flac_parse_handle_streaminfo (GstFlacParse * flacparse, GstBuffer * buffer) gst_bit_reader_init (&reader, data, size); if (size != 4 + 34) { - GST_ERROR_OBJECT (flacparse, "Invalid metablock size for STREAMINFO: %u", - size); + GST_ERROR_OBJECT (flacparse, + "Invalid metablock size for STREAMINFO: %" G_GSIZE_FORMAT "", size); goto failure; } diff --git a/gst/auparse/gstauparse.c b/gst/auparse/gstauparse.c index 6fc5b01498..7c1734bcdc 100644 --- a/gst/auparse/gstauparse.c +++ b/gst/auparse/gstauparse.c @@ -406,7 +406,8 @@ gst_au_parse_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) auparse = GST_AU_PARSE (parent); - GST_LOG_OBJECT (auparse, "got buffer of size %u", gst_buffer_get_size (buf)); + GST_LOG_OBJECT (auparse, "got buffer of size %" G_GSIZE_FORMAT, + gst_buffer_get_size (buf)); gst_adapter_push (auparse->adapter, buf); buf = NULL; diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index 5f1f8afb79..eeab3567ca 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -1161,7 +1161,7 @@ no_buffer: avih_too_small: { GST_ELEMENT_ERROR (avi, STREAM, DEMUX, (NULL), - ("Too small avih (%d available, %d needed)", + ("Too small avih (%" G_GSIZE_FORMAT " available, %d needed)", size, (int) sizeof (gst_riff_avih))); gst_buffer_unref (buf); return FALSE; @@ -1242,7 +1242,8 @@ gst_avi_demux_parse_superindex (GstAviDemux * avi, too_small: { GST_ERROR_OBJECT (avi, - "Not enough data to parse superindex (%d available, 24 needed)", size); + "Not enough data to parse superindex (%" G_GSIZE_FORMAT + " available, 24 needed)", size); if (buf) { gst_buffer_unmap (buf, data, size); gst_buffer_unref (buf); @@ -1528,7 +1529,8 @@ done: too_small: { GST_ERROR_OBJECT (avi, - "Not enough data to parse subindex (%d available, 24 needed)", size); + "Not enough data to parse subindex (%" G_GSIZE_FORMAT + " available, 24 needed)", size); goto done; /* continue */ } not_implemented: @@ -1802,7 +1804,7 @@ gst_avi_demux_riff_parse_vprp (GstElement * element, too_small: { GST_ERROR_OBJECT (element, - "Too small vprp (%d available, at least %d needed)", + "Too small vprp (%" G_GSIZE_FORMAT " available, at least %d needed)", size, (int) G_STRUCT_OFFSET (gst_riff_vprp, field_info)); gst_buffer_unref (buf); return FALSE; @@ -1853,7 +1855,8 @@ gst_avi_demux_roundup_list (GstAviDemux * avi, GstBuffer ** buf) GstBuffer *obuf; guint8 *data; - GST_DEBUG_OBJECT (avi, "rounding up dubious list size %d", size); + GST_DEBUG_OBJECT (avi, "rounding up dubious list size %" G_GSIZE_FORMAT, + size); obuf = gst_buffer_new_and_alloc (size + 1); data = gst_buffer_map (obuf, NULL, NULL, GST_MAP_WRITE); @@ -2336,7 +2339,7 @@ gst_avi_demux_parse_odml (GstAviDemux * avi, GstBuffer * buf) /* check size */ if (size < sizeof (gst_riff_dmlh)) { GST_ERROR_OBJECT (avi, - "DMLH entry is too small (%d bytes, %d needed)", + "DMLH entry is too small (%" G_GSIZE_FORMAT " bytes, %d needed)", size, (int) sizeof (gst_riff_dmlh)); gst_buffer_unmap (sub, data, size); goto next; @@ -2691,7 +2694,7 @@ gst_avi_demux_stream_index (GstAviDemux * avi) avi->sinkpad, &offset, &tag, &buf) != GST_FLOW_OK) return; - GST_DEBUG ("will parse index chunk size %u for tag %" + GST_DEBUG ("will parse index chunk size %" G_GSIZE_FORMAT " for tag %" GST_FOURCC_FORMAT, gst_buffer_get_size (buf), GST_FOURCC_ARGS (tag)); gst_avi_demux_parse_index (avi, buf); @@ -2784,7 +2787,7 @@ gst_avi_demux_stream_index_push (GstAviDemux * avi) /* advance offset */ offset += 8 + GST_ROUND_UP_2 (size); - GST_DEBUG ("will parse index chunk size %u for tag %" + GST_DEBUG ("will parse index chunk size %" G_GSIZE_FORMAT " for tag %" GST_FOURCC_FORMAT, gst_buffer_get_size (buf), GST_FOURCC_ARGS (tag)); avi->offset = avi->first_movi_offset; @@ -2865,7 +2868,8 @@ pull_failed: } wrong_size: { - GST_DEBUG_OBJECT (avi, "got %d bytes which is <> 8 bytes", bufsize); + GST_DEBUG_OBJECT (avi, "got %" G_GSIZE_FORMAT " bytes which is <> 8 bytes", + bufsize); res = GST_FLOW_ERROR; goto done; } @@ -3705,7 +3709,8 @@ gst_avi_demux_stream_header_pull (GstAviDemux * avi) GST_DEBUG_OBJECT (avi, "pull_range failure while looking for tags"); goto pull_range_failed; } else if (gst_buffer_get_size (buf) < 12) { - GST_DEBUG_OBJECT (avi, "got %d bytes which is less than 12 bytes", + GST_DEBUG_OBJECT (avi, + "got %" G_GSIZE_FORMAT " bytes which is less than 12 bytes", gst_buffer_get_size (buf)); gst_buffer_unref (buf); return GST_FLOW_ERROR; @@ -3737,7 +3742,7 @@ gst_avi_demux_stream_header_pull (GstAviDemux * avi) GST_DEBUG_OBJECT (avi, "couldn't read INFO chunk"); goto pull_range_failed; } - GST_DEBUG ("got size %u", gst_buffer_get_size (buf)); + GST_DEBUG ("got size %" G_GSIZE_FORMAT, gst_buffer_get_size (buf)); if (size < 4) { GST_DEBUG ("skipping INFO LIST prefix"); avi->offset += (4 - GST_ROUND_UP_2 (size)); @@ -4201,7 +4206,7 @@ avi_demux_handle_seek_push (GstAviDemux * avi, GstPad * pad, GstEvent * event) gst_segment_do_seek (&seeksegment, rate, format, flags, cur_type, cur, stop_type, stop, &update); - keyframe = ! !(flags & GST_SEEK_FLAG_KEY_UNIT); + keyframe = !!(flags & GST_SEEK_FLAG_KEY_UNIT); cur = seeksegment.position; GST_DEBUG_OBJECT (avi, @@ -4719,7 +4724,7 @@ gst_avi_demux_loop_data (GstAviDemux * avi) /* update current position in the segment */ avi->segment.position = timestamp; - GST_DEBUG_OBJECT (avi, "Pushing buffer of size %u, ts %" + GST_DEBUG_OBJECT (avi, "Pushing buffer of size %" G_GSIZE_FORMAT ", ts %" GST_TIME_FORMAT ", dur %" GST_TIME_FORMAT ", off %" G_GUINT64_FORMAT ", off_end %" G_GUINT64_FORMAT, gst_buffer_get_size (buf), GST_TIME_ARGS (timestamp), @@ -4776,8 +4781,8 @@ pull_failed: short_buffer: { GST_WARNING_OBJECT (avi, "Short read at offset %" G_GUINT64_FORMAT - ", only got %d/%" G_GUINT64_FORMAT " bytes (truncated file?)", offset, - gst_buffer_get_size (buf), size); + ", only got %" G_GSIZE_FORMAT "/%" G_GUINT64_FORMAT + " bytes (truncated file?)", offset, gst_buffer_get_size (buf), size); gst_buffer_unref (buf); ret = GST_FLOW_UNEXPECTED; goto beach; @@ -5166,7 +5171,8 @@ gst_avi_demux_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) avi->stream[i].discont = TRUE; } - GST_DEBUG ("Store %d bytes in adapter", gst_buffer_get_size (buf)); + GST_DEBUG ("Store %" G_GSIZE_FORMAT " bytes in adapter", + gst_buffer_get_size (buf)); gst_adapter_push (avi->adapter, buf); switch (avi->state) { diff --git a/gst/avi/gstavisubtitle.c b/gst/avi/gstavisubtitle.c index ed1dddaa05..d7b8946274 100644 --- a/gst/avi/gstavisubtitle.c +++ b/gst/avi/gstavisubtitle.c @@ -243,7 +243,8 @@ wrong_magic_word: wrong_name_length: { GST_ELEMENT_ERROR (sub, STREAM, DECODE, (NULL), - ("name doesn't fit in buffer (%d < %d)", size, 17 + name_length)); + ("name doesn't fit in buffer (%" G_GSIZE_FORMAT " < %d)", size, + 17 + name_length)); gst_buffer_unmap (buf, data, size); return GST_FLOW_ERROR; } @@ -258,7 +259,7 @@ wrong_fixed_word_2: wrong_total_length: { GST_ELEMENT_ERROR (sub, STREAM, DECODE, (NULL), - ("buffer size is wrong: need %d bytes, have %d bytes", + ("buffer size is wrong: need %d bytes, have %" G_GSIZE_FORMAT " bytes", 17 + name_length + file_length, size)); gst_buffer_unmap (buf, data, size); return GST_FLOW_ERROR; diff --git a/gst/debugutils/breakmydata.c b/gst/debugutils/breakmydata.c index d641623397..0c790f3cd1 100644 --- a/gst/debugutils/breakmydata.c +++ b/gst/debugutils/breakmydata.c @@ -237,8 +237,8 @@ gst_break_my_data_transform_ip (GstBaseTransform * trans, GstBuffer * buf) data = gst_buffer_map (buf, &size, NULL, GST_MAP_READWRITE); GST_LOG_OBJECT (bmd, - "got buffer %p (size %u, timestamp %" G_GUINT64_FORMAT ", offset %" - G_GUINT64_FORMAT "", buf, size, GST_BUFFER_TIMESTAMP (buf), + "got buffer %p (size %" G_GSIZE_FORMAT ", timestamp %" G_GUINT64_FORMAT + ", offset %" G_GUINT64_FORMAT "", buf, size, GST_BUFFER_TIMESTAMP (buf), GST_BUFFER_OFFSET (buf)); for (; i < size; i++) { @@ -250,7 +250,8 @@ gst_break_my_data_transform_ip (GstBaseTransform * trans, GstBuffer * buf) } else { new = bmd->set; } - GST_INFO_OBJECT (bmd, "changing byte %u from 0x%02X to 0x%02X", i, + GST_INFO_OBJECT (bmd, + "changing byte %" G_GSIZE_FORMAT " from 0x%02X to 0x%02X", i, (guint) GST_READ_UINT8 (data + i), (guint) ((guint8) new)); data[i] = new; } diff --git a/gst/debugutils/gstnavigationtest.c b/gst/debugutils/gstnavigationtest.c index 68881fe7d0..7ee945e25f 100644 --- a/gst/debugutils/gstnavigationtest.c +++ b/gst/debugutils/gstnavigationtest.c @@ -132,8 +132,9 @@ gst_navigationtest_get_unit_size (GstBaseTransform * btrans, GstCaps * caps, gst_structure_get_int (structure, "height", &height)) { *size = GST_VIDEO_I420_SIZE (width, height); ret = TRUE; - GST_DEBUG_OBJECT (navtest, "our frame size is %d bytes (%dx%d)", *size, - width, height); + GST_DEBUG_OBJECT (navtest, + "our frame size is %" G_GSIZE_FORMAT " bytes (%dx%d)", *size, width, + height); } return ret; diff --git a/gst/flv/gstflvdemux.c b/gst/flv/gstflvdemux.c index ef4d8595fd..0189b31174 100644 --- a/gst/flv/gstflvdemux.c +++ b/gst/flv/gstflvdemux.c @@ -821,7 +821,7 @@ gst_flv_demux_parse_tag_audio (GstFlvDemux * demux, GstBuffer * buffer) /* Error out on tags with too small headers */ if (gst_buffer_get_size (buffer) < 11) { - GST_ERROR_OBJECT (demux, "Too small tag size (%d)", + GST_ERROR_OBJECT (demux, "Too small tag size (%" G_GSIZE_FORMAT ")", gst_buffer_get_size (buffer)); return GST_FLOW_ERROR; } @@ -1038,7 +1038,8 @@ gst_flv_demux_parse_tag_audio (GstFlvDemux * demux, GstBuffer * buffer) demux->audio_need_segment = FALSE; } - GST_LOG_OBJECT (demux, "pushing %d bytes buffer at pts %" GST_TIME_FORMAT + GST_LOG_OBJECT (demux, + "pushing %" G_GSIZE_FORMAT " bytes buffer at pts %" GST_TIME_FORMAT " with duration %" GST_TIME_FORMAT ", offset %" G_GUINT64_FORMAT, gst_buffer_get_size (outbuf), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)), @@ -1415,7 +1416,8 @@ gst_flv_demux_parse_tag_video (GstFlvDemux * demux, GstBuffer * buffer) demux->video_need_segment = FALSE; } - GST_LOG_OBJECT (demux, "pushing %d bytes buffer at pts %" GST_TIME_FORMAT + GST_LOG_OBJECT (demux, + "pushing %" G_GSIZE_FORMAT " bytes buffer at pts %" GST_TIME_FORMAT " with duration %" GST_TIME_FORMAT ", offset %" G_GUINT64_FORMAT ", keyframe (%d)", gst_buffer_get_size (outbuf), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)), @@ -1776,7 +1778,8 @@ gst_flv_demux_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) demux = GST_FLV_DEMUX (parent); - GST_LOG_OBJECT (demux, "received buffer of %d bytes at offset %" + GST_LOG_OBJECT (demux, + "received buffer of %" G_GSIZE_FORMAT " bytes at offset %" G_GUINT64_FORMAT, gst_buffer_get_size (buffer), GST_BUFFER_OFFSET (buffer)); @@ -2024,8 +2027,8 @@ gst_flv_demux_pull_range (GstFlvDemux * demux, GstPad * pad, guint64 offset, if (G_UNLIKELY (*buffer && gst_buffer_get_size (*buffer) != size)) { GST_WARNING_OBJECT (demux, - "partial pull got %d when expecting %d from offset %" G_GUINT64_FORMAT, - gst_buffer_get_size (*buffer), size, offset); + "partial pull got %" G_GSIZE_FORMAT " when expecting %d from offset %" + G_GUINT64_FORMAT, gst_buffer_get_size (*buffer), size, offset); gst_buffer_unref (*buffer); ret = GST_FLOW_UNEXPECTED; *buffer = NULL; diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c index 41cd20bbb4..86528355df 100644 --- a/gst/goom/gstgoom.c +++ b/gst/goom/gstgoom.c @@ -504,7 +504,7 @@ gst_goom_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) } GST_DEBUG_OBJECT (goom, - "Input buffer has %d samples, time=%" G_GUINT64_FORMAT, + "Input buffer has %" G_GSIZE_FORMAT " samples, time=%" G_GUINT64_FORMAT, gst_buffer_get_size (buffer) / goom->bps, GST_BUFFER_TIMESTAMP (buffer)); /* Collect samples until we have enough for an output frame */ diff --git a/gst/isomp4/gstqtmux.c b/gst/isomp4/gstqtmux.c index f42442e3fe..b18ed9783d 100644 --- a/gst/isomp4/gstqtmux.c +++ b/gst/isomp4/gstqtmux.c @@ -682,7 +682,7 @@ gst_qt_mux_add_mp4_cover (GstQTMux * qtmux, const GstTagList * list, data = gst_buffer_map (buf, &size, NULL, GST_MAP_READ); GST_DEBUG_OBJECT (qtmux, "Adding tag %" GST_FOURCC_FORMAT - " -> image size %d", GST_FOURCC_ARGS (fourcc), size); + " -> image size %" G_GSIZE_FORMAT "", GST_FOURCC_ARGS (fourcc), size); atom_moov_add_tag (qtmux->moov, fourcc, flags, data, size); gst_buffer_unmap (buf, data, size); done: @@ -1121,7 +1121,8 @@ gst_qt_mux_add_metadata_tags (GstQTMux * qtmux, const GstTagList * list) gsize size; data = gst_buffer_map (buf, &size, NULL, GST_MAP_READ); - GST_DEBUG_OBJECT (qtmux, "Found private tag %d/%d; size %d, caps %" + GST_DEBUG_OBJECT (qtmux, + "Found private tag %d/%d; size %" G_GSIZE_FORMAT ", caps %" GST_PTR_FORMAT, i, num_tags, size, caps); s = gst_caps_get_structure (caps, 0); if (s && (style = gst_structure_get_string (s, "style"))) { @@ -1198,7 +1199,7 @@ gst_qt_mux_send_buffer (GstQTMux * qtmux, GstBuffer * buf, guint64 * offset, g_return_val_if_fail (buf != NULL, GST_FLOW_ERROR); size = gst_buffer_get_size (buf); - GST_LOG_OBJECT (qtmux, "sending buffer size %d", size); + GST_LOG_OBJECT (qtmux, "sending buffer size %" G_GSIZE_FORMAT, size); if (mind_fast && qtmux->fast_start_file) { gint ret; @@ -1997,7 +1998,7 @@ flush: pad->traf = NULL; atom_moof_copy_data (moof, &data, &size, &offset); buffer = _gst_buffer_new_take_data (data, offset); - GST_LOG_OBJECT (qtmux, "writing moof size %d", + GST_LOG_OBJECT (qtmux, "writing moof size %" G_GSIZE_FORMAT, gst_buffer_get_size (buffer)); ret = gst_qt_mux_send_buffer (qtmux, buffer, &qtmux->header_size, FALSE); diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c index 60b7355107..7fab21f282 100644 --- a/gst/isomp4/qtdemux.c +++ b/gst/isomp4/qtdemux.c @@ -599,8 +599,8 @@ gst_qtdemux_pull_atom (GstQTDemux * qtdemux, guint64 offset, guint64 size, bsize = gst_buffer_get_size (*buf); /* Catch short reads - we don't want any partial atoms */ if (G_UNLIKELY (bsize < size)) { - GST_WARNING_OBJECT (qtdemux, "short read: %u < %" G_GUINT64_FORMAT, - bsize, size); + GST_WARNING_OBJECT (qtdemux, + "short read: %" G_GSIZE_FORMAT " < %" G_GUINT64_FORMAT, bsize, size); gst_buffer_unref (*buf); *buf = NULL; return GST_FLOW_UNEXPECTED; @@ -2718,8 +2718,9 @@ gst_qtdemux_loop_state_header (GstQTDemux * qtdemux) if (length != size) { GST_ELEMENT_ERROR (qtdemux, STREAM, DEMUX, (_("This file is incomplete and cannot be played.")), - ("We got less than expected (received %u, wanted %u, offset %" - G_GUINT64_FORMAT ")", size, (guint) length, cur_offset)); + ("We got less than expected (received %" G_GSIZE_FORMAT + ", wanted %u, offset %" G_GUINT64_FORMAT ")", size, + (guint) length, cur_offset)); gst_buffer_unmap (moov, data, size); gst_buffer_unref (moov); ret = GST_FLOW_ERROR; @@ -3537,7 +3538,8 @@ gst_qtdemux_process_buffer (GstQTDemux * qtdemux, QtDemuxStream * stream, nsize = MIN (nsize, size - 2); } - GST_LOG_OBJECT (qtdemux, "3GPP timed text subtitle: %d/%d", nsize, size); + GST_LOG_OBJECT (qtdemux, "3GPP timed text subtitle: %d/%" G_GSIZE_FORMAT "", + nsize, size); /* takes care of UTF-8 validation or UTF-16 recognition, * no other encoding expected */ @@ -4026,8 +4028,9 @@ gst_qtdemux_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * inbuf) if (demux->neededbytes == -1) goto eos; - GST_DEBUG_OBJECT (demux, "pushing in inbuf %p, neededbytes:%u, available:%u", - inbuf, demux->neededbytes, gst_adapter_available (demux->adapter)); + GST_DEBUG_OBJECT (demux, + "pushing in inbuf %p, neededbytes:%u, available:%" G_GSIZE_FORMAT, inbuf, + demux->neededbytes, gst_adapter_available (demux->adapter)); while (((gst_adapter_available (demux->adapter)) >= demux->neededbytes) && (ret == GST_FLOW_OK)) { @@ -6247,7 +6250,7 @@ qtdemux_parse_amr_bitrate (GstBuffer * buf, gboolean wb) data = gst_buffer_map (buf, &size, NULL, GST_MAP_READ); if (size != 0x11) { - GST_DEBUG ("Atom should have size 0x11, not %u", size); + GST_DEBUG ("Atom should have size 0x11, not %" G_GSIZE_FORMAT, size); goto bad_data; } diff --git a/gst/rtp/gstrtpac3depay.c b/gst/rtp/gstrtpac3depay.c index dd5ab8dbfe..f99853176e 100644 --- a/gst/rtp/gstrtpac3depay.c +++ b/gst/rtp/gstrtpac3depay.c @@ -191,7 +191,7 @@ gst_rtp_ac3_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf) gst_rtp_buffer_unmap (&rtp); if (outbuf) - GST_DEBUG_OBJECT (rtpac3depay, "pushing buffer of size %d", + GST_DEBUG_OBJECT (rtpac3depay, "pushing buffer of size %" G_GSIZE_FORMAT, gst_buffer_get_size (outbuf)); return outbuf; diff --git a/gst/rtp/gstrtpac3pay.c b/gst/rtp/gstrtpac3pay.c index 7a382dbb6b..37c8631eaf 100644 --- a/gst/rtp/gstrtpac3pay.c +++ b/gst/rtp/gstrtpac3pay.c @@ -367,7 +367,8 @@ gst_rtp_ac3_pay_handle_buffer (GstRTPBasePayload * basepayload, break; NF++; - GST_DEBUG_OBJECT (rtpac3pay, "found frame %u of size %u", NF, frame_size); + GST_DEBUG_OBJECT (rtpac3pay, "found frame %" G_GSIZE_FORMAT " of size %u", + NF, frame_size); p += frame_size; left -= frame_size; diff --git a/gst/rtp/gstrtpamrdepay.c b/gst/rtp/gstrtpamrdepay.c index fd88170978..20c6aaff1a 100644 --- a/gst/rtp/gstrtpamrdepay.c +++ b/gst/rtp/gstrtpamrdepay.c @@ -411,7 +411,7 @@ gst_rtp_amr_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf) GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT); } - GST_DEBUG_OBJECT (depayload, "pushing buffer of size %d", + GST_DEBUG_OBJECT (depayload, "pushing buffer of size %" G_GSIZE_FORMAT, gst_buffer_get_size (outbuf)); } return outbuf; diff --git a/gst/rtp/gstrtpamrpay.c b/gst/rtp/gstrtpamrpay.c index e52712292e..e7fa1e5ac2 100644 --- a/gst/rtp/gstrtpamrpay.c +++ b/gst/rtp/gstrtpamrpay.c @@ -252,7 +252,7 @@ gst_rtp_amr_pay_handle_buffer (GstRTPBasePayload * basepayload, else frame_size = wb_frame_size; - GST_DEBUG_OBJECT (basepayload, "got %d bytes", size); + GST_DEBUG_OBJECT (basepayload, "got %" G_GSIZE_FORMAT " bytes", size); /* FIXME, only * octet aligned, no interleaving, single channel, no CRC, diff --git a/gst/rtp/gstrtpbvdepay.c b/gst/rtp/gstrtpbvdepay.c index 739afb24c4..4f4def4128 100644 --- a/gst/rtp/gstrtpbvdepay.c +++ b/gst/rtp/gstrtpbvdepay.c @@ -159,7 +159,7 @@ gst_rtp_bv_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf) marker = gst_rtp_buffer_get_marker (&rtp); - GST_DEBUG ("process : got %d bytes, mark %d ts %u seqn %d", + GST_DEBUG ("process : got %" G_GSIZE_FORMAT " bytes, mark %d ts %u seqn %d", gst_buffer_get_size (buf), marker, gst_rtp_buffer_get_timestamp (&rtp), gst_rtp_buffer_get_seq (&rtp)); diff --git a/gst/rtp/gstrtpceltdepay.c b/gst/rtp/gstrtpceltdepay.c index b6c98ff2ac..2a164f276d 100644 --- a/gst/rtp/gstrtpceltdepay.c +++ b/gst/rtp/gstrtpceltdepay.c @@ -214,9 +214,9 @@ gst_rtp_celt_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf) gst_rtp_buffer_map (buf, GST_MAP_READ, &rtp); - GST_LOG_OBJECT (depayload, "got %d bytes, mark %d ts %u seqn %d", - gst_buffer_get_size (buf), - gst_rtp_buffer_get_marker (&rtp), + GST_LOG_OBJECT (depayload, + "got %" G_GSIZE_FORMAT " bytes, mark %d ts %u seqn %d", + gst_buffer_get_size (buf), gst_rtp_buffer_get_marker (&rtp), gst_rtp_buffer_get_timestamp (&rtp), gst_rtp_buffer_get_seq (&rtp)); GST_LOG_OBJECT (depayload, "got clock-rate=%d, frame_size=%d, " diff --git a/gst/rtp/gstrtpceltpay.c b/gst/rtp/gstrtpceltpay.c index 0e9fb4f1ca..4c64ed381f 100644 --- a/gst/rtp/gstrtpceltpay.c +++ b/gst/rtp/gstrtpceltpay.c @@ -396,7 +396,7 @@ gst_rtp_celt_pay_handle_buffer (GstRTPBasePayload * basepayload, duration = GST_BUFFER_DURATION (buffer); GST_LOG_OBJECT (rtpceltpay, - "got buffer of duration %" GST_TIME_FORMAT ", size %u", + "got buffer of duration %" GST_TIME_FORMAT ", size %" G_GSIZE_FORMAT, GST_TIME_ARGS (duration), size); /* calculate the size of the size field and the payload */ diff --git a/gst/rtp/gstrtpdvpay.c b/gst/rtp/gstrtpdvpay.c index bd6a3fd2b9..44a66299f1 100644 --- a/gst/rtp/gstrtpdvpay.c +++ b/gst/rtp/gstrtpdvpay.c @@ -305,8 +305,9 @@ gst_rtp_dv_pay_handle_buffer (GstRTPBasePayload * basepayload, osize = size; GST_DEBUG_OBJECT (rtpdvpay, - "DV RTP payloader got buffer of %u bytes, splitting in %u byte " - "payload fragments, at time %" GST_TIME_FORMAT, size, max_payload_size, + "DV RTP payloader got buffer of %" G_GSIZE_FORMAT + " bytes, splitting in %u byte " "payload fragments, at time %" + GST_TIME_FORMAT, size, max_payload_size, GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer))); if (!rtpdvpay->negotiated) { diff --git a/gst/rtp/gstrtpg723depay.c b/gst/rtp/gstrtpg723depay.c index 6228ab2428..bb9bf33ea0 100644 --- a/gst/rtp/gstrtpg723depay.c +++ b/gst/rtp/gstrtpg723depay.c @@ -201,7 +201,7 @@ gst_rtp_g723_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf) GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT); } - GST_LOG_OBJECT (depayload, "pushing buffer of size %d", + GST_LOG_OBJECT (depayload, "pushing buffer of size %" G_GSIZE_FORMAT, gst_buffer_get_size (outbuf)); return outbuf; diff --git a/gst/rtp/gstrtpg723pay.c b/gst/rtp/gstrtpg723pay.c index e269a9e981..f196324ff2 100644 --- a/gst/rtp/gstrtpg723pay.c +++ b/gst/rtp/gstrtpg723pay.c @@ -260,7 +260,7 @@ invalid_size: { GST_ELEMENT_WARNING (pay, STREAM, WRONG_TYPE, ("Invalid input buffer size"), - ("Input size should be 4, 20 or 24, got %u", size)); + ("Input size should be 4, 20 or 24, got %" G_GSIZE_FORMAT, size)); gst_buffer_unmap (buf, data, size); gst_buffer_unref (buf); return GST_FLOW_OK; @@ -269,7 +269,8 @@ wrong_size: { GST_ELEMENT_WARNING (pay, STREAM, WRONG_TYPE, ("Wrong input buffer size"), - ("Expected input buffer size %u but got %u", size_tab[HDR], size)); + ("Expected input buffer size %u but got %" G_GSIZE_FORMAT, + size_tab[HDR], size)); gst_buffer_unmap (buf, data, size); gst_buffer_unref (buf); return GST_FLOW_OK; diff --git a/gst/rtp/gstrtpg726depay.c b/gst/rtp/gstrtpg726depay.c index 5d33c67f51..927544598e 100644 --- a/gst/rtp/gstrtpg726depay.c +++ b/gst/rtp/gstrtpg726depay.c @@ -215,7 +215,7 @@ gst_rtp_g726_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf) marker = gst_rtp_buffer_get_marker (&rtp); - GST_DEBUG ("process : got %d bytes, mark %d ts %u seqn %d", + GST_DEBUG ("process : got %" G_GSIZE_FORMAT " bytes, mark %d ts %u seqn %d", gst_buffer_get_size (buf), marker, gst_rtp_buffer_get_timestamp (&rtp), gst_rtp_buffer_get_seq (&rtp)); diff --git a/gst/rtp/gstrtpg726pay.c b/gst/rtp/gstrtpg726pay.c index 39393751aa..21a2670389 100644 --- a/gst/rtp/gstrtpg726pay.c +++ b/gst/rtp/gstrtpg726pay.c @@ -276,7 +276,7 @@ gst_rtp_g726_pay_handle_buffer (GstRTPBasePayload * payload, GstBuffer * buffer) data = gst_buffer_map (buffer, &len, NULL, GST_MAP_READWRITE); - GST_LOG_OBJECT (pay, "packing %u bytes of data", len); + GST_LOG_OBJECT (pay, "packing %" G_GSIZE_FORMAT " bytes of data", len); /* we need to reshuffle the bytes, output is of the form: * A B C D .. with the number of bits depending on the bitrate. */ diff --git a/gst/rtp/gstrtpg729depay.c b/gst/rtp/gstrtpg729depay.c index 421beb6bc5..a6017bb2b5 100644 --- a/gst/rtp/gstrtpg729depay.c +++ b/gst/rtp/gstrtpg729depay.c @@ -206,7 +206,7 @@ gst_rtp_g729_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf) GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT); } - GST_LOG_OBJECT (depayload, "pushing buffer of size %d", + GST_LOG_OBJECT (depayload, "pushing buffer of size %" G_GSIZE_FORMAT, gst_buffer_get_size (outbuf)); return outbuf; diff --git a/gst/rtp/gstrtpg729pay.c b/gst/rtp/gstrtpg729pay.c index e8b56ea99a..ac90dbfe9c 100644 --- a/gst/rtp/gstrtpg729pay.c +++ b/gst/rtp/gstrtpg729pay.c @@ -368,7 +368,7 @@ invalid_size: ("Invalid input buffer size"), ("Invalid buffer size, should be a multiple of" " G729_FRAME_SIZE(10) with an optional G729B_CN_FRAME_SIZE(2)" - " added to it, but it is %u", size)); + " added to it, but it is %" G_GSIZE_FORMAT, size)); gst_buffer_unref (buf); return GST_FLOW_ERROR; } diff --git a/gst/rtp/gstrtpgsmdepay.c b/gst/rtp/gstrtpgsmdepay.c index d7f3fd74be..2b31088b4e 100644 --- a/gst/rtp/gstrtpgsmdepay.c +++ b/gst/rtp/gstrtpgsmdepay.c @@ -128,7 +128,7 @@ gst_rtp_gsm_depay_process (GstRTPBaseDepayload * _depayload, GstBuffer * buf) marker = gst_rtp_buffer_get_marker (&rtp); - GST_DEBUG ("process : got %d bytes, mark %d ts %u seqn %d", + GST_DEBUG ("process : got %" G_GSIZE_FORMAT " bytes, mark %d ts %u seqn %d", gst_buffer_get_size (buf), marker, gst_rtp_buffer_get_timestamp (&rtp), gst_rtp_buffer_get_seq (&rtp)); diff --git a/gst/rtp/gstrtpgsmpay.c b/gst/rtp/gstrtpgsmpay.c index ab2205bbfb..d490fc9908 100644 --- a/gst/rtp/gstrtpgsmpay.c +++ b/gst/rtp/gstrtpgsmpay.c @@ -165,7 +165,7 @@ gst_rtp_gsm_pay_handle_buffer (GstRTPBasePayload * basepayload, gst_buffer_unmap (buffer, data, size); gst_buffer_unref (buffer); - GST_DEBUG ("gst_rtp_gsm_pay_chain: pushing buffer of size %d", + GST_DEBUG ("gst_rtp_gsm_pay_chain: pushing buffer of size %" G_GSIZE_FORMAT, gst_buffer_get_size (outbuf)); ret = gst_rtp_base_payload_push (basepayload, outbuf); diff --git a/gst/rtp/gstrtph264pay.c b/gst/rtp/gstrtph264pay.c index 9ad4624573..d092342f4b 100644 --- a/gst/rtp/gstrtph264pay.c +++ b/gst/rtp/gstrtph264pay.c @@ -546,7 +546,7 @@ gst_rtp_h264_pay_setcaps (GstRTPBasePayload * basepayload, GstCaps * caps) avcc_too_small: { - GST_ERROR_OBJECT (rtph264pay, "avcC size %u < 7", size); + GST_ERROR_OBJECT (rtph264pay, "avcC size %" G_GSIZE_FORMAT " < 7", size); goto error; } wrong_version: @@ -1101,7 +1101,8 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload, gst_adapter_push (rtph264pay->adapter, buffer); size = gst_adapter_available (rtph264pay->adapter); data = gst_adapter_map (rtph264pay->adapter, size); - GST_DEBUG_OBJECT (basepayload, "got %d bytes (%d)", size, + GST_DEBUG_OBJECT (basepayload, + "got %" G_GSIZE_FORMAT " bytes (%" G_GSIZE_FORMAT ")", size, gst_buffer_get_size (buffer)); if (!GST_CLOCK_TIME_IS_VALID (timestamp)) @@ -1111,7 +1112,7 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload, data = bdata; size = bsize; timestamp = GST_BUFFER_TIMESTAMP (buffer); - GST_DEBUG_OBJECT (basepayload, "got %d bytes", size); + GST_DEBUG_OBJECT (basepayload, "got %" G_GSIZE_FORMAT " bytes", size); } ret = GST_FLOW_OK; @@ -1179,8 +1180,8 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload, /* array must be empty when we get here */ g_assert (nal_queue->len == 0); - GST_DEBUG_OBJECT (basepayload, "found first start at %u, bytes left %u", - next, size); + GST_DEBUG_OBJECT (basepayload, + "found first start at %u, bytes left %" G_GSIZE_FORMAT, next, size); /* first pass to locate NALs and parse SPS/PPS */ while (size > 4) { diff --git a/gst/rtp/gstrtpilbcdepay.c b/gst/rtp/gstrtpilbcdepay.c index afba0937ca..813e699ddd 100644 --- a/gst/rtp/gstrtpilbcdepay.c +++ b/gst/rtp/gstrtpilbcdepay.c @@ -182,7 +182,7 @@ gst_rtp_ilbc_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf) marker = gst_rtp_buffer_get_marker (&rtp); - GST_DEBUG ("process : got %d bytes, mark %d ts %u seqn %d", + GST_DEBUG ("process : got %" G_GSIZE_FORMAT " bytes, mark %d ts %u seqn %d", gst_buffer_get_size (buf), marker, gst_rtp_buffer_get_timestamp (&rtp), gst_rtp_buffer_get_seq (&rtp)); diff --git a/gst/rtp/gstrtpj2kdepay.c b/gst/rtp/gstrtpj2kdepay.c index 8cef0ad551..c09c188972 100644 --- a/gst/rtp/gstrtpj2kdepay.c +++ b/gst/rtp/gstrtpj2kdepay.c @@ -237,7 +237,8 @@ gst_rtp_j2k_depay_flush_pu (GstRTPBaseDepayload * depayload) /* append packets */ for (walk = packets; walk; walk = g_list_next (walk)) { GstBuffer *buf = GST_BUFFER_CAST (walk->data); - GST_DEBUG_OBJECT (rtpj2kdepay, "append pu packet of size %u", + GST_DEBUG_OBJECT (rtpj2kdepay, + "append pu packet of size %" G_GSIZE_FORMAT, gst_buffer_get_size (buf)); gst_adapter_push (rtpj2kdepay->t_adapter, buf); } @@ -334,7 +335,7 @@ gst_rtp_j2k_depay_flush_tile (GstRTPBaseDepayload * depayload) gst_buffer_unmap (buf, data, size); } - GST_DEBUG_OBJECT (rtpj2kdepay, "append pu packet of size %u", + GST_DEBUG_OBJECT (rtpj2kdepay, "append pu packet of size %" G_GSIZE_FORMAT, gst_buffer_get_size (buf)); gst_adapter_push (rtpj2kdepay->f_adapter, buf); } diff --git a/gst/rtp/gstrtpj2kpay.c b/gst/rtp/gstrtpj2kpay.c index 556ada401c..0eb8c3dce7 100644 --- a/gst/rtp/gstrtpj2kpay.c +++ b/gst/rtp/gstrtpj2kpay.c @@ -348,7 +348,8 @@ gst_rtp_j2k_pay_handle_buffer (GstRTPBasePayload * basepayload, timestamp = GST_BUFFER_TIMESTAMP (buffer); offset = pos = end = 0; - GST_LOG_OBJECT (pay, "got buffer size %u, timestamp %" GST_TIME_FORMAT, size, + GST_LOG_OBJECT (pay, + "got buffer size %" G_GSIZE_FORMAT ", timestamp %" GST_TIME_FORMAT, size, GST_TIME_ARGS (timestamp)); /* do some header defaults first */ diff --git a/gst/rtp/gstrtpjpegdepay.c b/gst/rtp/gstrtpjpegdepay.c index bdcc8ebc4f..6c037947e9 100644 --- a/gst/rtp/gstrtpjpegdepay.c +++ b/gst/rtp/gstrtpjpegdepay.c @@ -649,8 +649,7 @@ gst_rtp_jpeg_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf) size = MakeHeaders (data, type, width, height, qtable, precision, dri); gst_buffer_unmap (outbuf, data, size); - GST_DEBUG_OBJECT (rtpjpegdepay, - "pushing %" G_GSIZE_FORMAT " bytes of header", size); + GST_DEBUG_OBJECT (rtpjpegdepay, "pushing %u bytes of header", size); gst_adapter_push (rtpjpegdepay->adapter, outbuf); } diff --git a/gst/rtp/gstrtpmp1sdepay.c b/gst/rtp/gstrtpmp1sdepay.c index ed91093f69..61faef6d84 100644 --- a/gst/rtp/gstrtpmp1sdepay.c +++ b/gst/rtp/gstrtpmp1sdepay.c @@ -130,8 +130,8 @@ gst_rtp_mp1s_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf) gst_rtp_buffer_unmap (&rtp); if (outbuf) - GST_DEBUG ("gst_rtp_mp1s_depay_chain: pushing buffer of size %d", - gst_buffer_get_size (outbuf)); + GST_DEBUG ("gst_rtp_mp1s_depay_chain: pushing buffer of size %" + G_GSIZE_FORMAT, gst_buffer_get_size (outbuf)); return outbuf; } diff --git a/gst/rtp/gstrtpmp2tdepay.c b/gst/rtp/gstrtpmp2tdepay.c index a1e16e69d4..d8a91268f4 100644 --- a/gst/rtp/gstrtpmp2tdepay.c +++ b/gst/rtp/gstrtpmp2tdepay.c @@ -167,8 +167,8 @@ gst_rtp_mp2t_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf) gst_rtp_buffer_unmap (&rtp); if (outbuf) - GST_DEBUG ("gst_rtp_mp2t_depay_chain: pushing buffer of size %d", - gst_buffer_get_size (outbuf)); + GST_DEBUG ("gst_rtp_mp2t_depay_chain: pushing buffer of size %" + G_GSIZE_FORMAT, gst_buffer_get_size (outbuf)); return outbuf; diff --git a/gst/rtp/gstrtpmp2tpay.c b/gst/rtp/gstrtpmp2tpay.c index 2ab767c083..73c5c12279 100644 --- a/gst/rtp/gstrtpmp2tpay.c +++ b/gst/rtp/gstrtpmp2tpay.c @@ -137,7 +137,7 @@ gst_rtp_mp2t_pay_flush (GstRTPMP2TPay * rtpmp2tpay) GST_BUFFER_TIMESTAMP (outbuf) = rtpmp2tpay->first_ts; GST_BUFFER_DURATION (outbuf) = rtpmp2tpay->duration; - GST_DEBUG_OBJECT (rtpmp2tpay, "pushing buffer of size %d", + GST_DEBUG_OBJECT (rtpmp2tpay, "pushing buffer of size %" G_GSIZE_FORMAT, gst_buffer_get_size (outbuf)); ret = gst_rtp_base_payload_push (GST_RTP_BASE_PAYLOAD (rtpmp2tpay), outbuf); diff --git a/gst/rtp/gstrtpmp4apay.c b/gst/rtp/gstrtpmp4apay.c index 0f4b3668c3..818a7124df 100644 --- a/gst/rtp/gstrtpmp4apay.c +++ b/gst/rtp/gstrtpmp4apay.c @@ -190,7 +190,9 @@ gst_rtp_mp4a_pay_parse_audio_config (GstRtpMP4APay * rtpmp4apay, too_short: { GST_ELEMENT_ERROR (rtpmp4apay, STREAM, FORMAT, - (NULL), ("config string too short, expected 2 bytes, got %d", size)); + (NULL), + ("config string too short, expected 2 bytes, got %" G_GSIZE_FORMAT, + size)); gst_buffer_unmap (buffer, data, -1); return FALSE; } @@ -388,8 +390,8 @@ gst_rtp_mp4a_pay_handle_buffer (GstRTPBasePayload * basepayload, payload_len = gst_rtp_buffer_calc_payload_len (towrite, 0, 0); GST_DEBUG_OBJECT (rtpmp4apay, - "avail %d, towrite %d, packet_len %d, payload_len %d", size, towrite, - packet_len, payload_len); + "avail %" G_GSIZE_FORMAT ", towrite %d, packet_len %d, payload_len %d", + size, towrite, packet_len, payload_len); /* create buffer to hold the payload. */ outbuf = gst_rtp_buffer_new_allocate (payload_len, 0, 0); diff --git a/gst/rtp/gstrtpmp4gdepay.c b/gst/rtp/gstrtpmp4gdepay.c index 76b26872b0..83b138cdd3 100644 --- a/gst/rtp/gstrtpmp4gdepay.c +++ b/gst/rtp/gstrtpmp4gdepay.c @@ -673,7 +673,8 @@ gst_rtp_mp4g_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf) * RTP packet. */ timestamp = -1; - GST_DEBUG_OBJECT (depayload, "pushing buffer of size %d", + GST_DEBUG_OBJECT (depayload, + "pushing buffer of size %" G_GSIZE_FORMAT, gst_buffer_get_size (outbuf)); gst_rtp_mp4g_depay_queue (rtpmp4gdepay, outbuf); @@ -695,8 +696,8 @@ gst_rtp_mp4g_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf) outbuf = gst_adapter_take_buffer (rtpmp4gdepay->adapter, avail); - GST_DEBUG ("gst_rtp_mp4g_depay_chain: pushing buffer of size %d", - gst_buffer_get_size (outbuf)); + GST_DEBUG ("gst_rtp_mp4g_depay_chain: pushing buffer of size %" + G_GSIZE_FORMAT, gst_buffer_get_size (outbuf)); gst_rtp_buffer_unmap (&rtp); return outbuf; diff --git a/gst/rtp/gstrtpmp4vdepay.c b/gst/rtp/gstrtpmp4vdepay.c index a75bf57d7b..83772800a0 100644 --- a/gst/rtp/gstrtpmp4vdepay.c +++ b/gst/rtp/gstrtpmp4vdepay.c @@ -184,8 +184,8 @@ gst_rtp_mp4v_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf) outbuf = gst_adapter_take_buffer (rtpmp4vdepay->adapter, avail); - GST_DEBUG ("gst_rtp_mp4v_depay_chain: pushing buffer of size %d", - gst_buffer_get_size (outbuf)); + GST_DEBUG ("gst_rtp_mp4v_depay_chain: pushing buffer of size %" + G_GSIZE_FORMAT, gst_buffer_get_size (outbuf)); } gst_rtp_buffer_unmap (&rtp); diff --git a/gst/rtp/gstrtpmpadepay.c b/gst/rtp/gstrtpmpadepay.c index 99f9c4576f..2f2956a858 100644 --- a/gst/rtp/gstrtpmpadepay.c +++ b/gst/rtp/gstrtpmpadepay.c @@ -156,7 +156,7 @@ gst_rtp_mpa_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf) GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT); } GST_DEBUG_OBJECT (rtpmpadepay, - "gst_rtp_mpa_depay_chain: pushing buffer of size %d", + "gst_rtp_mpa_depay_chain: pushing buffer of size %" G_GSIZE_FORMAT "", gst_buffer_get_size (outbuf)); gst_rtp_buffer_unmap (&rtp); diff --git a/gst/rtp/gstrtpmpvdepay.c b/gst/rtp/gstrtpmpvdepay.c index bdc0f5ff62..09e2ef0f5b 100644 --- a/gst/rtp/gstrtpmpvdepay.c +++ b/gst/rtp/gstrtpmpvdepay.c @@ -174,7 +174,7 @@ gst_rtp_mpv_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf) if (outbuf) { GST_DEBUG_OBJECT (rtpmpvdepay, - "gst_rtp_mpv_depay_chain: pushing buffer of size %d", + "gst_rtp_mpv_depay_chain: pushing buffer of size %" G_GSIZE_FORMAT, gst_buffer_get_size (outbuf)); } return outbuf; diff --git a/gst/rtp/gstrtppcmadepay.c b/gst/rtp/gstrtppcmadepay.c index 98ab334fad..15cff86c4f 100644 --- a/gst/rtp/gstrtppcmadepay.c +++ b/gst/rtp/gstrtppcmadepay.c @@ -136,7 +136,7 @@ gst_rtp_pcma_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf) marker = gst_rtp_buffer_get_marker (&rtp); - GST_DEBUG ("process : got %d bytes, mark %d ts %u seqn %d", + GST_DEBUG ("process : got %" G_GSIZE_FORMAT " bytes, mark %d ts %u seqn %d", gst_buffer_get_size (buf), marker, gst_rtp_buffer_get_timestamp (&rtp), gst_rtp_buffer_get_seq (&rtp)); diff --git a/gst/rtp/gstrtppcmudepay.c b/gst/rtp/gstrtppcmudepay.c index 3440426c9a..fe3fa5ce49 100644 --- a/gst/rtp/gstrtppcmudepay.c +++ b/gst/rtp/gstrtppcmudepay.c @@ -137,7 +137,7 @@ gst_rtp_pcmu_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf) marker = gst_rtp_buffer_get_marker (&rtp); - GST_DEBUG ("process : got %d bytes, mark %d ts %u seqn %d", + GST_DEBUG ("process : got %" G_GSIZE_FORMAT " bytes, mark %d ts %u seqn %d", gst_buffer_get_size (buf), marker, gst_rtp_buffer_get_timestamp (&rtp), gst_rtp_buffer_get_seq (&rtp)); diff --git a/gst/rtp/gstrtpspeexdepay.c b/gst/rtp/gstrtpspeexdepay.c index 3b142a43ba..de84d1f8be 100644 --- a/gst/rtp/gstrtpspeexdepay.c +++ b/gst/rtp/gstrtpspeexdepay.c @@ -202,7 +202,7 @@ gst_rtp_speex_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf) gst_rtp_buffer_map (buf, GST_MAP_READ, &rtp); - GST_DEBUG ("process : got %d bytes, mark %d ts %u seqn %d", + GST_DEBUG ("process : got %" G_GSIZE_FORMAT " bytes, mark %d ts %u seqn %d", gst_buffer_get_size (buf), gst_rtp_buffer_get_marker (&rtp), gst_rtp_buffer_get_timestamp (&rtp), gst_rtp_buffer_get_seq (&rtp)); diff --git a/gst/rtp/gstrtptheoradepay.c b/gst/rtp/gstrtptheoradepay.c index 109217a02c..082f5141ea 100644 --- a/gst/rtp/gstrtptheoradepay.c +++ b/gst/rtp/gstrtptheoradepay.c @@ -198,7 +198,8 @@ gst_rtp_theora_depay_parse_configuration (GstRtpTheoraDepay * rtptheoradepay, data += 6; GST_DEBUG_OBJECT (rtptheoradepay, - "header %d, ident 0x%08x, length %u, left %u", i, ident, length, size); + "header %d, ident 0x%08x, length %u, left %" G_GSIZE_FORMAT, i, ident, + length, size); /* FIXME check if we already got this ident */ diff --git a/gst/rtp/gstrtptheorapay.c b/gst/rtp/gstrtptheorapay.c index 8a3377202a..197deaee1e 100644 --- a/gst/rtp/gstrtptheorapay.c +++ b/gst/rtp/gstrtptheorapay.c @@ -763,7 +763,7 @@ done: wrong_size: { GST_ELEMENT_WARNING (rtptheorapay, STREAM, DECODE, - ("Invalid packet size (%d <= 0xffff)", size), (NULL)); + ("Invalid packet size (%" G_GSIZE_FORMAT " <= 0xffff)", size), (NULL)); gst_buffer_unmap (buffer, data, -1); gst_buffer_unref (buffer); return GST_FLOW_OK; diff --git a/gst/rtp/gstrtpvorbisdepay.c b/gst/rtp/gstrtpvorbisdepay.c index c3a35fb80f..ac7b6db9d2 100644 --- a/gst/rtp/gstrtpvorbisdepay.c +++ b/gst/rtp/gstrtpvorbisdepay.c @@ -227,7 +227,8 @@ gst_rtp_vorbis_depay_parse_configuration (GstRtpVorbisDepay * rtpvorbisdepay, offset += 6; GST_DEBUG_OBJECT (rtpvorbisdepay, - "header %d, ident 0x%08x, length %u, left %u", i, ident, length, size); + "header %d, ident 0x%08x, length %u, left %" G_GSIZE_FORMAT, i, ident, + length, size); /* FIXME check if we already got this ident */ diff --git a/gst/rtp/gstrtpvorbispay.c b/gst/rtp/gstrtpvorbispay.c index 16d254c250..d178de4c79 100644 --- a/gst/rtp/gstrtpvorbispay.c +++ b/gst/rtp/gstrtpvorbispay.c @@ -633,7 +633,8 @@ done: wrong_size: { GST_ELEMENT_WARNING (rtpvorbispay, STREAM, DECODE, - ("Invalid packet size (1 < %d <= 0xffff)", size), (NULL)); + ("Invalid packet size (1 < %" G_GSIZE_FORMAT " <= 0xffff)", size), + (NULL)); gst_buffer_unmap (buffer, data, -1); gst_buffer_unref (buffer); return GST_FLOW_OK; diff --git a/gst/rtp/gstrtpvrawpay.c b/gst/rtp/gstrtpvrawpay.c index 91118d7f65..4acf1f9f09 100644 --- a/gst/rtp/gstrtpvrawpay.c +++ b/gst/rtp/gstrtpvrawpay.c @@ -253,7 +253,7 @@ gst_rtp_vraw_pay_handle_buffer (GstRTPBasePayload * payload, GstBuffer * buffer) gst_video_frame_map (&frame, &rtpvrawpay->vinfo, buffer, GST_MAP_READ); - GST_LOG_OBJECT (rtpvrawpay, "new frame of %u bytes", + GST_LOG_OBJECT (rtpvrawpay, "new frame of %" G_GSIZE_FORMAT " bytes", gst_buffer_get_size (buffer)); /* get pointer and strides of the planes */ @@ -271,7 +271,7 @@ gst_rtp_vraw_pay_handle_buffer (GstRTPBasePayload * payload, GstBuffer * buffer) width = GST_VIDEO_INFO_WIDTH (&rtpvrawpay->vinfo); height = GST_VIDEO_INFO_HEIGHT (&rtpvrawpay->vinfo); - interlaced = ! !(rtpvrawpay->vinfo.flags & GST_VIDEO_FLAG_INTERLACED); + interlaced = !!(rtpvrawpay->vinfo.flags & GST_VIDEO_FLAG_INTERLACED); /* start with line 0, offset 0 */ for (field = 0; field < 1 + interlaced; field++) { diff --git a/gst/rtpmanager/gstrtpsession.c b/gst/rtpmanager/gstrtpsession.c index 5e507d40ca..3a00974ba6 100644 --- a/gst/rtpmanager/gstrtpsession.c +++ b/gst/rtpmanager/gstrtpsession.c @@ -1355,7 +1355,7 @@ gst_rtp_session_event_recv_rtp_sink (GstPad * pad, GstObject * parent, * timestamps in SR reports */ gst_event_copy_segment (event, &in_segment); GST_DEBUG_OBJECT (rtpsession, "received segment %" GST_SEGMENT_FORMAT, - in_segment); + &in_segment); /* accept upstream */ gst_segment_copy_into (&in_segment, segment); @@ -1679,7 +1679,7 @@ gst_rtp_session_event_send_rtp_sink (GstPad * pad, GstObject * parent, * timestamps in SR reports */ gst_event_copy_segment (event, &in_segment); GST_DEBUG_OBJECT (rtpsession, "received segment %" GST_SEGMENT_FORMAT, - in_segment); + &in_segment); /* accept upstream */ gst_segment_copy_into (&in_segment, segment); diff --git a/gst/spectrum/gstspectrum.c b/gst/spectrum/gstspectrum.c index f2d819306a..e9bd8a5ce7 100644 --- a/gst/spectrum/gstspectrum.c +++ b/gst/spectrum/gstspectrum.c @@ -912,8 +912,8 @@ gst_spectrum_transform_ip (GstBaseTransform * trans, GstBuffer * buffer) fft_todo = nfft - (spectrum->num_frames % nfft); msg_todo = spectrum->frames_todo - spectrum->num_frames; GST_LOG_OBJECT (spectrum, - "message frames todo: %u, fft frames todo: %u, input frames %u", - msg_todo, fft_todo, (size / bpf)); + "message frames todo: %u, fft frames todo: %u, input frames %" + G_GSIZE_FORMAT, msg_todo, fft_todo, (size / bpf)); block_size = msg_todo; if (block_size > (size / bpf)) block_size = (size / bpf); @@ -934,7 +934,8 @@ gst_spectrum_transform_ip (GstBaseTransform * trans, GstBuffer * buffer) have_full_interval = (spectrum->num_frames == spectrum->frames_todo); - GST_LOG_OBJECT (spectrum, "size: %u, do-fft = %d, do-message = %d", size, + GST_LOG_OBJECT (spectrum, + "size: %" G_GSIZE_FORMAT ", do-fft = %d, do-message = %d", size, (spectrum->num_frames % nfft == 0), have_full_interval); /* If we have enough frames for an FFT or we have all frames required for diff --git a/gst/udp/gstdynudpsink.c b/gst/udp/gstdynudpsink.c index e92cc5b091..2b1ad265d4 100644 --- a/gst/udp/gstdynudpsink.c +++ b/gst/udp/gstdynudpsink.c @@ -196,12 +196,13 @@ gst_dynudpsink_render (GstBaseSink * bsink, GstBuffer * buffer) data = gst_buffer_map (buffer, &size, NULL, GST_MAP_READ); - GST_DEBUG ("about to send %d bytes", size); + GST_DEBUG ("about to send %" G_GSIZE_FORMAT " bytes", size); /* let's get the address from the metaata */ gst_net_address_get_ip4_address (&meta->naddr, &destaddr, &destport); - GST_DEBUG ("sending %d bytes to client %d port %d", size, destaddr, destport); + GST_DEBUG ("sending %" G_GSIZE_FORMAT " bytes to client %d port %d", size, + destaddr, destport); theiraddr.sin_family = AF_INET; theiraddr.sin_addr.s_addr = destaddr; @@ -221,7 +222,7 @@ gst_dynudpsink_render (GstBaseSink * bsink, GstBuffer * buffer) } } - GST_DEBUG ("sent %d bytes", size); + GST_DEBUG ("sent %" G_GSIZE_FORMAT " bytes", size); return GST_FLOW_OK; diff --git a/gst/udp/gstmultiudpsink.c b/gst/udp/gstmultiudpsink.c index 5ee6d516ce..a302465bd1 100644 --- a/gst/udp/gstmultiudpsink.c +++ b/gst/udp/gstmultiudpsink.c @@ -570,7 +570,7 @@ gst_multiudpsink_render (GstBaseSink * bsink, GstBuffer * buffer) if (bsize > UDP_MAX_SIZE) { GST_WARNING ("Attempting to send a UDP packet larger than maximum " - "size (%d > %d)", bsize, UDP_MAX_SIZE); + "size (%" G_GSIZE_FORMAT " > %d)", bsize, UDP_MAX_SIZE); } msg.msg_iov[msg.msg_iovlen].iov_len = bsize; diff --git a/gst/videofilter/gstvideoflip.c b/gst/videofilter/gstvideoflip.c index dea471a78e..f9bad9aaac 100644 --- a/gst/videofilter/gstvideoflip.c +++ b/gst/videofilter/gstvideoflip.c @@ -191,8 +191,9 @@ gst_video_flip_get_unit_size (GstBaseTransform * btrans, GstCaps * caps, *size = info.size; - GST_DEBUG_OBJECT (btrans, "our frame size is %d bytes (%dx%d)", *size, - info.width, info.height); + GST_DEBUG_OBJECT (btrans, + "our frame size is %" G_GSIZE_FORMAT " bytes (%dx%d)", *size, info.width, + info.height); return TRUE; } diff --git a/gst/wavenc/gstwavenc.c b/gst/wavenc/gstwavenc.c index ffb5952c02..46ff60a499 100644 --- a/gst/wavenc/gstwavenc.c +++ b/gst/wavenc/gstwavenc.c @@ -659,7 +659,8 @@ gst_wavenc_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) wavenc->sent_header = TRUE; } - GST_LOG_OBJECT (wavenc, "pushing %u bytes raw audio, ts=%" GST_TIME_FORMAT, + GST_LOG_OBJECT (wavenc, + "pushing %" G_GSIZE_FORMAT " bytes raw audio, ts=%" GST_TIME_FORMAT, gst_buffer_get_size (buf), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf))); buf = gst_buffer_make_writable (buf); diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c index 1d2ed0e660..056aacc7fc 100644 --- a/gst/wavparse/gstwavparse.c +++ b/gst/wavparse/gstwavparse.c @@ -1938,8 +1938,8 @@ iterate_adapter: GST_LOG_OBJECT (wav, "Got buffer. timestamp:%" GST_TIME_FORMAT " , duration:%" GST_TIME_FORMAT - ", size:%u", GST_TIME_ARGS (timestamp), GST_TIME_ARGS (duration), - gst_buffer_get_size (buf)); + ", size:%" G_GSIZE_FORMAT, GST_TIME_ARGS (timestamp), + GST_TIME_ARGS (duration), gst_buffer_get_size (buf)); if ((res = gst_pad_push (wav->srcpad, buf)) != GST_FLOW_OK) goto push_error; @@ -2085,7 +2085,8 @@ gst_wavparse_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) GstFlowReturn ret; GstWavParse *wav = GST_WAVPARSE (parent); - GST_LOG_OBJECT (wav, "adapter_push %u bytes", gst_buffer_get_size (buf)); + GST_LOG_OBJECT (wav, "adapter_push %" G_GSIZE_FORMAT " bytes", + gst_buffer_get_size (buf)); gst_adapter_push (wav->adapter, buf); diff --git a/sys/ximage/gstximagesrc.c b/sys/ximage/gstximagesrc.c index 2741dbe17f..bb6d467163 100644 --- a/sys/ximage/gstximagesrc.c +++ b/sys/ximage/gstximagesrc.c @@ -431,6 +431,7 @@ composite_pixel (GstXContext * xcontext, guchar * dest, guchar * src) } #endif +#ifdef HAVE_XDAMAGE static void copy_buffer (GstBuffer * dest, GstBuffer * src) { @@ -441,6 +442,7 @@ copy_buffer (GstBuffer * dest, GstBuffer * src) gst_buffer_fill (dest, 0, data, size); gst_buffer_unmap (src, data, size); } +#endif /* Retrieve an XImageSrcBuffer, preferably from our * pool of existing images and populate it from the window */