From b689cac7f8e8388df2d89549188691ad624e459f Mon Sep 17 00:00:00 2001 From: David Schleef Date: Sun, 2 Feb 2003 05:26:29 +0000 Subject: [PATCH] Change %lld, %llu to G_G[U]INT64_FORMAT globally. Fix bad pointer->integer conversion. Original commit message from CVS: Change %lld, %llu to G_G[U]INT64_FORMAT globally. Fix bad pointer->integer conversion. --- ext/mpeg2dec/gstmpeg2dec.c | 10 +++++----- gst-libs/gst/media-info/media-info.c | 7 ++++--- gst-libs/gst/play/play.old.c | 2 +- gst/asfdemux/gstasfdemux.c | 12 ++++++------ gst/mpegstream/gstmpegdemux.c | 12 ++++++------ gst/mpegstream/gstmpegparse.c | 14 +++++++------- gst/synaesthesia/gstsynaesthesia.c | 2 +- 7 files changed, 30 insertions(+), 29 deletions(-) diff --git a/ext/mpeg2dec/gstmpeg2dec.c b/ext/mpeg2dec/gstmpeg2dec.c index d323a346f3..6b98ff0712 100644 --- a/ext/mpeg2dec/gstmpeg2dec.c +++ b/ext/mpeg2dec/gstmpeg2dec.c @@ -450,7 +450,7 @@ gst_mpeg2dec_chain (GstPad *pad, GstBuffer *buf) if (pts != -1) { gint64 mpeg_pts = GSTTIME_TO_MPEGTIME (pts); - GST_DEBUG (0, "have pts: %lld (%lld)", + GST_DEBUG (0, "have pts: %" G_GINT64_FORMAT " (%" G_GINT64_FORMAT ")", mpeg_pts, MPEGTIME_TO_GSTTIME (mpeg_pts)); mpeg2_pts (mpeg2dec->decoder, mpeg_pts); @@ -517,7 +517,7 @@ gst_mpeg2dec_chain (GstPad *pad, GstBuffer *buf) } outbuf = gst_mpeg2dec_alloc_buffer (mpeg2dec, info, GST_BUFFER_OFFSET (buf)); - GST_DEBUG (0, "picture %d, %p, %lld, %lld", + GST_DEBUG (0, "picture %d, %p, %" G_GINT64_FORMAT ", %" G_GINT64_FORMAT, key_frame, outbuf, GST_BUFFER_OFFSET (outbuf), pts); if (mpeg2dec->discont_state == MPEG2DEC_DISC_NEW_PICTURE && key_frame) @@ -568,19 +568,19 @@ gst_mpeg2dec_chain (GstPad *pad, GstBuffer *buf) if (picture->flags & PIC_FLAG_PTS) { GstClockTime time = MPEGTIME_TO_GSTTIME (picture->pts); - GST_DEBUG (0, "picture had pts %lld", time); + GST_DEBUG (0, "picture had pts %" G_GINT64_FORMAT, time); GST_BUFFER_TIMESTAMP (outbuf) = time; mpeg2dec->next_time = time; } else { - GST_DEBUG (0, "picture didn't have pts using %lld", mpeg2dec->next_time); + GST_DEBUG (0, "picture didn't have pts using %" G_GINT64_FORMAT, mpeg2dec->next_time); GST_BUFFER_TIMESTAMP (outbuf) = mpeg2dec->next_time; } mpeg2dec->next_time += (mpeg2dec->frame_period * picture->nb_fields) >> 1; - GST_DEBUG (0, "picture: %s %s fields:%d off:%lld ts:%lld", + GST_DEBUG (0, "picture: %s %s fields:%d off:%" G_GINT64_FORMAT " ts:%" G_GINT64_FORMAT, (picture->flags & PIC_FLAG_TOP_FIELD_FIRST ? "tff " : " "), (picture->flags & PIC_FLAG_PROGRESSIVE_FRAME ? "prog" : " "), picture->nb_fields, diff --git a/gst-libs/gst/media-info/media-info.c b/gst-libs/gst/media-info/media-info.c index 4e8f56b36d..e2afd51b48 100644 --- a/gst-libs/gst/media-info/media-info.c +++ b/gst-libs/gst/media-info/media-info.c @@ -531,7 +531,7 @@ gst_media_info_get_stream (GstMediaInfo *info, GstMediaInfoStream *stream) { case GST_FORMAT_TIME: stream->length_time = value; - g_print (" total %s: %lld\n", definition->nick, value); + g_print (" total %s: %" G_GINT64_FORMAT "\n", definition->nick, value); break; default: /* separation is necessary because track_format doesn't resolve to @@ -539,7 +539,7 @@ gst_media_info_get_stream (GstMediaInfo *info, GstMediaInfoStream *stream) if (format == track_format) { stream->length_tracks = value; - g_print (" total %s: %lld\n", definition->nick, value); + g_print (" total %s: %" G_GINT64_FORMAT "\n", definition->nick, value); } else g_print ("warning: unhandled format %s\n", definition->nick); @@ -639,7 +639,8 @@ gst_media_info_find_streaminfo (GstMediaInfo *info) { GstPropsEntry *length; /* substract to get the length */ - GMI_DEBUG("DEBUG: start %lld, end %lld\n", value_start, value_end); + GMI_DEBUG("DEBUG: start %" G_GINT64_FORMAT ", end %" + G_GINT64_FORMAT "\n", value_start, value_end); value_end -= value_start; g_print ("DEBUG: length: %d\n", (int) value_end); length = gst_props_entry_new ("length", GST_PROPS_INT ((int) value_end)); diff --git a/gst-libs/gst/play/play.old.c b/gst-libs/gst/play/play.old.c index 4d3daecd35..560bed18cd 100644 --- a/gst-libs/gst/play/play.old.c +++ b/gst-libs/gst/play/play.old.c @@ -587,7 +587,7 @@ gst_play_get_length_callback (GstPlay *play) g_mutex_unlock(play->video_bin_mutex); } if (query_worked){ - g_print("got length %lld\n", value); + g_print("got length %" G_GINT64_FORMAT "\n", value); g_signal_emit (G_OBJECT (play), gst_play_signals [STREAM_LENGTH], 0, value); play->length_nanos = value; return FALSE; diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c index edce728888..cc25886e0e 100644 --- a/gst/asfdemux/gstasfdemux.c +++ b/gst/asfdemux/gstasfdemux.c @@ -487,7 +487,7 @@ gst_asf_demux_process_file (GstASFDemux *asf_demux, guint64 *filepos, guint64 *o asf_demux->play_time = (guint32) GUINT64_FROM_LE (object->play_time) / 10; asf_demux->preroll = GUINT64_FROM_LE (object->preroll); - GST_INFO (GST_CAT_PLUGIN_INFO, "Object is a file with %llu data packets", packets); + GST_INFO (GST_CAT_PLUGIN_INFO, "Object is a file with %" G_GUINT64_FORMAT " data packets", packets); return TRUE; } @@ -692,10 +692,10 @@ gst_asf_demux_process_data (GstASFDemux *asf_demux, guint64 *filepos, guint64 *o gst_asf_demux_read_object_header_rest (asf_demux, (guint8**)&object, 26); packets = GUINT64_FROM_LE (object->packets); - GST_INFO (GST_CAT_PLUGIN_INFO, "Object is data with %llu packets", packets); + GST_INFO (GST_CAT_PLUGIN_INFO, "Object is data with %" G_GUINT64_FORMAT " packets", packets); for (packet = 0; packet < packets; packet++) { - GST_INFO (GST_CAT_PLUGIN_INFO, "\n\nProcess packet %llu", packet); + GST_INFO (GST_CAT_PLUGIN_INFO, "\n\nProcess packet %" G_GUINT64_FORMAT, packet); gst_asf_demux_read_object_header_rest (asf_demux, (guint8**)&buf, 1); rsize=1; if (*buf & 0x80) { @@ -941,11 +941,11 @@ gst_asf_demux_process_object (GstASFDemux *asf_demux, guint64 obj_size; if (!gst_asf_demux_read_object_header (asf_demux, &obj_id, &obj_size)) { - g_print (" ***** Error reading object at filepos 0x%08llx\n", *filepos); + g_print (" ***** Error reading object at filepos %" G_GUINT64_FORMAT "\n", *filepos); return FALSE; } - GST_INFO (GST_CAT_PLUGIN_INFO, "Found object %u with size %llu", obj_id, obj_size); + GST_INFO (GST_CAT_PLUGIN_INFO, "Found object %u with size %" G_GUINT64_FORMAT, obj_id, obj_size); switch (obj_id) { case ASF_OBJ_STREAM: @@ -1166,7 +1166,7 @@ gst_asf_demux_handle_sink_event (GstASFDemux *asf_demux) asf_stream_context *stream = &asf_demux->stream[i]; if (GST_PAD_IS_USABLE (stream->pad)) { - GST_DEBUG (GST_CAT_EVENT, "sending discont on %d %lld + %lld = %lld", i, + GST_DEBUG (GST_CAT_EVENT, "sending discont on %d %" G_GINT64_FORMAT " + %" G_GINT64_FORMAT " = %" G_GINT64_FORMAT, i, asf_demux->last_seek, stream->delay, asf_demux->last_seek + stream->delay); discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME, asf_demux->last_seek + stream->delay , NULL); diff --git a/gst/mpegstream/gstmpegdemux.c b/gst/mpegstream/gstmpegdemux.c index 33889ab4f9..d89d0994c5 100644 --- a/gst/mpegstream/gstmpegdemux.c +++ b/gst/mpegstream/gstmpegdemux.c @@ -262,7 +262,7 @@ gst_mpeg_demux_handle_discont (GstMPEGParse *mpeg_parse) gint64 current_time = MPEGTIME_TO_GSTTIME (mpeg_parse->current_scr); gint i; - GST_DEBUG (GST_CAT_EVENT, "discont %llu\n", current_time); + GST_DEBUG (GST_CAT_EVENT, "discont %" G_GUINT64_FORMAT "\n", current_time); for (i=0;ivideo_stream[i] && @@ -533,7 +533,7 @@ gst_mpeg_demux_parse_packet (GstMPEGParse *mpeg_parse, GstBuffer *buffer) pts |= *buf++ << 7; pts |= (*buf++ & 0xFE) >> 1; - GST_DEBUG (0, "PTS = %llu", pts); + GST_DEBUG (0, "PTS = %" G_GUINT64_FORMAT, pts); headerlen += 5; goto done; case 0x30: @@ -551,7 +551,7 @@ gst_mpeg_demux_parse_packet (GstMPEGParse *mpeg_parse, GstBuffer *buffer) dts |= *buf++ << 7; dts |= (*buf++ & 0xFE) >> 1; - GST_DEBUG (0, "PTS = %llu, DTS = %llu", pts, dts); + GST_DEBUG (0, "PTS = %" G_GUINT64_FORMAT ", DTS = %" G_GUINT64_FORMAT, pts, dts); headerlen += 10; goto done; case 0x00: @@ -657,7 +657,7 @@ done: GST_BUFFER_TIMESTAMP (outbuf) = timestamp; - GST_DEBUG (0, "pushing buffer of len %d id %d, ts %lld", + GST_DEBUG (0, "pushing buffer of len %d id %d, ts %" G_GINT64_FORMAT, datalen, id, GST_BUFFER_TIMESTAMP (outbuf)); gst_pad_push (outpad, outbuf); @@ -723,7 +723,7 @@ gst_mpeg_demux_parse_pes (GstMPEGParse *mpeg_parse, GstBuffer *buffer) pts |= *buf++ << 7; pts |= (*buf++ & 0xFE) >> 1; - GST_DEBUG (0, "%x PTS = %llu", + GST_DEBUG (0, "%x PTS = %" G_GUINT64_FORMAT, id, MPEGTIME_TO_GSTTIME (pts)); } @@ -964,7 +964,7 @@ normal_seek (GstPad *pad, GstEvent *event, gint64 *offset) res = gst_pad_convert (pad, GST_FORMAT_BYTES, mpeg_demux->total_size_bound, &format, &adjust); - GST_DEBUG (0, "seek adjusted from %lld bytes to %lld\n", mpeg_demux->total_size_bound, adjust); + GST_DEBUG (0, "seek adjusted from %" G_GINT64_FORMAT " bytes to %" G_GINT64_FORMAT "\n", mpeg_demux->total_size_bound, adjust); if (res) *offset = MAX (GST_EVENT_SEEK_OFFSET (event) - adjust, 0); diff --git a/gst/mpegstream/gstmpegparse.c b/gst/mpegstream/gstmpegparse.c index 3dfb748561..f5cdb0b056 100644 --- a/gst/mpegstream/gstmpegparse.c +++ b/gst/mpegstream/gstmpegparse.c @@ -279,7 +279,7 @@ gst_mpeg_parse_send_data (GstMPEGParse *mpeg_parse, GstData *data, GstClockTime } GST_BUFFER_TIMESTAMP (data) = time; - GST_DEBUG (0, "current_scr %lld", time); + GST_DEBUG (0, "current_scr %" G_GINT64_FORMAT, time); if (GST_PAD_IS_USABLE (mpeg_parse->srcpad)) gst_pad_push (mpeg_parse->srcpad, GST_BUFFER (data)); @@ -331,7 +331,7 @@ gst_mpeg_parse_parse_packhead (GstMPEGParse *mpeg_parse, GstBuffer *buffer) scr = (scr * 300 + scr_ext % 300) / 300; - GST_DEBUG (0, "%lld %d, %08x %08x %lld diff: %lld", + GST_DEBUG (0, "%" G_GINT64_FORMAT " %d, %08x %08x %" G_GINT64_FORMAT " diff: %" G_GINT64_FORMAT, scr, scr_ext, scr1, scr2, mpeg_parse->bytes_since_scr, scr - mpeg_parse->current_scr); @@ -360,7 +360,7 @@ gst_mpeg_parse_parse_packhead (GstMPEGParse *mpeg_parse, GstBuffer *buffer) mpeg_parse->next_scr = scr; } - GST_DEBUG (0, "SCR is %llu (%llu) next: %lld (%lld) diff: %lld (%lld)", + GST_DEBUG (0, "SCR is %" G_GUINT64_FORMAT " (%" G_GUINT64_FORMAT ") next: %" G_GINT64_FORMAT " (%" G_GINT64_FORMAT ") diff: %" G_GINT64_FORMAT " (%" G_GINT64_FORMAT ")", scr, MPEGTIME_TO_GSTTIME (scr), mpeg_parse->next_scr, @@ -370,13 +370,13 @@ gst_mpeg_parse_parse_packhead (GstMPEGParse *mpeg_parse, GstBuffer *buffer) MPEGTIME_TO_GSTTIME (mpeg_parse->next_scr)); if (ABS ((gint64)mpeg_parse->next_scr - (gint64)(scr_adj)) > mpeg_parse->max_discont) { - GST_DEBUG (0, "discontinuity detected; expected: %llu got: %llu real:%lld adjust:%lld", + GST_DEBUG (0, "discontinuity detected; expected: %" G_GUINT64_FORMAT " got: %" G_GUINT64_FORMAT " real:%" G_GINT64_FORMAT " adjust:%" G_GINT64_FORMAT, mpeg_parse->next_scr, scr_adj, scr, mpeg_parse->adjust); mpeg_parse->adjust = mpeg_parse->next_scr - scr; scr = mpeg_parse->next_scr; - GST_DEBUG (0, "new adjust: %lld", mpeg_parse->adjust); + GST_DEBUG (0, "new adjust: %" G_GINT64_FORMAT, mpeg_parse->adjust); } else { scr = scr_adj; @@ -554,7 +554,7 @@ gst_mpeg_parse_loop (GstElement *element) mpeg_parse->next_scr = scr; } - GST_DEBUG (0, "size: %lld, total since SCR: %lld, next SCR: %lld", + GST_DEBUG (0, "size: %" G_GINT64_FORMAT ", total since SCR: %" G_GINT64_FORMAT ", next SCR: %" G_GINT64_FORMAT, size, bss, mpeg_parse->next_scr); } } @@ -758,7 +758,7 @@ gst_mpeg_parse_handle_src_event (GstPad *pad, GstEvent *event) if (!res) break; - GST_DEBUG (0, "sending seek to %lld", desired_offset); + GST_DEBUG (0, "sending seek to %" G_GINT64_FORMAT, desired_offset); if (gst_bytestream_seek (mpeg_parse->packetize->bs, desired_offset, GST_SEEK_METHOD_SET)) { mpeg_parse->discont_pending = TRUE; mpeg_parse->scr_pending = TRUE; diff --git a/gst/synaesthesia/gstsynaesthesia.c b/gst/synaesthesia/gstsynaesthesia.c index db74878444..3ddcdf490d 100644 --- a/gst/synaesthesia/gstsynaesthesia.c +++ b/gst/synaesthesia/gstsynaesthesia.c @@ -239,7 +239,7 @@ gst_synaesthesia_chain (GstPad *pad, GstBuffer *bufin) /* FIXME: should really select the first 1024 samples after the timestamp. */ if (GST_BUFFER_TIMESTAMP (bufin) < synaesthesia->next_time || samples_in < 1024) { - GST_DEBUG (0, "timestamp is %llu: want >= %llu", GST_BUFFER_TIMESTAMP (bufin), synaesthesia->next_time); + GST_DEBUG (0, "timestamp is %" G_GUINT64_FORMAT ": want >= %" G_GUINT64_FORMAT, GST_BUFFER_TIMESTAMP (bufin), synaesthesia->next_time); gst_buffer_unref (bufin); return; }