summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rubli <martin_rubli@logitech.com>2006-05-08 19:21:18 +0000
committerEdgard Lima <edgard.lima@indt.org.br>2006-05-08 19:21:18 +0000
commitd10ee34f44a73a2eda284cae4d866796fd69767a (patch)
tree44a8e225e0ceea66620f137a3c80c60c71287fcb
parent9b5f1ef1d39f460f8c38f7744437e5499bec9452 (diff)
downloadgst-plugins-bad-d10ee34f44a73a2eda284cae4d866796fd69767a.tar.gz
gst-plugins-bad-d10ee34f44a73a2eda284cae4d866796fd69767a.tar.bz2
gst-plugins-bad-d10ee34f44a73a2eda284cae4d866796fd69767a.zip
Fix fourcc name printed out. Patch from Martin Rubli.
Original commit message from CVS: Fix fourcc name printed out. Patch from Martin Rubli.
-rw-r--r--ChangeLog6
-rw-r--r--sys/v4l2/gstv4l2src.c2
-rw-r--r--sys/v4l2/v4l2src_calls.c12
3 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 110cbd02..631b3ad3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-08 Edgard Lima <edgard.lima@indt.org.br>
+
+ * sys/v4l2/gstv4l2src.c:
+ * sys/v4l2/v4l2src_calls.c:
+ Fix fourcc name printed out. Patch from Martin Rubli.
+
2006-05-08 Wim Taymans <wim@fluendo.com>
* gst/qtdemux/qtdemux.c: (gst_qtdemux_handle_src_query),
diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index 09767ea6..dc8b7cbe 100644
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -491,7 +491,7 @@ gst_v4l2src_v4l2fourcc_to_caps (guint32 fourcc)
case V4L2_PIX_FMT_WNVA: /* Winnov hw compres */
break;
default:
- GST_DEBUG ("Unknown fourcc 0x%08x " GST_FOURCC_FORMAT,
+ GST_DEBUG ("Unknown fourcc 0x%08x %" GST_FOURCC_FORMAT,
fourcc, GST_FOURCC_ARGS (fourcc));
break;
}
diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c
index f28bc96e..4f55d8b6 100644
--- a/sys/v4l2/v4l2src_calls.c
+++ b/sys/v4l2/v4l2src_calls.c
@@ -85,7 +85,7 @@ gst_v4l2src_fill_format_list (GstV4l2Src * v4l2src)
return FALSE;
}
}
- GST_LOG_OBJECT (v4l2src, "got format" GST_FOURCC_FORMAT,
+ GST_LOG_OBJECT (v4l2src, "got format %" GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (format->pixelformat));
v4l2src->formats = g_slist_prepend (v4l2src->formats, format);
}
@@ -341,7 +341,7 @@ gst_v4l2src_capture_init (GstV4l2Src * v4l2src)
g_object_notify (G_OBJECT (v4l2src), "num_buffers");
GST_INFO_OBJECT (v4l2src,
- "Got %d buffers (" GST_FOURCC_FORMAT ") of size %d KB\n",
+ "Got %d buffers (%" GST_FOURCC_FORMAT ") of size %d KB\n",
v4l2src->breq.count,
GST_FOURCC_ARGS (v4l2src->format.fmt.pix.pixelformat),
v4l2src->format.fmt.pix.sizeimage / 1024);
@@ -574,7 +574,8 @@ gst_v4l2src_get_size_limits (GstV4l2Src * v4l2src,
{
struct v4l2_format fmt;
- GST_LOG_OBJECT (v4l2src, "getting size limits with format " GST_FOURCC_FORMAT,
+ GST_LOG_OBJECT (v4l2src,
+ "getting size limits with format %" GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (format->pixelformat));
/* get size delimiters */
@@ -805,17 +806,18 @@ gst_v4l2src_buffer_new (GstV4l2Src * v4l2src, guint size, guint8 * data,
{
GstBuffer *buf;
- GST_LOG_OBJECT (v4l2src, "creating buffer %d");
-
if (data == NULL) {
buf = gst_buffer_new_and_alloc (size);
} else {
buf = (GstBuffer *) gst_mini_object_new (GST_TYPE_V4L2SRC_BUFFER);
GST_BUFFER_DATA (buf) = data;
GST_V4L2SRC_BUFFER (buf)->buf = srcbuf;
+ GST_LOG_OBJECT (v4l2src, "creating buffer %p (nr. %d)",
+ srcbuf, srcbuf->buffer.index);
}
+
GST_BUFFER_SIZE (buf) = size;
GST_BUFFER_TIMESTAMP (buf) =