Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b18e7a0 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarSakari Ailus <sakari.ailus@iki.fi>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 8e6057b5

drivers/media/pci/meye/meye.c

+2 −2
Original line number Diff line number Diff line
@@ -1426,7 +1426,7 @@ static int vidioc_querybuf(struct file *file, void *fh, struct v4l2_buffer *buf) 
		return -EINVAL;



	buf->bytesused = meye.grab_buffer[index].size;

	buf->flags = V4L2_BUF_FLAG_MAPPED;

	buf->flags = V4L2_BUF_FLAG_MAPPED | V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;



	if (meye.grab_buffer[index].state == MEYE_BUF_USING)

		buf->flags |= V4L2_BUF_FLAG_QUEUED;
@@ -1499,7 +1499,7 @@ static int vidioc_dqbuf(struct file *file, void *fh, struct v4l2_buffer *buf) 


	buf->index = reqnr;

	buf->bytesused = meye.grab_buffer[reqnr].size;

	buf->flags = V4L2_BUF_FLAG_MAPPED;

	buf->flags = V4L2_BUF_FLAG_MAPPED | V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

	buf->field = V4L2_FIELD_NONE;

	buf->timestamp = meye.grab_buffer[reqnr].timestamp;

	buf->sequence = meye.grab_buffer[reqnr].sequence;

drivers/media/pci/zoran/zoran_driver.c

+1 −1
Original line number Diff line number Diff line
@@ -1334,7 +1334,7 @@ static int zoran_v4l2_buffer_status(struct zoran_fh *fh, 
	struct zoran *zr = fh->zr;

	unsigned long flags;



	buf->flags = V4L2_BUF_FLAG_MAPPED;

	buf->flags = V4L2_BUF_FLAG_MAPPED | V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;



	switch (fh->map_mode) {

	case ZORAN_MAP_MODE_RAW:

drivers/media/platform/omap3isp/ispqueue.c

+1 −0
Original line number Diff line number Diff line
@@ -674,6 +674,7 @@ static int isp_video_queue_alloc(struct isp_video_queue *queue, 
		buf->vbuf.index = i;

		buf->vbuf.length = size;

		buf->vbuf.type = queue->type;

		buf->vbuf.flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

		buf->vbuf.field = V4L2_FIELD_NONE;

		buf->vbuf.memory = memory;

drivers/media/platform/vino.c

+3 −0
Original line number Diff line number Diff line
@@ -3410,6 +3410,9 @@ static void vino_v4l2_get_buffer_status(struct vino_channel_settings *vcs, 
	if (fb->map_count > 0)

		b->flags |= V4L2_BUF_FLAG_MAPPED;



	b->flags &= ~V4L2_BUF_FLAG_TIMESTAMP_MASK;

	b->flags |= V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;



	b->index = fb->id;

	b->memory = (vcs->fb_queue.type == VINO_MEMORY_MMAP) ?

		V4L2_MEMORY_MMAP : V4L2_MEMORY_USERPTR;

drivers/media/usb/cpia2/cpia2_v4l.c

+4 −1
Original line number Diff line number Diff line
@@ -825,6 +825,8 @@ static int cpia2_querybuf(struct file *file, void *fh, struct v4l2_buffer *buf) 
	else

		buf->flags = 0;



	buf->flags |= V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;



	switch (cam->buffers[buf->index].status) {

	case FRAME_EMPTY:

	case FRAME_ERROR:
@@ -943,7 +945,8 @@ static int cpia2_dqbuf(struct file *file, void *fh, struct v4l2_buffer *buf) 


	buf->index = frame;

	buf->bytesused = cam->buffers[buf->index].length;

	buf->flags = V4L2_BUF_FLAG_MAPPED | V4L2_BUF_FLAG_DONE;

	buf->flags = V4L2_BUF_FLAG_MAPPED | V4L2_BUF_FLAG_DONE

		| V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

	buf->field = V4L2_FIELD_NONE;

	buf->timestamp = cam->buffers[buf->index].timestamp;

	buf->sequence = cam->buffers[buf->index].seq;