mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-05 05:52:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix fourcc name printed out. Patch from Martin Rubli.

Browse source 
Original commit message from CVS:
Fix fourcc name printed out. Patch from Martin Rubli.
This commit is contained in:
Martin Rubli 2006-05-08 19:21:18 +00:00 committed by Edgard Lima
parent 9b5f1ef1d3
commit d10ee34f44
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> 2006-05-08 Wim Taymans <wim@fluendo.com>
* gst/qtdemux/qtdemux.c: (gst_qtdemux_handle_src_query), * gst/qtdemux/qtdemux.c: (gst_qtdemux_handle_src_query),

2
sys/v4l2/gstv4l2src.c
View file

@ -491,7 +491,7 @@ gst_v4l2src_v4l2fourcc_to_caps (guint32 fourcc)
case V4L2_PIX_FMT_WNVA: /* Winnov hw compres */ case V4L2_PIX_FMT_WNVA: /* Winnov hw compres */
break; break;
default: default:
GST_DEBUG ("Unknown fourcc 0x%08x " GST_FOURCC_FORMAT, GST_DEBUG ("Unknown fourcc 0x%08x %" GST_FOURCC_FORMAT,
fourcc, GST_FOURCC_ARGS (fourcc)); fourcc, GST_FOURCC_ARGS (fourcc));
break; break;
} }

12
sys/v4l2/v4l2src_calls.c
View file

@ -85,7 +85,7 @@ gst_v4l2src_fill_format_list (GstV4l2Src * v4l2src)
return FALSE; 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)); GST_FOURCC_ARGS (format->pixelformat));
v4l2src->formats = g_slist_prepend (v4l2src->formats, format); 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"); g_object_notify (G_OBJECT (v4l2src), "num_buffers");
GST_INFO_OBJECT (v4l2src, 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, v4l2src->breq.count,
GST_FOURCC_ARGS (v4l2src->format.fmt.pix.pixelformat), GST_FOURCC_ARGS (v4l2src->format.fmt.pix.pixelformat),
v4l2src->format.fmt.pix.sizeimage / 1024); v4l2src->format.fmt.pix.sizeimage / 1024);
@ -574,7 +574,8 @@ gst_v4l2src_get_size_limits (GstV4l2Src * v4l2src,
{ {
struct v4l2_format fmt; 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)); GST_FOURCC_ARGS (format->pixelformat));
/* get size delimiters */ /* get size delimiters */
@ -805,17 +806,18 @@ gst_v4l2src_buffer_new (GstV4l2Src * v4l2src, guint size, guint8 * data,
{ {
GstBuffer *buf; GstBuffer *buf;
GST_LOG_OBJECT (v4l2src, "creating buffer %d");
if (data == NULL) { if (data == NULL) {
buf = gst_buffer_new_and_alloc (size); buf = gst_buffer_new_and_alloc (size);
} else { } else {
buf = (GstBuffer *) gst_mini_object_new (GST_TYPE_V4L2SRC_BUFFER); buf = (GstBuffer *) gst_mini_object_new (GST_TYPE_V4L2SRC_BUFFER);
GST_BUFFER_DATA (buf) = data; GST_BUFFER_DATA (buf) = data;
GST_V4L2SRC_BUFFER (buf)->buf = srcbuf; 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_SIZE (buf) = size;
GST_BUFFER_TIMESTAMP (buf) = GST_BUFFER_TIMESTAMP (buf) =