aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/uvc/uvc_queue.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2011-09-24 09:46:55 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-12-11 08:23:30 -0500
commit66847ef013cc4ed3ae519360e7e4cbf531465ae8 (patch)
tree79651abe38091a5841e16ccbe0850834a1a9c66b /drivers/media/video/uvc/uvc_queue.c
parent25738cbd72db53ca1c326bf94915d41086cb4297 (diff)
[media] uvcvideo: Add UVC timestamps support
UVC devices transmit a device timestamp along with video frames. Convert the timestamp to a host timestamp and use it to fill the V4L2 buffer timestamp field. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/uvc/uvc_queue.c')
-rw-r--r--drivers/media/video/uvc/uvc_queue.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/media/video/uvc/uvc_queue.c b/drivers/media/video/uvc/uvc_queue.c
index 268be579aa72..518f77d3a4d8 100644
--- a/drivers/media/video/uvc/uvc_queue.c
+++ b/drivers/media/video/uvc/uvc_queue.c
@@ -104,10 +104,22 @@ static void uvc_buffer_queue(struct vb2_buffer *vb)
104 spin_unlock_irqrestore(&queue->irqlock, flags); 104 spin_unlock_irqrestore(&queue->irqlock, flags);
105} 105}
106 106
107static int uvc_buffer_finish(struct vb2_buffer *vb)
108{
109 struct uvc_video_queue *queue = vb2_get_drv_priv(vb->vb2_queue);
110 struct uvc_streaming *stream =
111 container_of(queue, struct uvc_streaming, queue);
112 struct uvc_buffer *buf = container_of(vb, struct uvc_buffer, buf);
113
114 uvc_video_clock_update(stream, &vb->v4l2_buf, buf);
115 return 0;
116}
117
107static struct vb2_ops uvc_queue_qops = { 118static struct vb2_ops uvc_queue_qops = {
108 .queue_setup = uvc_queue_setup, 119 .queue_setup = uvc_queue_setup,
109 .buf_prepare = uvc_buffer_prepare, 120 .buf_prepare = uvc_buffer_prepare,
110 .buf_queue = uvc_buffer_queue, 121 .buf_queue = uvc_buffer_queue,
122 .buf_finish = uvc_buffer_finish,
111}; 123};
112 124
113void uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type, 125void uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type,