summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2015-03-13 15:13:08 (GMT)
committerMatthieu Bouron <matthieu.bouron@collabora.com>2015-05-06 16:09:12 (GMT)
commit3f231351674c43304f800efdca7cc5fe07194f16 (patch)
tree6a4137f66264a0b6db8ba9e274d21577217ef373
parent8757b9047feb2598aba896e59d8dfcdc665864e5 (diff)
downloadgst-plugins-bad-3f231351674c43304f800efdca7cc5fe07194f16.tar.gz
gst-plugins-bad-3f231351674c43304f800efdca7cc5fe07194f16.tar.xz
androidmedia: Fix debug statement (%d for a gsize argument)
-rw-r--r--sys/androidmedia/gstamc.c5
-rw-r--r--sys/androidmedia/gstamcaudiodec.c8
-rw-r--r--sys/androidmedia/gstamcvideodec.c10
-rw-r--r--sys/androidmedia/gstamcvideoenc.c15
4 files changed, 23 insertions, 15 deletions
diff --git a/sys/androidmedia/gstamc.c b/sys/androidmedia/gstamc.c
index 47393e7..201aab6 100644
--- a/sys/androidmedia/gstamc.c
+++ b/sys/androidmedia/gstamc.c
@@ -2087,8 +2087,9 @@ gst_amc_color_format_copy (GstAmcColorFormatInfo * cinfo,
goto done;
}
- GST_DEBUG ("Sizes not equal (%d vs %d), doing slow line-by-line copying",
- cbuffer_info->size, gst_buffer_get_size (vbuffer));
+ GST_DEBUG ("Sizes not equal (%d vs %" G_GSIZE_FORMAT
+ "), doing slow line-by-line copying", cbuffer_info->size,
+ gst_buffer_get_size (vbuffer));
/* Different video format, try to convert */
switch (cinfo->color_format) {
diff --git a/sys/androidmedia/gstamcaudiodec.c b/sys/androidmedia/gstamcaudiodec.c
index d381eec..f876c14 100644
--- a/sys/androidmedia/gstamcaudiodec.c
+++ b/sys/androidmedia/gstamcaudiodec.c
@@ -689,7 +689,8 @@ flow_error:
invalid_buffer_index:
{
GST_ELEMENT_ERROR (self, LIBRARY, FAILED, (NULL),
- ("Invalid input buffer index %d of %d", idx, self->n_input_buffers));
+ ("Invalid input buffer index %d of %" G_GSIZE_FORMAT, idx,
+ self->n_input_buffers));
gst_pad_push_event (GST_AUDIO_DECODER_SRC_PAD (self), gst_event_new_eos ());
gst_pad_pause_task (GST_AUDIO_DECODER_SRC_PAD (self));
self->downstream_flow_ret = GST_FLOW_ERROR;
@@ -1185,7 +1186,8 @@ downstream_error:
invalid_buffer_index:
{
GST_ELEMENT_ERROR (self, LIBRARY, FAILED, (NULL),
- ("Invalid input buffer index %d of %d", idx, self->n_input_buffers));
+ ("Invalid input buffer index %d of %" G_GSIZE_FORMAT, idx,
+ self->n_input_buffers));
if (minfo.data)
gst_buffer_unmap (inbuf, &minfo);
if (inbuf)
@@ -1285,7 +1287,7 @@ gst_amc_audio_dec_drain (GstAmcAudioDec * self)
g_mutex_unlock (&self->drain_lock);
GST_AUDIO_DECODER_STREAM_LOCK (self);
} else if (idx >= self->n_input_buffers) {
- GST_ERROR_OBJECT (self, "Invalid input buffer index %d of %d",
+ GST_ERROR_OBJECT (self, "Invalid input buffer index %d of %" G_GSIZE_FORMAT,
idx, self->n_input_buffers);
ret = GST_FLOW_ERROR;
} else {
diff --git a/sys/androidmedia/gstamcvideodec.c b/sys/androidmedia/gstamcvideodec.c
index 68a25a5..a031dbd 100644
--- a/sys/androidmedia/gstamcvideodec.c
+++ b/sys/androidmedia/gstamcvideodec.c
@@ -568,8 +568,9 @@ gst_amc_video_dec_fill_buffer (GstAmcVideoDec * self, gint idx,
gboolean ret = FALSE;
if (idx >= self->n_output_buffers) {
- GST_ERROR_OBJECT (self, "Invalid output buffer index %d of %d",
- idx, self->n_output_buffers);
+ GST_ERROR_OBJECT (self,
+ "Invalid output buffer index %d of %" G_GSIZE_FORMAT, idx,
+ self->n_output_buffers);
goto done;
}
buf = &self->output_buffers[idx];
@@ -1299,7 +1300,8 @@ downstream_error:
invalid_buffer_index:
{
GST_ELEMENT_ERROR (self, LIBRARY, FAILED, (NULL),
- ("Invalid input buffer index %d of %d", idx, self->n_input_buffers));
+ ("Invalid input buffer index %d of %" G_GSIZE_FORMAT, idx,
+ self->n_input_buffers));
if (minfo.data)
gst_buffer_unmap (frame->input_buffer, &minfo);
gst_video_codec_frame_unref (frame);
@@ -1405,7 +1407,7 @@ gst_amc_video_dec_drain (GstAmcVideoDec * self)
g_mutex_unlock (&self->drain_lock);
GST_VIDEO_DECODER_STREAM_LOCK (self);
} else if (idx >= self->n_input_buffers) {
- GST_ERROR_OBJECT (self, "Invalid input buffer index %d of %d",
+ GST_ERROR_OBJECT (self, "Invalid input buffer index %d of %" G_GSIZE_FORMAT,
idx, self->n_input_buffers);
ret = GST_FLOW_ERROR;
} else {
diff --git a/sys/androidmedia/gstamcvideoenc.c b/sys/androidmedia/gstamcvideoenc.c
index 4384c76..e1c9e09 100644
--- a/sys/androidmedia/gstamcvideoenc.c
+++ b/sys/androidmedia/gstamcvideoenc.c
@@ -1039,8 +1039,9 @@ process_buffer:
is_eos = ! !(buffer_info.flags & BUFFER_FLAG_END_OF_STREAM);
if (idx >= self->n_output_buffers) {
- GST_ERROR_OBJECT (self, "Invalid output buffer index %d of %d",
- idx, self->n_output_buffers);
+ GST_ERROR_OBJECT (self,
+ "Invalid output buffer index %d of %" G_GSIZE_FORMAT, idx,
+ self->n_output_buffers);
goto invalid_buffer;
}
@@ -1562,15 +1563,17 @@ downstream_error:
invalid_buffer_index:
{
GST_ELEMENT_ERROR (self, LIBRARY, FAILED, (NULL),
- ("Invalid input buffer index %d of %d", idx, self->n_input_buffers));
+ ("Invalid input buffer index %d of %" G_GSIZE_FORMAT, idx,
+ self->n_input_buffers));
gst_video_codec_frame_unref (frame);
return GST_FLOW_ERROR;
}
buffer_fill_error:
{
GST_ELEMENT_ERROR (self, RESOURCE, WRITE, (NULL),
- ("Failed to write input into the amc buffer(write %dB to a %dB buffer)",
- self->color_format_info.frame_size, buf->size));
+ ("Failed to write input into the amc buffer(write %dB to a %"
+ G_GSIZE_FORMAT "B buffer)", self->color_format_info.frame_size,
+ buf->size));
gst_video_codec_frame_unref (frame);
return GST_FLOW_ERROR;
}
@@ -1668,7 +1671,7 @@ gst_amc_video_enc_drain (GstAmcVideoEnc * self)
g_mutex_unlock (&self->drain_lock);
GST_VIDEO_ENCODER_STREAM_LOCK (self);
} else if (idx >= self->n_input_buffers) {
- GST_ERROR_OBJECT (self, "Invalid input buffer index %d of %d",
+ GST_ERROR_OBJECT (self, "Invalid input buffer index %d of %" G_GSIZE_FORMAT,
idx, self->n_input_buffers);
ret = GST_FLOW_ERROR;
} else {