mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 07:28:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

Printf format fixes.

Browse source 
Original commit message from CVS:
* 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.
This commit is contained in:
Tim-Philipp Müller 2006-10-05 15:55:21 +00:00
parent d73263cd30
commit 9e107d670a
22 changed files with 84 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
ChangeLog
View file

@ -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> 2006-10-04 Thomas Vander Stichele <thomas at apestaart dot org>
* gst/tcp/gsttcp.c: (gst_tcp_gdp_read_caps): * gst/tcp/gsttcp.c: (gst_tcp_gdp_read_caps):

2
common

@ -1 +1 @@
Subproject commit 9991f6fa61ee11475c390dd6675ef7952f079e43 Subproject commit a4af1b8542911352e29d53fba47e2c3d7231ebdb

2
ext/alsa/gstalsadeviceprobe.c
View file

@ -171,7 +171,7 @@ gst_alsa_device_property_probe_get_values (GstPropertyProbe * probe,
array = g_value_array_new (g_list_length (list)); array = g_value_array_new (g_list_length (list));
g_value_init (&value, G_TYPE_STRING); g_value_init (&value, G_TYPE_STRING);
for (l = list; l != NULL; l = l->next) { 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); g_value_take_string (&value, (gchar *) l->data);
l->data = NULL; l->data = NULL;
g_value_array_append (array, &value); g_value_array_append (array, &value);

2
ext/alsa/gstalsasink.c
View file

@ -423,7 +423,7 @@ retry:
CHECK (snd_pcm_hw_params_get_period_size (params, &alsa->period_size, &dir), CHECK (snd_pcm_hw_params_get_period_size (params, &alsa->period_size, &dir),
period_size); 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); alsa->period_size);
return 0; return 0;

12
ext/ogg/gstoggdemux.c
View file

@ -926,7 +926,7 @@ gst_ogg_demux_chain_elem_pad (GstOggPad * pad, ogg_packet * packet)
no_decoder: no_decoder:
{ {
GST_WARNING_OBJECT (ogg, 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; return GST_FLOW_ERROR;
} }
decoder_error: decoder_error:
@ -1284,7 +1284,7 @@ gst_ogg_chain_new_stream (GstOggChain * chain, glong serialno)
GstTagList *list; GstTagList *list;
gchar *name; 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); serialno, chain);
ret = g_object_new (GST_TYPE_OGG_PAD, NULL); ret = g_object_new (GST_TYPE_OGG_PAD, NULL);
@ -1304,7 +1304,7 @@ gst_ogg_chain_new_stream (GstOggChain * chain, glong serialno)
ret->serialno = serialno; ret->serialno = serialno;
if (ogg_stream_init (&ret->stream, serialno) != 0) { 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); serialno);
gst_object_unref (ret); gst_object_unref (ret);
return NULL; return NULL;
@ -1316,7 +1316,7 @@ gst_ogg_chain_new_stream (GstOggChain * chain, glong serialno)
gst_tag_list_free (list); gst_tag_list_free (list);
GST_DEBUG_OBJECT (chain->ogg, 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); g_array_append_val (chain->streams, ret);
@ -2258,7 +2258,7 @@ gst_ogg_demux_read_chain (GstOggDemux * ogg)
serial = ogg_page_serialno (&op); serial = ogg_page_serialno (&op);
if (gst_ogg_chain_get_stream (chain, serial) != NULL) { 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); serial);
continue; continue;
} }
@ -2309,7 +2309,7 @@ gst_ogg_demux_read_chain (GstOggDemux * ogg)
} }
/* the timestamp will be filled in when we submit the pages */ /* the timestamp will be filled in when we submit the pages */
done &= (pad->start_time != GST_CLOCK_TIME_NONE); 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 /* we read a page not belonging to the current chain: seek back to the

6
ext/ogg/gstoggmux.c
View file

@ -1118,8 +1118,8 @@ gst_ogg_mux_send_headers (GstOggMux * mux)
/* if last header, flush page */ /* if last header, flush page */
if (hwalk == NULL) { if (hwalk == NULL) {
GST_LOG_OBJECT (mux, GST_LOG_OBJECT (mux,
"flushing page as packet %d is first or last packet", "flushing page as packet %" G_GUINT64_FORMAT " is first or "
pad->packetno); "last packet", pad->packetno);
while (ogg_stream_flush (&pad->stream, &page)) { while (ogg_stream_flush (&pad->stream, &page)) {
GstBuffer *hbuf = gst_ogg_mux_buffer_from_page (mux, &page, FALSE); GstBuffer *hbuf = gst_ogg_mux_buffer_from_page (mux, &page, FALSE);
@ -1400,7 +1400,7 @@ gst_ogg_mux_process_best_pad (GstOggMux * ogg_mux, GstOggPad * best)
GST_TIME_FORMAT ") caused new page", GST_TIME_FORMAT ") caused new page",
granulepos, packet.packetno, GST_TIME_ARGS (timestamp)); granulepos, packet.packetno, GST_TIME_ARGS (timestamp));
GST_LOG_OBJECT (pad->collect.pad, 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); pad->stream.pageno);
if (ogg_page_granulepos (&page) == granulepos) { if (ogg_page_granulepos (&page) == granulepos) {

8
ext/ogg/gstoggparse.c
View file

@ -147,7 +147,7 @@ gst_ogg_parse_new_stream (GstOggParse * parser, guint32 serialno)
{ {
GstOggStream *ret; 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); ret = g_new0 (GstOggStream, 1);
@ -410,8 +410,10 @@ gst_ogg_parse_chain (GstPad * pad, GstBuffer * buffer)
serialno = ogg_page_serialno (&page); serialno = ogg_page_serialno (&page);
GST_LOG_OBJECT (ogg, GST_LOG_OBJECT (ogg,
"processing ogg page (serial %08lx, pageno %ld, granule pos %llu, " "processing ogg page (serial %08x, pageno %ld, "
"bos %d, offset %llu-%llu)", serialno, ogg_page_pageno (&page), "granule pos %" G_GUINT64_FORMAT ", bos %d, offset %"
G_GUINT64_FORMAT "-%" G_GUINT64_FORMAT ")",
serialno, ogg_page_pageno (&page),
granule, bos, startoffset, ogg->offset); granule, bos, startoffset, ogg->offset);
if (ogg_page_bos (&page)) { if (ogg_page_bos (&page)) {

2
ext/ogg/gstogmparse.c
View file

@ -570,7 +570,7 @@ gst_ogm_parse_stream_header (GstOgmParse * ogm, const guint8 * data, guint size)
GST_LOG_OBJECT (ogm, "Type: %s, subtype: 0x%04x, channels: %d, " GST_LOG_OBJECT (ogm, "Type: %s, subtype: 0x%04x, channels: %d, "
"samplerate: %d, blockalign: %d, bps: %d, caps = %" GST_PTR_FORMAT, "samplerate: %d, blockalign: %d, bps: %d, caps = %" GST_PTR_FORMAT,
ogm->hdr.streamtype, codec_id, ogm->hdr.s.audio.channels, 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); ogm->hdr.s.audio.avgbytespersec, caps);
break; break;
} }

2
ext/vorbis/vorbisdec.c
View file

@ -997,7 +997,7 @@ vorbis_handle_data_packet (GstVorbisDec * vd, ogg_packet * packet)
if (vd->cur_timestamp != GST_CLOCK_TIME_NONE) { if (vd->cur_timestamp != GST_CLOCK_TIME_NONE) {
GST_BUFFER_TIMESTAMP (out) = vd->cur_timestamp; GST_BUFFER_TIMESTAMP (out) = vd->cur_timestamp;
GST_DEBUG_OBJECT (vd, 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_FORMAT, GST_TIME_ARGS (vd->cur_timestamp),
GST_TIME_ARGS (GST_BUFFER_DURATION (out)), GST_TIME_ARGS (GST_BUFFER_DURATION (out)),
GST_TIME_ARGS (vd->cur_timestamp + GST_BUFFER_DURATION (out))); GST_TIME_ARGS (vd->cur_timestamp + GST_BUFFER_DURATION (out)));

6
ext/vorbis/vorbisenc.c
View file

@ -787,7 +787,7 @@ gst_vorbis_enc_setup (GstVorbisEnc * vorbisenc)
max_bitrate, vorbisenc->bitrate, min_bitrate) != 0) { max_bitrate, vorbisenc->bitrate, min_bitrate) != 0) {
GST_ERROR_OBJECT (vorbisenc, GST_ERROR_OBJECT (vorbisenc,
"vorbis_encode_setup_managed " "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->channels, vorbisenc->frequency, max_bitrate,
vorbisenc->bitrate, min_bitrate); vorbisenc->bitrate, min_bitrate);
vorbis_info_clear (&vorbisenc->vi); vorbis_info_clear (&vorbisenc->vi);
@ -1012,8 +1012,8 @@ gst_vorbis_enc_buffer_check_discontinuous (GstVorbisEnc * vorbisenc,
if ((GstClockTimeDiff) (GST_BUFFER_TIMESTAMP (buffer) - if ((GstClockTimeDiff) (GST_BUFFER_TIMESTAMP (buffer) -
vorbisenc->expected_ts) > halfsample) { vorbisenc->expected_ts) > halfsample) {
GST_DEBUG_OBJECT (vorbisenc, "Expected TS % " GST_TIME_FORMAT GST_DEBUG_OBJECT (vorbisenc, "Expected TS %" GST_TIME_FORMAT
", buffer TS % " GST_TIME_FORMAT, ", buffer TS %" GST_TIME_FORMAT,
GST_TIME_ARGS (vorbisenc->expected_ts), GST_TIME_ARGS (vorbisenc->expected_ts),
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer))); GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer)));
ret = TRUE; ret = TRUE;

4
ext/vorbis/vorbisparse.c
View file

@ -580,8 +580,8 @@ vorbis_parse_src_query (GstPad * pad, GstQuery * query)
gst_query_set_position (query, format, value); gst_query_set_position (query, format, value);
GST_LOG_OBJECT (parse, GST_LOG_OBJECT (parse, "query %p: peer returned granulepos: %"
"query %u: peer returned granulepos: %llu - we return %llu (format %u)", G_GUINT64_FORMAT " - we return %" G_GUINT64_FORMAT " (format %u)",
query, granulepos, value, format); query, granulepos, value, format);
break; break;

4
gst-libs/gst/audio/gstbaseaudiosink.c
View file

@ -618,7 +618,7 @@ gst_base_audio_sink_render (GstBaseSink * bsink, GstBuffer * buf)
gst_util_uint64_scale_int (render_time, ringbuf->spec.rate, GST_SECOND); gst_util_uint64_scale_int (render_time, ringbuf->spec.rate, GST_SECOND);
GST_DEBUG_OBJECT (sink, "render time %" GST_TIME_FORMAT 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); GST_TIME_ARGS (render_time), render_offset, samples);
/* never try to align samples when we are slaved to another clock, just /* never try to align samples when we are slaved to another clock, just
@ -651,7 +651,7 @@ gst_base_audio_sink_render (GstBaseSink * bsink, GstBuffer * buf)
* non-discont should be aligned by definition. */ * non-discont should be aligned by definition. */
if (G_LIKELY (diff < ringbuf->spec.rate / DIFF_TOLERANCE)) { if (G_LIKELY (diff < ringbuf->spec.rate / DIFF_TOLERANCE)) {
GST_DEBUG_OBJECT (sink, 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); ringbuf->spec.rate / DIFF_TOLERANCE);
/* just align with previous sample then */ /* just align with previous sample then */
render_offset = sink->next_sample; render_offset = sink->next_sample;

2
gst-libs/gst/cdda/gstcddabasesrc.c
View file

@ -810,7 +810,7 @@ gst_cdda_base_src_handle_track_seek (GstCddaBaseSrc * src, gdouble rate,
return FALSE; 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; src->cur_sector = src->tracks[start].start;
GST_DEBUG_OBJECT (src, "starting at sector %d", src->cur_sector); GST_DEBUG_OBJECT (src, "starting at sector %d", src->cur_sector);

5
gst-libs/gst/rtp/gstbasertpdepayload.c
View file

@ -359,8 +359,9 @@ gst_base_rtp_depayload_push_full (GstBaseRTPDepayload * filter,
bclass->set_gst_timestamp (filter, timestamp, out_buf); bclass->set_gst_timestamp (filter, timestamp, out_buf);
/* push it */ /* push it */
GST_LOG_OBJECT (filter, "Pushing buffer size %d, timestamp %u", GST_LOG_OBJECT (filter, "Pushing buffer size %d, timestamp %" GST_TIME_FORMAT,
GST_BUFFER_SIZE (out_buf), GST_BUFFER_TIMESTAMP (out_buf)); GST_BUFFER_SIZE (out_buf),
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (out_buf)));
ret = gst_pad_push (filter->srcpad, out_buf); ret = gst_pad_push (filter->srcpad, out_buf);
GST_LOG_OBJECT (filter, "Pushed buffer: %s", gst_flow_get_name (ret)); GST_LOG_OBJECT (filter, "Pushed buffer: %s", gst_flow_get_name (ret));

2
gst-libs/gst/rtp/gstbasertppayload.c
View file

@ -404,7 +404,7 @@ gst_basertppayload_push (GstBaseRTPPayload * payload, GstBuffer * buffer)
ts += rtime; 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); gst_rtp_buffer_set_timestamp (buffer, ts);
payload->timestamp = ts; payload->timestamp = ts;

2
gst/audioresample/resample.c
View file

@ -155,7 +155,7 @@ resample_input_pushthrough (ResampleState * r)
buffer = audioresample_buffer_new_and_alloc (filter_bytes / 2); buffer = audioresample_buffer_new_and_alloc (filter_bytes / 2);
memset (buffer->data, 0, buffer->length); memset (buffer->data, 0, buffer->length);
RESAMPLE_DEBUG ("pushthrough", buffer->length); RESAMPLE_DEBUG ("pushthrough %u", buffer->length);
audioresample_buffer_queue_push (r->queue, buffer); audioresample_buffer_queue_push (r->queue, buffer);
} }

2
gst/playback/gstplaybasebin.c
View file

@ -656,7 +656,7 @@ queue_out_of_data (GstElement * queue, GstPlayBaseBin * play_base_bin)
id = gst_pad_add_buffer_probe (sinkpad, G_CALLBACK (check_queue), queue); id = gst_pad_add_buffer_probe (sinkpad, G_CALLBACK (check_queue), queue);
g_object_set_data (G_OBJECT (queue), "probe", GINT_TO_POINTER (id)); g_object_set_data (G_OBJECT (queue), "probe", GINT_TO_POINTER (id));
GST_DEBUG_OBJECT (play_base_bin, 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_DEBUG_PAD_NAME (sinkpad), sinkpad);
gst_object_unref (sinkpad); gst_object_unref (sinkpad);

2
gst/tcp/gstmultifdsink.c
View file

@ -2248,7 +2248,7 @@ gst_multi_fd_sink_handle_clients (GstMultiFdSink * sink)
continue; continue;
} }
if (gst_fdset_fd_has_error (sink->fdset, &client->fd)) { 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; client->status = GST_CLIENT_STATUS_ERROR;
gst_multi_fd_sink_remove_client_link (sink, clients); gst_multi_fd_sink_remove_client_link (sink, clients);
continue; continue;

7
gst/typefind/gsttypefindfunctions.c
View file

@ -727,8 +727,8 @@ mp3_type_find_at_offset (GstTypeFind * tf, guint64 start_off,
GST_INFO GST_INFO
("audio/mpeg calculated %u = %u * %u / %u * (%u - %u) / %u", ("audio/mpeg calculated %u = %u * %u / %u * (%u - %u) / %u",
probability, GST_TYPE_FIND_MAXIMUM, found, probability, GST_TYPE_FIND_MAXIMUM, found,
GST_MP3_TYPEFIND_TRY_HEADERS, GST_MP3_TYPEFIND_TRY_SYNC, skipped, GST_MP3_TYPEFIND_TRY_HEADERS, GST_MP3_TYPEFIND_TRY_SYNC,
GST_MP3_TYPEFIND_TRY_SYNC); (guint) skipped, GST_MP3_TYPEFIND_TRY_SYNC);
/* make sure we're not id3 tagged */ /* make sure we're not id3 tagged */
head_data = gst_type_find_peek (tf, -128, 3); head_data = gst_type_find_peek (tf, -128, 3);
if (head_data && (memcmp (head_data, "TAG", 3) == 0)) { if (head_data && (memcmp (head_data, "TAG", 3) == 0)) {
@ -906,7 +906,8 @@ wavpack_type_find (GstTypeFind * tf, gpointer unused)
sublen += 1 + 1; /* id + length */ sublen += 1 + 1; /* id + length */
} }
if (sublen > blocksize - offset + 32) { 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);
break; break;
} }
if ((data[0] & 0x20) == 0) { if ((data[0] & 0x20) == 0) {

6
gst/videotestsrc/gstvideotestsrc.c
View file

@ -529,8 +529,8 @@ gst_video_test_src_create (GstPushSrc * psrc, GstBuffer ** buffer)
g_return_val_if_fail (newsize > 0, GST_FLOW_ERROR); g_return_val_if_fail (newsize > 0, GST_FLOW_ERROR);
GST_LOG_OBJECT (src, GST_LOG_OBJECT (src,
"creating buffer of %ld bytes with %dx%d image for frame %d", newsize, "creating buffer of %lu bytes with %dx%d image for frame %d", newsize,
src->width, src->height, src->n_frames); src->width, src->height, (gint) src->n_frames);
#ifdef USE_PEER_BUFFERALLOC #ifdef USE_PEER_BUFFERALLOC
res = res =
@ -575,7 +575,7 @@ not_negotiated:
} }
eos: 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; return GST_FLOW_UNEXPECTED;
} }
no_buffer: no_buffer:

8
sys/xvimage/xvimagesink.c
View file

@ -246,7 +246,7 @@ gst_xvimage_buffer_destroy (GstXvImageBuffer * xvimage)
#ifdef HAVE_XSHM #ifdef HAVE_XSHM
if (xvimagesink->xcontext->use_xshm) { if (xvimagesink->xcontext->use_xshm) {
if (xvimage->SHMInfo.shmaddr != ((void *) -1)) { 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); xvimage->SHMInfo.shmid, xvimage->SHMInfo.shmseg);
XShmDetach (xvimagesink->xcontext->disp, &xvimage->SHMInfo); XShmDetach (xvimagesink->xcontext->disp, &xvimage->SHMInfo);
XSync (xvimagesink->xcontext->disp, FALSE); XSync (xvimagesink->xcontext->disp, FALSE);
@ -463,7 +463,7 @@ gst_xvimagesink_check_xshm_calls (GstXContext * xcontext)
/* Sync to ensure we see any errors we caused */ /* Sync to ensure we see any errors we caused */
XSync (xcontext->disp, FALSE); 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); SHMInfo.shmseg);
if (!error_caught) { if (!error_caught) {
@ -480,7 +480,7 @@ beach:
XSetErrorHandler (handler); XSetErrorHandler (handler);
if (did_attach) { 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); SHMInfo.shmid, SHMInfo.shmseg);
XShmDetach (xcontext->disp, &SHMInfo); XShmDetach (xcontext->disp, &SHMInfo);
XSync (xcontext->disp, FALSE); XSync (xcontext->disp, FALSE);
@ -589,7 +589,7 @@ gst_xvimagesink_xvimage_new (GstXvImageSink * xvimagesink, GstCaps * caps)
} }
XSync (xvimagesink->xcontext->disp, FALSE); 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); xvimage->SHMInfo.shmid, xvimage->SHMInfo.shmseg);
} else } else
#endif /* HAVE_XSHM */ #endif /* HAVE_XSHM */

12
tests/check/elements/volume.c
View file

@ -129,8 +129,7 @@ GST_START_TEST (test_unity)
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL); fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
fail_unless (inbuffer == outbuffer); fail_unless (inbuffer == outbuffer);
res = (gint16 *) GST_BUFFER_DATA (outbuffer); res = (gint16 *) GST_BUFFER_DATA (outbuffer);
GST_INFO ("expected %+5ld %+5ld real %+5ld %+5ld", in[0], in[1], res[0], GST_INFO ("expected %+5d %+5d real %+5d %+5d", in[0], in[1], res[0], res[1]);
res[1]);
fail_unless (memcmp (GST_BUFFER_DATA (inbuffer), in, 4) == 0); fail_unless (memcmp (GST_BUFFER_DATA (inbuffer), in, 4) == 0);
/* cleanup */ /* cleanup */
@ -176,7 +175,7 @@ GST_START_TEST (test_half)
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL); fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
fail_unless (inbuffer == outbuffer); fail_unless (inbuffer == outbuffer);
res = (gint16 *) GST_BUFFER_DATA (outbuffer); res = (gint16 *) GST_BUFFER_DATA (outbuffer);
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]); res[1]);
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 4) == 0); fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 4) == 0);
@ -223,7 +222,7 @@ GST_START_TEST (test_double)
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL); fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
fail_unless (inbuffer == outbuffer); fail_unless (inbuffer == outbuffer);
res = (gint16 *) GST_BUFFER_DATA (outbuffer); res = (gint16 *) GST_BUFFER_DATA (outbuffer);
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]); res[1]);
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 4) == 0); fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 4) == 0);
@ -271,7 +270,7 @@ GST_START_TEST (test_mute)
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL); fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
fail_unless (inbuffer == outbuffer); fail_unless (inbuffer == outbuffer);
res = (gint16 *) GST_BUFFER_DATA (outbuffer); res = (gint16 *) GST_BUFFER_DATA (outbuffer);
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]); res[1]);
fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 4) == 0); fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 4) == 0);
@ -359,8 +358,7 @@ GST_START_TEST (test_passthrough)
fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL); fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
fail_unless (inbuffer == outbuffer); fail_unless (inbuffer == outbuffer);
res = (gint16 *) GST_BUFFER_DATA (outbuffer); res = (gint16 *) GST_BUFFER_DATA (outbuffer);
GST_INFO ("expected %+5ld %+5ld real %+5ld %+5ld", in[0], in[1], res[0], GST_INFO ("expected %+5d %+5d real %+5d %+5d", in[0], in[1], res[0], res[1]);
res[1]);
fail_unless (memcmp (GST_BUFFER_DATA (inbuffer), in, 4) == 0); fail_unless (memcmp (GST_BUFFER_DATA (inbuffer), in, 4) == 0);
/* cleanup */ /* cleanup */