Commit df0b94aa authored by David Schleef's avatar David Schleef

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.
parent 85f9831b
......@@ -350,7 +350,7 @@ gst_aasink_chain (GstPad *pad, GstBuffer *buf)
aa_imgwidth (aasink->context), /* dw */
aa_imgheight (aasink->context)); /* dh */
GST_DEBUG (0,"videosink: clock wait: %llu", GST_BUFFER_TIMESTAMP(buf));
GST_DEBUG (0,"videosink: clock wait: %" G_GUINT64_FORMAT, GST_BUFFER_TIMESTAMP(buf));
if (aasink->clock) {
GstClockID id = gst_clock_new_single_shot_id (aasink->clock, GST_BUFFER_TIMESTAMP(buf));
......
......@@ -324,7 +324,7 @@ gst_esdmon_get (GstPad *pad)
if (esdmon->depth == 16) readsamples /= 2;
esdmon->samples_since_basetime += readsamples;
GST_DEBUG (GST_CAT_PLUGIN_INFO, "pushed buffer from esdmon of %ld bytes, timestamp %lld", readbytes, GST_BUFFER_TIMESTAMP (buf));
GST_DEBUG (GST_CAT_PLUGIN_INFO, "pushed buffer from esdmon of %ld bytes, timestamp %" G_GINT64_FORMAT, readbytes, GST_BUFFER_TIMESTAMP (buf));
return buf;
}
......
......@@ -220,7 +220,7 @@ gst_flacdec_seek (const FLAC__SeekableStreamDecoder *decoder,
flacdec = GST_FLACDEC (client_data);
GST_DEBUG (0, "seek %lld", position);
GST_DEBUG (0, "seek %" G_GINT64_FORMAT, position);
if (!gst_bytestream_seek (flacdec->bs, position, GST_SEEK_METHOD_SET)) {
return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR;
}
......@@ -239,7 +239,7 @@ gst_flacdec_tell (const FLAC__SeekableStreamDecoder *decoder,
if (*position == -1)
return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR;
GST_DEBUG (0, "tell %lld", *position);
GST_DEBUG (0, "tell %" G_GINT64_FORMAT, *position);
return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK;
}
......@@ -256,7 +256,7 @@ gst_flacdec_length (const FLAC__SeekableStreamDecoder *decoder,
if (*length == -1)
return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR;
GST_DEBUG (0, "length %lld", *length);
GST_DEBUG (0, "length %" G_GINT64_FORMAT, *length);
return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK;
}
......@@ -442,7 +442,7 @@ gst_flacdec_loop (GstElement *element)
}
if (flacdec->seek_pending) {
GST_DEBUG (GST_CAT_EVENT, "perform seek to sample %lld",
GST_DEBUG (GST_CAT_EVENT, "perform seek to sample %" G_GINT64_FORMAT,
flacdec->seek_value);
if (FLAC__seekable_stream_decoder_seek_absolute (flacdec->decoder,
......
......@@ -911,8 +911,8 @@ gst_avi_demux_strf_iavs (GstAviDemux *avi_demux)
static void
gst_avi_debug_entry (const gchar *prefix, gst_avi_index_entry *entry)
{
GST_DEBUG (0, "%s: %05d %d %08llx %05d %14lld %08x %08x (%d) %08x", prefix, entry->index_nr, entry->stream_nr,
entry->bytes_before, entry->frames_before, entry->ts, entry->flags, entry->offset,
GST_DEBUG (0, "%s: %05d %d %08llx %05d %14" G_GINT64_FORMAT " %08x %08x (%d) %08x", prefix, entry->index_nr, entry->stream_nr,
(unsigned long long)entry->bytes_before, entry->frames_before, entry->ts, entry->flags, entry->offset,
entry->offset, entry->size);
}
......@@ -943,7 +943,7 @@ gst_avi_demux_parse_index (GstAviDemux *avi_demux,
} while (TRUE);
if (GST_BUFFER_OFFSET (buf) != filepos + offset || GST_BUFFER_SIZE (buf) != 8) {
GST_INFO (GST_CAT_PLUGIN_INFO, "avidemux: could not get index, got %lld %d, expected %ld",
GST_INFO (GST_CAT_PLUGIN_INFO, "avidemux: could not get index, got %" G_GINT64_FORMAT " %d, expected %ld",
GST_BUFFER_OFFSET (buf), GST_BUFFER_SIZE (buf), filepos + offset);
goto end;
}
......@@ -1027,7 +1027,7 @@ gst_avi_demux_parse_index (GstAviDemux *avi_demux,
avi_stream_context *stream;
stream = &avi_demux->stream[i];
GST_DEBUG (GST_CAT_PLUGIN_INFO, "stream %i: %d frames, %lld bytes",
GST_DEBUG (GST_CAT_PLUGIN_INFO, "stream %i: %d frames, %" G_GINT64_FORMAT " bytes",
i, stream->total_frames, stream->total_bytes);
}
gst_buffer_unref (buf);
......@@ -1241,7 +1241,7 @@ gst_avi_demux_sync_streams (GstAviDemux *avi_demux, guint64 time)
for (i = 0; i < avi_demux->num_streams; i++) {
stream = &avi_demux->stream[i];
GST_DEBUG (0, "finding %d for time %lld", i, time);
GST_DEBUG (0, "finding %d for time %" G_GINT64_FORMAT, i, time);
entry = gst_avi_demux_index_entry_for_time (avi_demux, stream->num, time, GST_RIFF_IF_KEYFRAME);
if (entry) {
......@@ -1345,7 +1345,7 @@ gst_avi_demux_handle_src_event (GstPad *pad, GstEvent *event)
res = FALSE;
goto done;
}
GST_DEBUG (0, "seeking to %lld", desired_offset);
GST_DEBUG (0, "seeking to %" G_GINT64_FORMAT, desired_offset);
flags = GST_RIFF_IF_KEYFRAME;
......@@ -1362,7 +1362,7 @@ gst_avi_demux_handle_src_event (GstPad *pad, GstEvent *event)
avi_demux->last_seek = seek_entry->ts;
}
else {
GST_DEBUG (0, "no index entry found for time %lld", desired_offset);
GST_DEBUG (0, "no index entry found for time %" G_GINT64_FORMAT, desired_offset);
res = FALSE;
}
break;
......@@ -1414,7 +1414,7 @@ gst_avi_demux_handle_sink_event (GstAviDemux *avi_demux)
avi_stream_context *stream = &avi_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,
avi_demux->last_seek, stream->delay, avi_demux->last_seek + stream->delay);
discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME,
avi_demux->last_seek + stream->delay , NULL);
......@@ -1451,8 +1451,8 @@ gst_avi_demux_loop (GstElement *element)
bs = avi_demux->bs;
if (avi_demux->seek_pending) {
GST_DEBUG (0, "avidemux: seek pending to %lld %08llx",
avi_demux->seek_offset, avi_demux->seek_offset);
GST_DEBUG (0, "avidemux: seek pending to %" G_GINT64_FORMAT " %08llx",
avi_demux->seek_offset, (unsigned long long)avi_demux->seek_offset);
if (!gst_bytestream_seek (avi_demux->bs,
avi_demux->seek_offset,
......@@ -1624,7 +1624,7 @@ gst_avi_demux_loop (GstElement *element)
if (GST_PAD_IS_USABLE (stream->pad)) {
if (next_ts >= stream->end_pos) {
gst_pad_push (stream->pad, GST_BUFFER (gst_event_new (GST_EVENT_EOS)));
GST_DEBUG (0, "end stream %d: %lld %d %lld", stream_id, next_ts, stream->current_frame - 1,
GST_DEBUG (0, "end stream %d: %" G_GINT64_FORMAT " %d %" G_GINT64_FORMAT, stream_id, next_ts, stream->current_frame - 1,
stream->end_pos);
}
else {
......@@ -1640,7 +1640,7 @@ gst_avi_demux_loop (GstElement *element)
/* FIXME, do some flush event here */
stream->need_flush = FALSE;
}
GST_DEBUG (0, "send stream %d: %lld %d %lld %08x", stream_id, next_ts, stream->current_frame - 1,
GST_DEBUG (0, "send stream %d: %" G_GINT64_FORMAT " %d %" G_GINT64_FORMAT " %08x", stream_id, next_ts, stream->current_frame - 1,
stream->delay, chunk.size);
gst_pad_push(stream->pad, buf);
......
......@@ -35,11 +35,11 @@ void goom_init (guint32 resx, guint32 resy)
pixel = (guint32 *) malloc (buffsize * sizeof(guint32) + 128);
back = (guint32 *) malloc (buffsize * sizeof(guint32) + 128);
RAND_INIT ((guint32)pixel) ;
RAND_INIT (GPOINTER_TO_INT(pixel));
cycle = 0 ;
p1 = (guint32 *)((1+((unsigned int)(pixel))/128)*128);
p2 = (guint32 *)((1+((unsigned int)(back))/128)*128);
p1 = (void *)(((unsigned long)pixel + 0x7f)&(~0x7f));
p2 = (void *)(((unsigned long)back + 0x7f)&(~0x7f));
}
......@@ -53,11 +53,12 @@ void goom_set_resolution (guint32 resx, guint32 resy)
buffsize = resx * resy;
pixel = (guint32 *) malloc (buffsize * sizeof(guint32) + 128);
bzero(pixel,buffsize * sizeof(guint32) + 128);
memset(pixel,0,buffsize * sizeof(guint32) + 128);
back = (guint32 *) malloc (buffsize * sizeof(guint32) + 128);
bzero(back,buffsize * sizeof(guint32) + 128);
p1 = (guint32 *)((1+((unsigned int)(pixel))/128)*128);
p2 = (guint32 *)((1+((unsigned int)(back))/128)*128);
memset(back,0,buffsize * sizeof(guint32) + 128);
p1 = (void *)(((unsigned long)pixel + 0x7f)&(~0x7f));
p2 = (void *)(((unsigned long)back + 0x7f)&(~0x7f));
}
......
......@@ -242,7 +242,7 @@ gst_monoscope_chain (GstPad *pad, GstBuffer *bufin)
/* FIXME: should really select the first 1024 samples after the timestamp. */
if (GST_BUFFER_TIMESTAMP (bufin) < monoscope->next_time || samples_in < 1024) {
GST_DEBUG (0, "timestamp is %llu: want >= %llu", GST_BUFFER_TIMESTAMP (bufin), monoscope->next_time);
GST_DEBUG (0, "timestamp is %" G_GUINT64_FORMAT ": want >= %" G_GUINT64_FORMAT, GST_BUFFER_TIMESTAMP (bufin), monoscope->next_time);
gst_buffer_unref (bufin);
return;
}
......
......@@ -322,7 +322,7 @@ gst_qtdemux_loop (GstElement *element)
}
gst_qtp_read_bytes_atom_head(qtdemux,&atom);
GST_INFO (GST_CAT_PLUGIN_INFO,"gst_qtdemux_loop: atom(%c%c%c%c,%llu,%llu)\n",GST_FOURCC_TO_CHARSEQ(atom.type),atom.start,atom.size);
GST_INFO (GST_CAT_PLUGIN_INFO,"gst_qtdemux_loop: atom(%c%c%c%c,%" G_GUINT64_FORMAT ",%" G_GUINT64_FORMAT")\n",GST_FOURCC_TO_CHARSEQ(atom.type),atom.start,atom.size);
atom_type = g_hash_table_lookup (gst_qtp_type_registry,&atom.type);
if (!atom_type) {
......
......@@ -269,7 +269,7 @@ gst_udpsink_chain (GstPad *pad, GstBuffer *buf)
if (udpsink->clock) {
GstClockID id = gst_clock_new_single_shot_id (udpsink->clock, GST_BUFFER_TIMESTAMP (buf));
GST_DEBUG (0, "udpsink: clock wait: %llu\n", GST_BUFFER_TIMESTAMP (buf));
GST_DEBUG (0, "udpsink: clock wait: %" G_GUINT64_FORMAT "\n", GST_BUFFER_TIMESTAMP (buf));
gst_element_clock_wait (GST_ELEMENT (udpsink), id, NULL);
gst_clock_id_free (id);
}
......
......@@ -539,7 +539,7 @@ gst_wavparse_pad_query (GstPad *pad, GstQueryType type,
g_warning ("Could not query sink pad's peer\n");
return FALSE;
}
g_print ("DEBUG: pad_query done, value %lld\n", *value);
g_print ("DEBUG: pad_query done, value %" G_GINT64_FORMAT "\n", *value);
return TRUE;
}
......
......@@ -258,7 +258,7 @@ gst_osscommon_sync_parms (GstOssCommon *common)
space.bytes, common->fragment);
common->fragment_time = (GST_SECOND * common->fragment_size) / common->bps;
GST_INFO (GST_CAT_PLUGIN_INFO, "fragment time %u %llu\n",
GST_INFO (GST_CAT_PLUGIN_INFO, "fragment time %u %" G_GUINT64_FORMAT "\n",
common->bps, common->fragment_time);
if (target_format != common->format ||
......
......@@ -293,7 +293,7 @@ gst_osssrc_get (GstPad *pad)
src->curoffset += readbytes;
GST_DEBUG (GST_CAT_PLUGIN_INFO, "pushed buffer from soundcard of %ld bytes, timestamp %lld",
GST_DEBUG (GST_CAT_PLUGIN_INFO, "pushed buffer from soundcard of %ld bytes, timestamp %" G_GINT64_FORMAT,
readbytes, GST_BUFFER_TIMESTAMP (buf));
return buf;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment