aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/cpia2
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2012-10-22 16:10:16 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-12-21 08:20:51 -0500
commit1b18e7a0be859911b22138ce27258687efc528b8 (patch)
tree13a6a83e0e6d2b1b83eb9554c102422d08553aa3 /drivers/media/usb/cpia2
parent8e6057b510aad354e017c6dfca7f386a0eb91b63 (diff)
[media] v4l: Tell user space we're using monotonic timestamps
Set buffer timestamp flags for videobuf, videobuf2 and drivers that use neither. Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/cpia2')
-rw-r--r--drivers/media/usb/cpia2/cpia2_v4l.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/usb/cpia2/cpia2_v4l.c b/drivers/media/usb/cpia2/cpia2_v4l.c
index aeb9d2275725..d5d42b6e94be 100644
--- a/drivers/media/usb/cpia2/cpia2_v4l.c
+++ b/drivers/media/usb/cpia2/cpia2_v4l.c
@@ -825,6 +825,8 @@ static int cpia2_querybuf(struct file *file, void *fh, struct v4l2_buffer *buf)
825 else 825 else
826 buf->flags = 0; 826 buf->flags = 0;
827 827
828 buf->flags |= V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
829
828 switch (cam->buffers[buf->index].status) { 830 switch (cam->buffers[buf->index].status) {
829 case FRAME_EMPTY: 831 case FRAME_EMPTY:
830 case FRAME_ERROR: 832 case FRAME_ERROR:
@@ -943,7 +945,8 @@ static int cpia2_dqbuf(struct file *file, void *fh, struct v4l2_buffer *buf)
943 945
944 buf->index = frame; 946 buf->index = frame;
945 buf->bytesused = cam->buffers[buf->index].length; 947 buf->bytesused = cam->buffers[buf->index].length;
946 buf->flags = V4L2_BUF_FLAG_MAPPED | V4L2_BUF_FLAG_DONE; 948 buf->flags = V4L2_BUF_FLAG_MAPPED | V4L2_BUF_FLAG_DONE
949 | V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
947 buf->field = V4L2_FIELD_NONE; 950 buf->field = V4L2_FIELD_NONE;
948 buf->timestamp = cam->buffers[buf->index].timestamp; 951 buf->timestamp = cam->buffers[buf->index].timestamp;
949 buf->sequence = cam->buffers[buf->index].seq; 952 buf->sequence = cam->buffers[buf->index].seq;