mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-23 18:21:04 +00:00
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.
This commit is contained in:
parent
4d7724b183
commit
0a1d9ddd6a
7 changed files with 16 additions and 15 deletions
|
@ -842,7 +842,7 @@ cdparanoia_event (GstPad *pad, GstEvent *event)
|
|||
src->first_sector, src->last_sector);
|
||||
|
||||
if (paranoia_seek (src->p, seg_start_sector, SEEK_SET) > -1) {
|
||||
GST_DEBUG (0, "seeked to %lld", seg_start_sector);
|
||||
GST_DEBUG (0, "seeked to %" G_GINT64_FORMAT, seg_start_sector);
|
||||
|
||||
src->segment_start_sector = seg_start_sector;;
|
||||
src->cur_sector = src->segment_start_sector;
|
||||
|
|
|
@ -318,10 +318,10 @@ gst_gnomevfssink_chain (GstPad *pad, GstBuffer *buf)
|
|||
if (GST_FLAG_IS_SET (sink, GST_GNOMEVFSSINK_OPEN))
|
||||
{
|
||||
result = gnome_vfs_write(sink->handle, GST_BUFFER_DATA(buf), GST_BUFFER_SIZE (buf), &bytes_written);
|
||||
GST_DEBUG (0, "write: %s, written_bytes: %Lu", gnome_vfs_result_to_string(result), bytes_written);
|
||||
GST_DEBUG (0, "write: %s, written_bytes: %" G_GUINT64_FORMAT, gnome_vfs_result_to_string(result), bytes_written);
|
||||
if (bytes_written < GST_BUFFER_SIZE (buf))
|
||||
{
|
||||
printf ("gnomevfssink : Warning : %d bytes should be written, only %Lu bytes written\n",
|
||||
printf ("gnomevfssink : Warning : %d bytes should be written, only %" G_GUINT64_FORMAT " bytes written\n",
|
||||
GST_BUFFER_SIZE (buf), bytes_written);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -896,7 +896,7 @@ static GstBuffer *gst_gnomevfssrc_get(GstPad *pad)
|
|||
GstEvent *event;
|
||||
|
||||
gst_buffer_unref (buf);
|
||||
GST_DEBUG (0,"new seek %lld", src->curoffset);
|
||||
GST_DEBUG (0,"new seek %" G_GINT64_FORMAT, src->curoffset);
|
||||
src->new_seek = FALSE;
|
||||
|
||||
GST_DEBUG (GST_CAT_EVENT, "gnomevfssrc sending discont");
|
||||
|
@ -943,7 +943,7 @@ static GstBuffer *gst_gnomevfssrc_get(GstPad *pad)
|
|||
GstEvent *event;
|
||||
|
||||
gst_buffer_unref (buf);
|
||||
GST_DEBUG (0,"new seek %lld", src->curoffset);
|
||||
GST_DEBUG (0,"new seek %" G_GINT64_FORMAT, src->curoffset);
|
||||
src->new_seek = FALSE;
|
||||
|
||||
GST_DEBUG (GST_CAT_EVENT, "gnomevfssrc sending discont");
|
||||
|
@ -956,7 +956,7 @@ static GstBuffer *gst_gnomevfssrc_get(GstPad *pad)
|
|||
result = gnome_vfs_read(src->handle, GST_BUFFER_DATA(buf),
|
||||
src->bytes_per_read, &readbytes);
|
||||
|
||||
GST_DEBUG(0, "read: %s, readbytes: %Lu",
|
||||
GST_DEBUG(0, "read: %s, readbytes: %" G_GINT64_FORMAT,
|
||||
gnome_vfs_result_to_string(result), readbytes);
|
||||
/* deal with EOS */
|
||||
if (readbytes == 0)
|
||||
|
@ -1069,7 +1069,7 @@ static gboolean gst_gnomevfssrc_open_file(GstGnomeVFSSrc *src)
|
|||
else
|
||||
src->size = 0;
|
||||
|
||||
GST_DEBUG(0, "size %lld", src->size);
|
||||
GST_DEBUG(0, "size %" G_GINT64_FORMAT, src->size);
|
||||
|
||||
audiocast_do_notifications(src);
|
||||
|
||||
|
|
|
@ -231,7 +231,7 @@ gst_vorbisfile_read (void *ptr, size_t size, size_t nmemb, void *datasource)
|
|||
|
||||
VorbisFile *vorbisfile = GST_VORBISFILE (datasource);
|
||||
|
||||
GST_DEBUG (0, "read %d", read_size);
|
||||
GST_DEBUG (0, "read %" G_GINT64_FORMAT, read_size);
|
||||
|
||||
/* make sure we don't go to EOS */
|
||||
if (!vorbisfile->may_eos && vorbisfile->total_bytes &&
|
||||
|
@ -290,7 +290,7 @@ gst_vorbisfile_seek (void *datasource, int64_t offset, int whence)
|
|||
return -1;
|
||||
}
|
||||
|
||||
GST_DEBUG (0, "seek %lld %d", offset, whence);
|
||||
GST_DEBUG (0, "seek %" G_GINT64_FORMAT " %d", offset, whence);
|
||||
|
||||
if (whence == SEEK_SET) {
|
||||
method = GST_SEEK_METHOD_SET;
|
||||
|
|
|
@ -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));
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -265,12 +265,12 @@ gst_v4lmjpegsink_chain (GstPad *pad,
|
|||
if (v4lmjpegsink->clock) {
|
||||
GstClockID id;
|
||||
|
||||
GST_DEBUG (0,"videosink: clock wait: %llu", GST_BUFFER_TIMESTAMP(buf));
|
||||
GST_DEBUG (0,"videosink: clock wait: %" G_GUINT64_FORMAT, GST_BUFFER_TIMESTAMP(buf));
|
||||
|
||||
jitter = 0; /* FIXME: jitter = gst_clock_current_diff(v4lmjpegsink->clock, GST_BUFFER_TIMESTAMP (buf)); */
|
||||
|
||||
if (jitter > 500000 || jitter < -500000)
|
||||
GST_DEBUG (0, "jitter: %lld", jitter);
|
||||
GST_DEBUG (0, "jitter: %" G_GINT64_FORMAT, jitter);
|
||||
|
||||
id = gst_clock_new_single_shot_id (v4lmjpegsink->clock, GST_BUFFER_TIMESTAMP(buf));
|
||||
gst_element_clock_wait(GST_ELEMENT(v4lmjpegsink), id, NULL);
|
||||
|
|
Loading…
Reference in a new issue