summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorPawel Osciak <p.osciak@samsung.com>2010-04-21 13:44:27 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 19:58:11 +0400
commit96f2ec67b8d4761471409e1df0adfe4da5262f84 (patch)
treef98aa4ca20471a38c82a5624f9cc0f5223fb4eed /drivers/media
parent72fcf2a8daac43f8e3bce62a1c1124859b323006 (diff)
downloadlinux-96f2ec67b8d4761471409e1df0adfe4da5262f84.tar.xz
V4L/DVB: v4l: videobuf: qbuf now uses relevant v4l2_buffer fields for OUTPUT types
According to the V4L2 specification, applications set bytesused, field and timestamp fields of struct v4l2_buffer when the buffer is intended for output and memory type is MMAP. This adds proper copying of those values to videobuf_buffer so drivers can use them. Signed-off-by: Pawel Osciak <p.osciak@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/videobuf-core.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c
index dc2f6a8c0225..9f99e3bf5392 100644
--- a/drivers/media/video/videobuf-core.c
+++ b/drivers/media/video/videobuf-core.c
@@ -544,6 +544,13 @@ int videobuf_qbuf(struct videobuf_queue *q, struct v4l2_buffer *b)
"but buffer addr is zero!\n");
goto done;
}
+ if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT
+ || q->type == V4L2_BUF_TYPE_VBI_OUTPUT
+ || q->type == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT) {
+ buf->size = b->bytesused;
+ buf->field = b->field;
+ buf->ts = b->timestamp;
+ }
break;
case V4L2_MEMORY_USERPTR:
if (b->length < buf->bsize) {