mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-23 16:50:47 +00:00
Printf format fixes.
Original commit message from CVS: * ext/cairo/gsttimeoverlay.c: (gst_cairo_time_overlay_update_font_height): * ext/gdk_pixbuf/pixbufscale.c: (gst_pixbufscale_transform_caps): * ext/jpeg/gstjpegdec.c: (gst_jpeg_dec_parse_image_data): * ext/jpeg/gstjpegenc.c: (gst_jpegenc_chain): * ext/jpeg/gstsmokedec.c: (gst_smokedec_chain): * ext/jpeg/gstsmokeenc.c: (gst_smokeenc_chain): * ext/libpng/gstpngdec.c: (user_endrow_callback): * gst/auparse/gstauparse.c: (gst_au_parse_parse_header): * gst/avi/gstavidemux.c: (gst_avi_demux_parse_superindex), (gst_avi_demux_parse_subindex), (gst_avi_demux_parse_stream), (gst_avi_demux_stream_data): * gst/cutter/gstcutter.c: (gst_cutter_chain): * gst/debug/efence.c: (gst_efence_buffer_alloc), (gst_fenced_buffer_copy): * gst/id3demux/id3v2frames.c: (id3demux_id3v2_parse_frame): * gst/matroska/matroska-demux.c: (gst_matroska_demux_add_stream): * gst/matroska/matroska-mux.c: (gst_matroska_mux_start): * gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_send), (gst_rtspsrc_handle_message): * gst/wavparse/gstwavparse.c: (gst_wavparse_stream_headers): * sys/ximage/ximageutil.c: (ximageutil_xcontext_get): Printf format fixes.
This commit is contained in:
parent
a4221727de
commit
82f5a3508c
19 changed files with 58 additions and 31 deletions
26
ChangeLog
26
ChangeLog
|
@ -1,3 +1,29 @@
|
|||
2006-10-05 Tim-Philipp Müller <tim at centricular dot net>
|
||||
|
||||
* ext/cairo/gsttimeoverlay.c:
|
||||
(gst_cairo_time_overlay_update_font_height):
|
||||
* ext/gdk_pixbuf/pixbufscale.c: (gst_pixbufscale_transform_caps):
|
||||
* ext/jpeg/gstjpegdec.c: (gst_jpeg_dec_parse_image_data):
|
||||
* ext/jpeg/gstjpegenc.c: (gst_jpegenc_chain):
|
||||
* ext/jpeg/gstsmokedec.c: (gst_smokedec_chain):
|
||||
* ext/jpeg/gstsmokeenc.c: (gst_smokeenc_chain):
|
||||
* ext/libpng/gstpngdec.c: (user_endrow_callback):
|
||||
* gst/auparse/gstauparse.c: (gst_au_parse_parse_header):
|
||||
* gst/avi/gstavidemux.c: (gst_avi_demux_parse_superindex),
|
||||
(gst_avi_demux_parse_subindex), (gst_avi_demux_parse_stream),
|
||||
(gst_avi_demux_stream_data):
|
||||
* gst/cutter/gstcutter.c: (gst_cutter_chain):
|
||||
* gst/debug/efence.c: (gst_efence_buffer_alloc),
|
||||
(gst_fenced_buffer_copy):
|
||||
* gst/id3demux/id3v2frames.c: (id3demux_id3v2_parse_frame):
|
||||
* gst/matroska/matroska-demux.c: (gst_matroska_demux_add_stream):
|
||||
* gst/matroska/matroska-mux.c: (gst_matroska_mux_start):
|
||||
* gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_send),
|
||||
(gst_rtspsrc_handle_message):
|
||||
* gst/wavparse/gstwavparse.c: (gst_wavparse_stream_headers):
|
||||
* sys/ximage/ximageutil.c: (ximageutil_xcontext_get):
|
||||
Printf format fixes.
|
||||
|
||||
2006-10-04 Wim Taymans <wim@fluendo.com>
|
||||
|
||||
* gst/rtsp/Makefile.am:
|
||||
|
|
2
common
2
common
|
@ -1 +1 @@
|
|||
Subproject commit 9991f6fa61ee11475c390dd6675ef7952f079e43
|
||||
Subproject commit a4af1b8542911352e29d53fba47e2c3d7231ebdb
|
|
@ -91,7 +91,7 @@ gst_cairo_time_overlay_update_font_height (GstCairoTimeOverlay * timeoverlay)
|
|||
cairo_set_font_size (font_cairo, 20);
|
||||
cairo_font_extents (font_cairo, &font_extents);
|
||||
timeoverlay->text_height = font_extents.height;
|
||||
GST_DEBUG_OBJECT (timeoverlay, "font height is %d", font_extents.height);
|
||||
GST_DEBUG_OBJECT (timeoverlay, "font height is %f", font_extents.height);
|
||||
cairo_destroy (font_cairo);
|
||||
font_cairo = NULL;
|
||||
}
|
||||
|
|
|
@ -253,7 +253,7 @@ gst_pixbufscale_transform_caps (GstBaseTransform * trans,
|
|||
gst_structure_remove_field (structure, "pixel-aspect-ratio");
|
||||
}
|
||||
|
||||
GST_DEBUG_OBJECT (trans, "returning caps: %", ret);
|
||||
GST_DEBUG_OBJECT (trans, "returning caps: %" GST_PTR_FORMAT, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
@ -467,7 +467,7 @@ gst_jpeg_dec_parse_image_data (GstJpegDec * dec)
|
|||
++data;
|
||||
continue;
|
||||
}
|
||||
GST_DEBUG ("found sync at 0x%08x", data - size);
|
||||
GST_DEBUG ("found sync at %p", data - size);
|
||||
}
|
||||
while (*data == 0xff)
|
||||
++data;
|
||||
|
|
|
@ -413,7 +413,7 @@ gst_jpegenc_chain (GstPad * pad, GstBuffer * buf)
|
|||
data = GST_BUFFER_DATA (buf);
|
||||
size = GST_BUFFER_SIZE (buf);
|
||||
|
||||
GST_DEBUG_OBJECT (jpegenc, "got buffer of %u bytes", size);
|
||||
GST_DEBUG_OBJECT (jpegenc, "got buffer of %lu bytes", size);
|
||||
|
||||
ret =
|
||||
gst_pad_alloc_buffer_and_set_caps (jpegenc->srcpad,
|
||||
|
|
|
@ -171,7 +171,7 @@ gst_smokedec_chain (GstPad * pad, GstBuffer * buf)
|
|||
size = GST_BUFFER_SIZE (buf);
|
||||
time = GST_BUFFER_TIMESTAMP (buf);
|
||||
|
||||
GST_LOG_OBJECT (smokedec, "got buffer of %u bytes", size);
|
||||
GST_LOG_OBJECT (smokedec, "got buffer of %lu bytes", size);
|
||||
|
||||
/* have the ID packet. */
|
||||
if (data[0] == SMOKECODEC_TYPE_ID) {
|
||||
|
|
|
@ -325,7 +325,7 @@ gst_smokeenc_chain (GstPad * pad, GstBuffer * buf)
|
|||
data = GST_BUFFER_DATA (buf);
|
||||
size = GST_BUFFER_SIZE (buf);
|
||||
|
||||
GST_LOG_OBJECT (smokeenc, "got buffer of %u bytes", size);
|
||||
GST_LOG_OBJECT (smokeenc, "got buffer of %lu bytes", size);
|
||||
|
||||
if (smokeenc->need_header) {
|
||||
outbuf = gst_buffer_new_and_alloc (256);
|
||||
|
|
|
@ -221,7 +221,7 @@ user_endrow_callback (png_structp png_ptr, png_bytep new_row,
|
|||
if (GST_IS_BUFFER (pngdec->buffer_out)) {
|
||||
size_t offset = row_num * GST_ROUND_UP_4 (pngdec->rowbytes);
|
||||
|
||||
GST_LOG ("got row %d, copying in buffer %p at offset %d", row_num,
|
||||
GST_LOG ("got row %u, copying in buffer %p at offset %d", (guint) row_num,
|
||||
pngdec->buffer_out, offset);
|
||||
memcpy (GST_BUFFER_DATA (pngdec->buffer_out) + offset, new_row,
|
||||
pngdec->rowbytes);
|
||||
|
|
|
@ -268,8 +268,8 @@ gst_au_parse_parse_header (GstAuParse * auparse)
|
|||
auparse->samplerate = GST_READ_UINT32_BE (head + 16);
|
||||
auparse->channels = GST_READ_UINT32_BE (head + 20);
|
||||
|
||||
GST_DEBUG_OBJECT (auparse, "offset %ld, size %u, encoding %u, "
|
||||
"frequency %u, channels %u", auparse->offset, size,
|
||||
GST_DEBUG_OBJECT (auparse, "offset %" G_GINT64_FORMAT ", size %u, "
|
||||
"encoding %u, frequency %u, channels %u", auparse->offset, size,
|
||||
auparse->encoding, auparse->samplerate, auparse->channels);
|
||||
|
||||
/* Docs:
|
||||
|
@ -389,7 +389,7 @@ gst_au_parse_parse_header (GstAuParse * auparse)
|
|||
if (!gst_au_parse_add_srcpad (auparse, tempcaps))
|
||||
goto add_pad_failed;
|
||||
|
||||
GST_DEBUG_OBJECT (auparse, "offset=%ld", auparse->offset);
|
||||
GST_DEBUG_OBJECT (auparse, "offset=%" G_GINT64_FORMAT, auparse->offset);
|
||||
gst_adapter_flush (auparse->adapter, auparse->offset);
|
||||
|
||||
gst_caps_unref (tempcaps);
|
||||
|
|
|
@ -823,7 +823,7 @@ gst_avi_demux_parse_superindex (GstAviDemux * avi,
|
|||
if (GST_READ_UINT16_LE (data) != 4 ||
|
||||
(data[2] & 0xfe) != 0x0 || data[3] != 0x0) {
|
||||
GST_WARNING_OBJECT (avi,
|
||||
"Superindex for stream %d has unexpected "
|
||||
"Superindex for stream has unexpected "
|
||||
"size_entry %d (bytes) or flags 0x%02x/0x%02x",
|
||||
GST_READ_UINT16_LE (data), data[2], data[3]);
|
||||
bpe = GST_READ_UINT16_LE (data) * 4;
|
||||
|
@ -904,7 +904,7 @@ gst_avi_demux_parse_subindex (GstElement * element,
|
|||
GST_WARNING_OBJECT (element,
|
||||
"Superindex for stream %d has unexpected "
|
||||
"size_entry %d (bytes) or flags 0x%02x/0x%02x",
|
||||
GST_READ_UINT16_LE (data), data[2], data[3]);
|
||||
stream->num, GST_READ_UINT16_LE (data), data[2], data[3]);
|
||||
bpe = GST_READ_UINT16_LE (data) * 4;
|
||||
}
|
||||
num = GST_READ_UINT32_LE (&data[4]);
|
||||
|
@ -1121,7 +1121,7 @@ gst_avi_demux_parse_stream (GstAviDemux * avi, GstBuffer * buf)
|
|||
if (!gst_riff_parse_chunk (element, buf, &offset, &tag, &sub) ||
|
||||
tag != GST_RIFF_TAG_strh) {
|
||||
GST_ERROR_OBJECT (avi,
|
||||
"Failed to find strh chunk (tag: %" GST_FOURCC_FORMAT ")",
|
||||
"Failed to find strh chunk (bufsize: %d, tag: %" GST_FOURCC_FORMAT ")",
|
||||
GST_BUFFER_SIZE (buf), GST_FOURCC_ARGS (tag));
|
||||
goto fail;
|
||||
} else if (!gst_riff_parse_strh (element, sub, &stream->strh)) {
|
||||
|
@ -3266,7 +3266,7 @@ gst_avi_demux_stream_data (GstAviDemux * avi)
|
|||
gst_adapter_flush (avi->adapter, 8);
|
||||
return GST_FLOW_OK;
|
||||
}
|
||||
GST_DEBUG ("chunk ID %" GST_FOURCC_FORMAT ", size %lu",
|
||||
GST_DEBUG ("chunk ID %" GST_FOURCC_FORMAT ", size %u",
|
||||
GST_FOURCC_ARGS (tag), size);
|
||||
|
||||
stream_nr = CHUNKID_TO_STREAMNR (tag);
|
||||
|
|
|
@ -260,8 +260,8 @@ gst_cutter_chain (GstPad * pad, GstBuffer * buf)
|
|||
/* if RMS below threshold, add buffer length to silent run length count
|
||||
* if not, reset
|
||||
*/
|
||||
GST_LOG_OBJECT (filter, "buffer stats: NMS %f, RMS %f, audio length %f",
|
||||
NMS, RMS, gst_audio_duration_from_pad_buffer (filter->sinkpad, buf));
|
||||
GST_LOG_OBJECT (filter, "buffer stats: NMS %f, RMS %f, audio length %f", NMS,
|
||||
RMS, (gdouble) gst_audio_duration_from_pad_buffer (filter->sinkpad, buf));
|
||||
if (RMS < filter->threshold_level)
|
||||
filter->silent_run_length +=
|
||||
gst_guint64_to_gdouble (gst_audio_duration_from_pad_buffer (filter->
|
||||
|
|
|
@ -133,8 +133,8 @@ id3demux_id3v2_parse_frame (ID3TagsWorking * work)
|
|||
}
|
||||
if (destSize != work->parse_size) {
|
||||
GST_WARNING
|
||||
("Decompressing ID3v2 frame %s did not produce expected size %d bytes (got %d)",
|
||||
tag_name, work->parse_data, destSize);
|
||||
("Decompressing ID3v2 frame %s did not produce expected size %d bytes (got %lu)",
|
||||
tag_name, work->parse_size, destSize);
|
||||
return FALSE;
|
||||
}
|
||||
#else
|
||||
|
|
|
@ -590,7 +590,8 @@ gst_matroska_demux_add_stream (GstMatroskaDemux * demux)
|
|||
case GST_MATROSKA_TRACK_TYPE_LOGO:
|
||||
case GST_MATROSKA_TRACK_TYPE_CONTROL:
|
||||
default:
|
||||
GST_WARNING ("Unknown or unsupported track type 0x%x", track_type);
|
||||
GST_WARNING ("Unknown or unsupported track type %"
|
||||
G_GUINT64_FORMAT, track_type);
|
||||
context->type = 0;
|
||||
break;
|
||||
}
|
||||
|
@ -890,7 +891,7 @@ gst_matroska_demux_add_stream (GstMatroskaDemux * demux)
|
|||
}
|
||||
context->codec_priv = data;
|
||||
context->codec_priv_size = size;
|
||||
GST_LOG_OBJECT (demux, "%u bytes of codec private data", size);
|
||||
GST_LOG_OBJECT (demux, "%u bytes of codec private data", (guint) size);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -1206,7 +1206,7 @@ gst_matroska_mux_start (GstMatroskaMux * mux)
|
|||
peerpad = gst_pad_get_peer (thepad);
|
||||
GST_DEBUG_OBJECT (thepad, "querying duration");
|
||||
if (gst_pad_query_duration (peerpad, &format, &trackduration)) {
|
||||
GST_DEBUG_OBJECT (thepad, "%duration: %" GST_TIME_FORMAT,
|
||||
GST_DEBUG_OBJECT (thepad, "duration: %" GST_TIME_FORMAT,
|
||||
GST_TIME_ARGS (trackduration));
|
||||
if ((gdouble) trackduration > duration) {
|
||||
duration = (gdouble) trackduration;
|
||||
|
|
|
@ -1208,7 +1208,7 @@ send_error:
|
|||
gchar *str = rtsp_strresult (res);
|
||||
|
||||
GST_ELEMENT_ERROR (src, RESOURCE, WRITE, (NULL),
|
||||
("Could not send message. (%s)", res));
|
||||
("Could not send message. (%s)", str));
|
||||
g_free (str);
|
||||
return FALSE;
|
||||
}
|
||||
|
@ -1845,9 +1845,9 @@ gst_rtspsrc_handle_message (GstBin * bin, GstMessage * message)
|
|||
/* FIXME, we post an error message now to inform the user
|
||||
* that nothing happened. It's most likely a firewall thing. */
|
||||
GST_ELEMENT_ERROR (rtspsrc, RESOURCE, READ, (NULL),
|
||||
("Could not receive any UDP packets for %" G_GUINT64_FORMAT
|
||||
".%d seconds, maybe your firewall is blocking it.",
|
||||
rtspsrc->timeout / 1000000, rtspsrc->timeout % 1000000));
|
||||
("Could not receive any UDP packets for %.4f seconds, maybe your "
|
||||
"firewall is blocking it.",
|
||||
(gdouble) rtspsrc->timeout / 1000000));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1183,7 +1183,7 @@ gst_wavparse_stream_headers (GstWavParse * wav)
|
|||
/* We will continue parsing tags 'till end */
|
||||
wav->offset += size;
|
||||
}
|
||||
GST_DEBUG_OBJECT (wav, "datasize = %ld", size);
|
||||
GST_DEBUG_OBJECT (wav, "datasize = %d", size);
|
||||
break;
|
||||
}
|
||||
case GST_RIFF_TAG_fact:{
|
||||
|
@ -1237,7 +1237,7 @@ gst_wavparse_stream_headers (GstWavParse * wav)
|
|||
wav->bps =
|
||||
(guint32) gst_util_uint64_scale ((guint64) wav->rate, wav->datasize,
|
||||
(guint64) wav->fact);
|
||||
GST_DEBUG_OBJECT (wav, "calculated bps : %ld", wav->bps);
|
||||
GST_DEBUG_OBJECT (wav, "calculated bps : %d", wav->bps);
|
||||
}
|
||||
if (wav->bps <= 0)
|
||||
goto no_bitrate;
|
||||
|
|
|
@ -140,7 +140,7 @@ ximageutil_xcontext_get (GstElement * parent, const gchar * display_name)
|
|||
xcontext = g_new0 (GstXContext, 1);
|
||||
|
||||
xcontext->disp = XOpenDisplay (display_name);
|
||||
GST_DEBUG_OBJECT (parent, "opened display 0x%x", xcontext->disp);
|
||||
GST_DEBUG_OBJECT (parent, "opened display %p", xcontext->disp);
|
||||
if (!xcontext->disp) {
|
||||
g_free (xcontext);
|
||||
return NULL;
|
||||
|
|
Loading…
Reference in a new issue