Menu
▾
▴
[gst-cvs] tpm gst-plugins-base: gst-plugins-base/ gst-plugins-base/ext/alsa/ gst-plugins-base/ext/ogg/ gst-plugins-base/ext/vorbis/ gst-plugins-base/gst-libs/gst/audio/ gst-plugins-base/gst-libs/gst/cdda/ gst-plugins-base/gst-libs/gst/rtp/ gst-plugins-base/gst/audio
|
From: <tp...@ke...> - 2006-10-05 15:55:38
|
CVS Root: /cvs/gstreamer
Module: gst-plugins-base
Changes by: tpm
Date: Thu Oct 05 2006 15:55:33 UTC
Log message:
* ext/alsa/gstalsadeviceprobe.c:
(gst_alsa_device_property_probe_get_values):
* ext/alsa/gstalsasink.c: (set_hwparams):
* ext/ogg/gstoggdemux.c: (gst_ogg_demux_chain_elem_pad),
(gst_ogg_chain_new_stream), (gst_ogg_demux_read_chain):
* ext/ogg/gstoggmux.c: (gst_ogg_mux_send_headers),
(gst_ogg_mux_process_best_pad):
* ext/ogg/gstoggparse.c: (gst_ogg_parse_new_stream),
(gst_ogg_parse_chain):
* ext/ogg/gstogmparse.c: (gst_ogm_parse_stream_header):
* ext/vorbis/vorbisdec.c: (vorbis_handle_data_packet):
* ext/vorbis/vorbisenc.c: (gst_vorbis_enc_setup),
(gst_vorbis_enc_buffer_check_discontinuous):
* ext/vorbis/vorbisparse.c: (vorbis_parse_src_query):
* gst-libs/gst/audio/gstbaseaudiosink.c:
(gst_base_audio_sink_render):
* gst-libs/gst/cdda/gstcddabasesrc.c:
(gst_cdda_base_src_handle_track_seek):
* gst-libs/gst/rtp/gstbasertpdepayload.c:
(gst_base_rtp_depayload_push_full):
* gst-libs/gst/rtp/gstbasertppayload.c: (gst_basertppayload_push):
* gst/audioresample/resample.c: (resample_input_pushthrough):
* gst/playback/gstplaybasebin.c: (queue_out_of_data):
* gst/tcp/gstmultifdsink.c: (gst_multi_fd_sink_handle_clients):
* gst/typefind/gsttypefindfunctions.c: (mp3_type_find_at_offset),
(wavpack_type_find):
* gst/videotestsrc/gstvideotestsrc.c: (gst_video_test_src_create):
* sys/xvimage/xvimagesink.c: (gst_xvimage_buffer_destroy),
(gst_xvimagesink_check_xshm_calls), (gst_xvimagesink_xvimage_new):
* tests/check/elements/volume.c: (GST_START_TEST):
Printf format fixes.
Modified files:
. : ChangeLog
ext/alsa : gstalsadeviceprobe.c gstalsasink.c
ext/ogg : gstoggdemux.c gstoggmux.c gstoggparse.c
gstogmparse.c
ext/vorbis : vorbisdec.c vorbisenc.c vorbisparse.c
gst-libs/gst/audio: gstbaseaudiosink.c
gst-libs/gst/cdda: gstcddabasesrc.c
gst-libs/gst/rtp: gstbasertpdepayload.c gstbasertppayload.c
gst/audioresample: resample.c
gst/playback : gstplaybasebin.c
gst/tcp : gstmultifdsink.c
gst/typefind : gsttypefindfunctions.c
gst/videotestsrc: gstvideotestsrc.c
sys/xvimage : xvimagesink.c
tests/check/elements: volume.c
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.2946&r2=1.2947
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ext/alsa/gstalsadeviceprobe.c.diff?r1=1.2&r2=1.3
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ext/alsa/gstalsasink.c.diff?r1=1.79&r2=1.80
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ext/ogg/gstoggdemux.c.diff?r1=1.161&r2=1.162
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ext/ogg/gstoggmux.c.diff?r1=1.82&r2=1.83
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ext/ogg/gstoggparse.c.diff?r1=1.13&r2=1.14
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ext/ogg/gstogmparse.c.diff?r1=1.27&r2=1.28
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ext/vorbis/vorbisdec.c.diff?r1=1.115&r2=1.116
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ext/vorbis/vorbisenc.c.diff?r1=1.119&r2=1.120
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ext/vorbis/vorbisparse.c.diff?r1=1.18&r2=1.19
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/audio/gstbaseaudiosink.c.diff?r1=1.66&r2=1.67
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/cdda/gstcddabasesrc.c.diff?r1=1.10&r2=1.11
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/rtp/gstbasertpdepayload.c.diff?r1=1.38&r2=1.39
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/rtp/gstbasertppayload.c.diff?r1=1.16&r2=1.17
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst/audioresample/resample.c.diff?r1=1.6&r2=1.7
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst/playback/gstplaybasebin.c.diff?r1=1.122&r2=1.123
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst/tcp/gstmultifdsink.c.diff?r1=1.79&r2=1.80
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst/typefind/gsttypefindfunctions.c.diff?r1=1.119&r2=1.120
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst/videotestsrc/gstvideotestsrc.c.diff?r1=1.105&r2=1.106
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/sys/xvimage/xvimagesink.c.diff?r1=1.165&r2=1.166
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/tests/check/elements/volume.c.diff?r1=1.16&r2=1.17
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v
retrieving revision 1.2946
retrieving revision 1.2947
diff -u -d -r1.2946 -r1.2947
--- ChangeLog 4 Oct 2006 13:18:56 -0000 1.2946
+++ ChangeLog 5 Oct 2006 15:55:19 -0000 1.2947
@@ -1,3 +1,37 @@
+2006-10-05 Tim-Philipp Müller <tim at centricular dot net>
+
+ * ext/alsa/gstalsadeviceprobe.c:
+ (gst_alsa_device_property_probe_get_values):
+ * ext/alsa/gstalsasink.c: (set_hwparams):
+ * ext/ogg/gstoggdemux.c: (gst_ogg_demux_chain_elem_pad),
+ (gst_ogg_chain_new_stream), (gst_ogg_demux_read_chain):
+ * ext/ogg/gstoggmux.c: (gst_ogg_mux_send_headers),
+ (gst_ogg_mux_process_best_pad):
+ * ext/ogg/gstoggparse.c: (gst_ogg_parse_new_stream),
+ (gst_ogg_parse_chain):
+ * ext/ogg/gstogmparse.c: (gst_ogm_parse_stream_header):
+ * ext/vorbis/vorbisdec.c: (vorbis_handle_data_packet):
+ * ext/vorbis/vorbisenc.c: (gst_vorbis_enc_setup),
+ (gst_vorbis_enc_buffer_check_discontinuous):
+ * ext/vorbis/vorbisparse.c: (vorbis_parse_src_query):
+ * gst-libs/gst/audio/gstbaseaudiosink.c:
+ (gst_base_audio_sink_render):
+ * gst-libs/gst/cdda/gstcddabasesrc.c:
+ (gst_cdda_base_src_handle_track_seek):
+ * gst-libs/gst/rtp/gstbasertpdepayload.c:
+ (gst_base_rtp_depayload_push_full):
+ * gst-libs/gst/rtp/gstbasertppayload.c: (gst_basertppayload_push):
+ * gst/audioresample/resample.c: (resample_input_pushthrough):
+ * gst/playback/gstplaybasebin.c: (queue_out_of_data):
+ * gst/tcp/gstmultifdsink.c: (gst_multi_fd_sink_handle_clients):
+ * gst/typefind/gsttypefindfunctions.c: (mp3_type_find_at_offset),
+ (wavpack_type_find):
+ * gst/videotestsrc/gstvideotestsrc.c: (gst_video_test_src_create):
+ * sys/xvimage/xvimagesink.c: (gst_xvimage_buffer_destroy),
+ (gst_xvimagesink_check_xshm_calls), (gst_xvimagesink_xvimage_new):
+ * tests/check/elements/volume.c: (GST_START_TEST):
+ Printf format fixes.
2006-10-04 Thomas Vander Stichele <thomas at apestaart dot org>
* gst/tcp/gsttcp.c: (gst_tcp_gdp_read_caps):
Index: gstalsadeviceprobe.c
RCS file: /cvs/gstreamer/gst-plugins-base/ext/alsa/gstalsadeviceprobe.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gstalsadeviceprobe.c 18 May 2006 17:19:39 -0000 1.2
+++ gstalsadeviceprobe.c 5 Oct 2006 15:55:19 -0000 1.3
@@ -171,7 +171,7 @@
array = g_value_array_new (g_list_length (list));
g_value_init (&value, G_TYPE_STRING);
for (l = list; l != NULL; l = l->next) {
- GST_LOG_OBJECT (probe, "Found device: %s", l->data);
+ GST_LOG_OBJECT (probe, "Found device: %s", (gchar *) l->data);
g_value_take_string (&value, (gchar *) l->data);
l->data = NULL;
g_value_array_append (array, &value);
Index: gstalsasink.c
RCS file: /cvs/gstreamer/gst-plugins-base/ext/alsa/gstalsasink.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- gstalsasink.c 15 Sep 2006 09:09:00 -0000 1.79
+++ gstalsasink.c 5 Oct 2006 15:55:19 -0000 1.80
@@ -423,7 +423,7 @@
CHECK (snd_pcm_hw_params_get_period_size (params, &alsa->period_size, &dir),
period_size);
- GST_DEBUG_OBJECT (alsa, "buffer size %u, period size %u", alsa->buffer_size,
+ GST_DEBUG_OBJECT (alsa, "buffer size %lu, period size %lu", alsa->buffer_size,
alsa->period_size);
return 0;
Index: gstoggdemux.c
RCS file: /cvs/gstreamer/gst-plugins-base/ext/ogg/gstoggdemux.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- gstoggdemux.c 16 Sep 2006 21:54:47 -0000 1.161
+++ gstoggdemux.c 5 Oct 2006 15:55:20 -0000 1.162
@@ -926,7 +926,7 @@
no_decoder:
{
GST_WARNING_OBJECT (ogg,
- "pad %08x does not have elem_pad, no decoder ?", pad);
+ "pad %p does not have elem_pad, no decoder ?", pad);
return GST_FLOW_ERROR;
}
decoder_error:
@@ -1284,7 +1284,7 @@
GstTagList *list;
gchar *name;
- GST_DEBUG_OBJECT (chain->ogg, "creating new stream %08x in chain %p",
+ GST_DEBUG_OBJECT (chain->ogg, "creating new stream %08lx in chain %p",
serialno, chain);
ret = g_object_new (GST_TYPE_OGG_PAD, NULL);
@@ -1304,7 +1304,7 @@
ret->serialno = serialno;
if (ogg_stream_init (&ret->stream, serialno) != 0) {
- GST_ERROR ("Could not initialize ogg_stream struct for serial %08x.",
+ GST_ERROR ("Could not initialize ogg_stream struct for serial %08lx.",
serialno);
gst_object_unref (ret);
return NULL;
@@ -1316,7 +1316,7 @@
gst_tag_list_free (list);
GST_DEBUG_OBJECT (chain->ogg,
- "created new ogg src %p for stream with serial %08x", ret, serialno);
+ "created new ogg src %p for stream with serial %08lx", ret, serialno);
g_array_append_val (chain->streams, ret);
@@ -2258,7 +2258,7 @@
serial = ogg_page_serialno (&op);
if (gst_ogg_chain_get_stream (chain, serial) != NULL) {
- GST_WARNING_OBJECT (ogg, "found serial %08x BOS page twice, ignoring",
+ GST_WARNING_OBJECT (ogg, "found serial %08lx BOS page twice, ignoring",
serial);
continue;
}
@@ -2309,7 +2309,7 @@
}
/* the timestamp will be filled in when we submit the pages */
done &= (pad->start_time != GST_CLOCK_TIME_NONE);
- GST_LOG_OBJECT (ogg, "done %08x now %d", serial, done);
+ GST_LOG_OBJECT (ogg, "done %08lx now %d", serial, done);
/* we read a page not belonging to the current chain: seek back to the
Index: gstoggmux.c
RCS file: /cvs/gstreamer/gst-plugins-base/ext/ogg/gstoggmux.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- gstoggmux.c 29 Sep 2006 10:43:04 -0000 1.82
+++ gstoggmux.c 5 Oct 2006 15:55:20 -0000 1.83
@@ -1118,8 +1118,8 @@
/* if last header, flush page */
if (hwalk == NULL) {
GST_LOG_OBJECT (mux,
- "flushing page as packet %d is first or last packet",
- pad->packetno);
+ "flushing page as packet %" G_GUINT64_FORMAT " is first or "
+ "last packet", pad->packetno);
while (ogg_stream_flush (&pad->stream, &page)) {
GstBuffer *hbuf = gst_ogg_mux_buffer_from_page (mux, &page, FALSE);
@@ -1400,7 +1400,7 @@
GST_TIME_FORMAT ") caused new page",
granulepos, packet.packetno, GST_TIME_ARGS (timestamp));
GST_LOG_OBJECT (pad->collect.pad,
- GST_GP_FORMAT " new page %d", ogg_page_granulepos (&page),
+ GST_GP_FORMAT " new page %ld", ogg_page_granulepos (&page),
pad->stream.pageno);
if (ogg_page_granulepos (&page) == granulepos) {
Index: gstoggparse.c
RCS file: /cvs/gstreamer/gst-plugins-base/ext/ogg/gstoggparse.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gstoggparse.c 16 Sep 2006 21:54:47 -0000 1.13
+++ gstoggparse.c 5 Oct 2006 15:55:20 -0000 1.14
@@ -147,7 +147,7 @@
{
GstOggStream *ret;
- GST_DEBUG_OBJECT (parser, "creating new stream %08lx", serialno);
+ GST_DEBUG_OBJECT (parser, "creating new stream %08x", serialno);
ret = g_new0 (GstOggStream, 1);
@@ -410,8 +410,10 @@
serialno = ogg_page_serialno (&page);
GST_LOG_OBJECT (ogg,
- "processing ogg page (serial %08lx, pageno %ld, granule pos %llu, "
- "bos %d, offset %llu-%llu)", serialno, ogg_page_pageno (&page),
+ "processing ogg page (serial %08x, pageno %ld, "
+ "granule pos %" G_GUINT64_FORMAT ", bos %d, offset %"
+ G_GUINT64_FORMAT "-%" G_GUINT64_FORMAT ")",
+ serialno, ogg_page_pageno (&page),
granule, bos, startoffset, ogg->offset);
if (ogg_page_bos (&page)) {
Index: gstogmparse.c
RCS file: /cvs/gstreamer/gst-plugins-base/ext/ogg/gstogmparse.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- gstogmparse.c 23 Aug 2006 16:43:03 -0000 1.27
+++ gstogmparse.c 5 Oct 2006 15:55:20 -0000 1.28
@@ -570,7 +570,7 @@
GST_LOG_OBJECT (ogm, "Type: %s, subtype: 0x%04x, channels: %d, "
"samplerate: %d, blockalign: %d, bps: %d, caps = %" GST_PTR_FORMAT,
ogm->hdr.streamtype, codec_id, ogm->hdr.s.audio.channels,
- ogm->hdr.samples_per_unit, ogm->hdr.s.audio.blockalign,
+ (gint) ogm->hdr.samples_per_unit, ogm->hdr.s.audio.blockalign,
ogm->hdr.s.audio.avgbytespersec, caps);
break;
Index: vorbisdec.c
RCS file: /cvs/gstreamer/gst-plugins-base/ext/vorbis/vorbisdec.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- vorbisdec.c 26 Jul 2006 10:54:13 -0000 1.115
+++ vorbisdec.c 5 Oct 2006 15:55:20 -0000 1.116
@@ -997,7 +997,7 @@
if (vd->cur_timestamp != GST_CLOCK_TIME_NONE) {
GST_BUFFER_TIMESTAMP (out) = vd->cur_timestamp;
GST_DEBUG_OBJECT (vd,
- "cur_timestamp: %" GST_TIME_FORMAT " + %" GST_TIME_FORMAT " = % "
+ "cur_timestamp: %" GST_TIME_FORMAT " + %" GST_TIME_FORMAT " = %"
GST_TIME_FORMAT, GST_TIME_ARGS (vd->cur_timestamp),
GST_TIME_ARGS (GST_BUFFER_DURATION (out)),
GST_TIME_ARGS (vd->cur_timestamp + GST_BUFFER_DURATION (out)));
Index: vorbisenc.c
RCS file: /cvs/gstreamer/gst-plugins-base/ext/vorbis/vorbisenc.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- vorbisenc.c 23 Sep 2006 13:21:07 -0000 1.119
+++ vorbisenc.c 5 Oct 2006 15:55:20 -0000 1.120
@@ -787,7 +787,7 @@
max_bitrate, vorbisenc->bitrate, min_bitrate) != 0) {
GST_ERROR_OBJECT (vorbisenc,
"vorbis_encode_setup_managed "
- "(c %d, rate %d, max br %ld, br %ld, min br %ld) failed",
+ "(c %d, rate %d, max br %ld, br %d, min br %ld) failed",
vorbisenc->channels, vorbisenc->frequency, max_bitrate,
vorbisenc->bitrate, min_bitrate);
vorbis_info_clear (&vorbisenc->vi);
@@ -1012,8 +1012,8 @@
if ((GstClockTimeDiff) (GST_BUFFER_TIMESTAMP (buffer) -
vorbisenc->expected_ts) > halfsample) {
- GST_DEBUG_OBJECT (vorbisenc, "Expected TS % " GST_TIME_FORMAT
- ", buffer TS % " GST_TIME_FORMAT,
+ GST_DEBUG_OBJECT (vorbisenc, "Expected TS %" GST_TIME_FORMAT
+ ", buffer TS %" GST_TIME_FORMAT,
GST_TIME_ARGS (vorbisenc->expected_ts),
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer)));
ret = TRUE;
Index: vorbisparse.c
RCS file: /cvs/gstreamer/gst-plugins-base/ext/vorbis/vorbisparse.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- vorbisparse.c 3 Oct 2006 11:51:48 -0000 1.18
+++ vorbisparse.c 5 Oct 2006 15:55:20 -0000 1.19
@@ -580,8 +580,8 @@
gst_query_set_position (query, format, value);
- GST_LOG_OBJECT (parse,
- "query %u: peer returned granulepos: %llu - we return %llu (format %u)",
+ GST_LOG_OBJECT (parse, "query %p: peer returned granulepos: %"
+ G_GUINT64_FORMAT " - we return %" G_GUINT64_FORMAT " (format %u)",
query, granulepos, value, format);
Index: gstbaseaudiosink.c
RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/audio/gstbaseaudiosink.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- gstbaseaudiosink.c 28 Sep 2006 15:08:15 -0000 1.66
+++ gstbaseaudiosink.c 5 Oct 2006 15:55:20 -0000 1.67
@@ -618,7 +618,7 @@
gst_util_uint64_scale_int (render_time, ringbuf->spec.rate, GST_SECOND);
GST_DEBUG_OBJECT (sink, "render time %" GST_TIME_FORMAT
- ", render offset %llu, samples %lu",
+ ", render offset %llu, samples %u",
GST_TIME_ARGS (render_time), render_offset, samples);
/* never try to align samples when we are slaved to another clock, just
@@ -651,7 +651,7 @@
* non-discont should be aligned by definition. */
if (G_LIKELY (diff < ringbuf->spec.rate / DIFF_TOLERANCE)) {
GST_DEBUG_OBJECT (sink,
- "align with prev sample, %" G_GINT64_FORMAT " < %lu", diff,
+ "align with prev sample, %" G_GINT64_FORMAT " < %d", diff,
ringbuf->spec.rate / DIFF_TOLERANCE);
/* just align with previous sample then */
render_offset = sink->next_sample;
Index: gstcddabasesrc.c
RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/cdda/gstcddabasesrc.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gstcddabasesrc.c 23 Sep 2006 13:21:07 -0000 1.10
+++ gstcddabasesrc.c 5 Oct 2006 15:55:20 -0000 1.11
@@ -810,7 +810,7 @@
return FALSE;
- GST_DEBUG_OBJECT (src, "seeking to track %d", start + 1);
+ GST_DEBUG_OBJECT (src, "seeking to track %" G_GINT64_FORMAT, start + 1);
src->cur_sector = src->tracks[start].start;
GST_DEBUG_OBJECT (src, "starting at sector %d", src->cur_sector);
Index: gstbasertpdepayload.c
RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/rtp/gstbasertpdepayload.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- gstbasertpdepayload.c 27 Sep 2006 11:06:54 -0000 1.38
+++ gstbasertpdepayload.c 5 Oct 2006 15:55:20 -0000 1.39
@@ -359,8 +359,9 @@
bclass->set_gst_timestamp (filter, timestamp, out_buf);
/* push it */
- GST_LOG_OBJECT (filter, "Pushing buffer size %d, timestamp %u",
- GST_BUFFER_SIZE (out_buf), GST_BUFFER_TIMESTAMP (out_buf));
+ GST_LOG_OBJECT (filter, "Pushing buffer size %d, timestamp %" GST_TIME_FORMAT,
+ GST_BUFFER_SIZE (out_buf),
+ GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (out_buf)));
ret = gst_pad_push (filter->srcpad, out_buf);
GST_LOG_OBJECT (filter, "Pushed buffer: %s", gst_flow_get_name (ret));
Index: gstbasertppayload.c
RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/rtp/gstbasertppayload.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- gstbasertppayload.c 22 Sep 2006 14:13:34 -0000 1.16
+++ gstbasertppayload.c 5 Oct 2006 15:55:20 -0000 1.17
@@ -404,7 +404,7 @@
ts += rtime;
- GST_LOG_OBJECT (payload, "setting RTP timestamp %lu", ts);
+ GST_LOG_OBJECT (payload, "setting RTP timestamp %u", (guint) ts);
gst_rtp_buffer_set_timestamp (buffer, ts);
payload->timestamp = ts;
Index: resample.c
RCS file: /cvs/gstreamer/gst-plugins-base/gst/audioresample/resample.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- resample.c 2 Dec 2005 11:34:50 -0000 1.6
+++ resample.c 5 Oct 2006 15:55:20 -0000 1.7
@@ -155,7 +155,7 @@
buffer = audioresample_buffer_new_and_alloc (filter_bytes / 2);
memset (buffer->data, 0, buffer->length);
- RESAMPLE_DEBUG ("pushthrough", buffer->length);
+ RESAMPLE_DEBUG ("pushthrough %u", buffer->length);
audioresample_buffer_queue_push (r->queue, buffer);
}
Index: gstplaybasebin.c
RCS file: /cvs/gstreamer/gst-plugins-base/gst/playback/gstplaybasebin.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- gstplaybasebin.c 30 Sep 2006 15:30:07 -0000 1.122
+++ gstplaybasebin.c 5 Oct 2006 15:55:20 -0000 1.123
@@ -656,7 +656,7 @@
id = gst_pad_add_buffer_probe (sinkpad, G_CALLBACK (check_queue), queue);
g_object_set_data (G_OBJECT (queue), "probe", GINT_TO_POINTER (id));
GST_DEBUG_OBJECT (play_base_bin,
- "Re-attaching buffering probe to pad %s:%s",
+ "Re-attaching buffering probe to pad %s:%s %p",
GST_DEBUG_PAD_NAME (sinkpad), sinkpad);
gst_object_unref (sinkpad);
Index: gstmultifdsink.c
RCS file: /cvs/gstreamer/gst-plugins-base/gst/tcp/gstmultifdsink.c,v
--- gstmultifdsink.c 29 Sep 2006 08:20:03 -0000 1.79
+++ gstmultifdsink.c 5 Oct 2006 15:55:20 -0000 1.80
@@ -2248,7 +2248,7 @@
if (gst_fdset_fd_has_error (sink->fdset, &client->fd)) {
- GST_WARNING_OBJECT (sink, "gst_fdset_fd_has_error for %d", client->fd);
+ GST_WARNING_OBJECT (sink, "gst_fdset_fd_has_error for %d", client->fd.fd);
client->status = GST_CLIENT_STATUS_ERROR;
gst_multi_fd_sink_remove_client_link (sink, clients);
Index: gsttypefindfunctions.c
RCS file: /cvs/gstreamer/gst-plugins-base/gst/typefind/gsttypefindfunctions.c,v
--- gsttypefindfunctions.c 17 Sep 2006 21:58:06 -0000 1.119
+++ gsttypefindfunctions.c 5 Oct 2006 15:55:20 -0000 1.120
@@ -727,8 +727,8 @@
GST_INFO
("audio/mpeg calculated %u = %u * %u / %u * (%u - %u) / %u",
probability, GST_TYPE_FIND_MAXIMUM, found,
- GST_MP3_TYPEFIND_TRY_HEADERS, GST_MP3_TYPEFIND_TRY_SYNC, skipped,
- GST_MP3_TYPEFIND_TRY_SYNC);
+ GST_MP3_TYPEFIND_TRY_HEADERS, GST_MP3_TYPEFIND_TRY_SYNC,
+ (guint) skipped, GST_MP3_TYPEFIND_TRY_SYNC);
/* make sure we're not id3 tagged */
head_data = gst_type_find_peek (tf, -128, 3);
if (head_data && (memcmp (head_data, "TAG", 3) == 0)) {
@@ -906,7 +906,8 @@
sublen += 1 + 1; /* id + length */
if (sublen > blocksize - offset + 32) {
- GST_LOG ("chunk length too big (%u > %u)", sublen, blocksize - offset);
+ GST_LOG ("chunk length too big (%u > %" G_GUINT64_FORMAT ")", sublen,
+ blocksize - offset);
if ((data[0] & 0x20) == 0) {
Index: gstvideotestsrc.c
RCS file: /cvs/gstreamer/gst-plugins-base/gst/videotestsrc/gstvideotestsrc.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- gstvideotestsrc.c 18 Sep 2006 15:48:01 -0000 1.105
+++ gstvideotestsrc.c 5 Oct 2006 15:55:21 -0000 1.106
@@ -529,8 +529,8 @@
g_return_val_if_fail (newsize > 0, GST_FLOW_ERROR);
GST_LOG_OBJECT (src,
- "creating buffer of %ld bytes with %dx%d image for frame %d", newsize,
- src->width, src->height, src->n_frames);
+ "creating buffer of %lu bytes with %dx%d image for frame %d", newsize,
+ src->width, src->height, (gint) src->n_frames);
#ifdef USE_PEER_BUFFERALLOC
res =
@@ -575,7 +575,7 @@
eos:
- GST_DEBUG_OBJECT (src, "eos: 0 framerate and frame %d", src->n_frames);
+ GST_DEBUG_OBJECT (src, "eos: 0 framerate, frame %d", (gint) src->n_frames);
return GST_FLOW_UNEXPECTED;
no_buffer:
Index: xvimagesink.c
RCS file: /cvs/gstreamer/gst-plugins-base/sys/xvimage/xvimagesink.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- xvimagesink.c 30 Sep 2006 15:30:07 -0000 1.165
+++ xvimagesink.c 5 Oct 2006 15:55:21 -0000 1.166
@@ -246,7 +246,7 @@
#ifdef HAVE_XSHM
if (xvimagesink->xcontext->use_xshm) {
if (xvimage->SHMInfo.shmaddr != ((void *) -1)) {
- GST_DEBUG_OBJECT (xvimagesink, "XServer ShmDetaching from 0x%x id 0x%x\n",
+ GST_DEBUG_OBJECT (xvimagesink, "XServer ShmDetaching from 0x%x id 0x%lx",
xvimage->SHMInfo.shmid, xvimage->SHMInfo.shmseg);
XShmDetach (xvimagesink->xcontext->disp, &xvimage->SHMInfo);
XSync (xvimagesink->xcontext->disp, FALSE);
@@ -463,7 +463,7 @@
/* Sync to ensure we see any errors we caused */
XSync (xcontext->disp, FALSE);
- GST_DEBUG ("XServer ShmAttached to 0x%x, id 0x%x\n", SHMInfo.shmid,
+ GST_DEBUG ("XServer ShmAttached to 0x%x, id 0x%lx", SHMInfo.shmid,
SHMInfo.shmseg);
if (!error_caught) {
@@ -480,7 +480,7 @@
XSetErrorHandler (handler);
if (did_attach) {
- GST_DEBUG ("XServer ShmDetaching from 0x%x id 0x%x\n",
+ GST_DEBUG ("XServer ShmDetaching from 0x%x id 0x%lx",
SHMInfo.shmid, SHMInfo.shmseg);
XShmDetach (xcontext->disp, &SHMInfo);
XSync (xcontext->disp, FALSE);
@@ -589,7 +589,7 @@
XSync (xvimagesink->xcontext->disp, FALSE);
- GST_DEBUG_OBJECT (xvimagesink, "XServer ShmAttached to 0x%x, id 0x%x\n",
+ GST_DEBUG_OBJECT (xvimagesink, "XServer ShmAttached to 0x%x, id 0x%lx",
xvimage->SHMInfo.shmid, xvimage->SHMInfo.shmseg);
} else
#endif /* HAVE_XSHM */
Index: volume.c
RCS file: /cvs/gstreamer/gst-plugins-base/tests/check/elements/volume.c,v
--- volume.c 16 Sep 2006 22:30:50 -0000 1.16
+++ volume.c 5 Oct 2006 15:55:21 -0000 1.17
@@ -129,8 +129,7 @@
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
fail_unless (inbuffer == outbuffer);
res = (gint16 *) GST_BUFFER_DATA (outbuffer);
- GST_INFO ("expected %+5ld %+5ld real %+5ld %+5ld", in[0], in[1], res[0],
- res[1]);
+ GST_INFO ("expected %+5d %+5d real %+5d %+5d", in[0], in[1], res[0], res[1]);
fail_unless (memcmp (GST_BUFFER_DATA (inbuffer), in, 4) == 0);
/* cleanup */
@@ -176,7 +175,7 @@
- GST_INFO ("expected %+5ld %+5ld real %+5ld %+5ld", out[0], out[1], res[0],
+ GST_INFO ("expected %+5d %+5d real %+5d %+5d", out[0], out[1], res[0],
res[1]);
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 4) == 0);
@@ -223,7 +222,7 @@
@@ -271,7 +270,7 @@
@@ -359,8 +358,7 @@
|