Commit 77cdffcb authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mauro Carvalho Chehab
Browse files

media: v4l2: abstract timeval handling in v4l2_buffer 



As a preparation for adding 64-bit time_t support in the uapi,
change the drivers to no longer care about the format of the
timestamp field in struct v4l2_buffer.

The v4l2_timeval_to_ns() function is no longer needed in the
kernel after this, but there is userspace code relying on
it to be part of the uapi header.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
[hverkuil-cisco@xs4all.nl: replace spaces by tabs]
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 71e37d2e

drivers/media/common/videobuf2/videobuf2-v4l2.c

+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static void __copy_timestamp(struct vb2_buffer *vb, const void *pb) 
		 * and the timecode field and flag if needed.

		 */

		if (q->copy_timestamp)

			vb->timestamp = v4l2_timeval_to_ns(&b->timestamp);

			vb->timestamp = v4l2_buffer_get_timestamp(b);

		vbuf->flags |= b->flags & V4L2_BUF_FLAG_TIMECODE;

		if (b->flags & V4L2_BUF_FLAG_TIMECODE)

			vbuf->timecode = b->timecode;
@@ -482,7 +482,7 @@ static void __fill_v4l2_buffer(struct vb2_buffer *vb, void *pb) 


	b->flags = vbuf->flags;

	b->field = vbuf->field;

	b->timestamp = ns_to_timeval(vb->timestamp);

	v4l2_buffer_set_timestamp(b, vb->timestamp);

	b->timecode = vbuf->timecode;

	b->sequence = vbuf->sequence;

	b->reserved2 = 0;

drivers/media/pci/meye/meye.c

+2 −2
Original line number Diff line number Diff line
@@ -1266,7 +1266,7 @@ static int vidioc_querybuf(struct file *file, void *fh, struct v4l2_buffer *buf) 
		buf->flags |= V4L2_BUF_FLAG_DONE;



	buf->field = V4L2_FIELD_NONE;

	buf->timestamp = ns_to_timeval(meye.grab_buffer[index].ts);

	v4l2_buffer_set_timestamp(buf, meye.grab_buffer[index].ts);

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

	buf->memory = V4L2_MEMORY_MMAP;

	buf->m.offset = index * gbufsize;
@@ -1332,7 +1332,7 @@ static int vidioc_dqbuf(struct file *file, void *fh, struct v4l2_buffer *buf) 
	buf->bytesused = meye.grab_buffer[reqnr].size;

	buf->flags = V4L2_BUF_FLAG_MAPPED | V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

	buf->field = V4L2_FIELD_NONE;

	buf->timestamp = ns_to_timeval(meye.grab_buffer[reqnr].ts);

	v4l2_buffer_set_timestamp(buf, meye.grab_buffer[reqnr].ts);

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

	buf->memory = V4L2_MEMORY_MMAP;

	buf->m.offset = reqnr * gbufsize;

drivers/media/usb/cpia2/cpia2_v4l.c

+2 −2
Original line number Diff line number Diff line
@@ -800,7 +800,7 @@ static int cpia2_querybuf(struct file *file, void *fh, struct v4l2_buffer *buf) 
		break;

	case FRAME_READY:

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

		buf->timestamp = ns_to_timeval(cam->buffers[buf->index].ts);

		v4l2_buffer_set_timestamp(buf, cam->buffers[buf->index].ts);

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

		buf->flags = V4L2_BUF_FLAG_DONE;

		break;
@@ -907,7 +907,7 @@ static int cpia2_dqbuf(struct file *file, void *fh, struct v4l2_buffer *buf) 
	buf->flags = V4L2_BUF_FLAG_MAPPED | V4L2_BUF_FLAG_DONE

		| V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

	buf->field = V4L2_FIELD_NONE;

	buf->timestamp = ns_to_timeval(cam->buffers[buf->index].ts);

	v4l2_buffer_set_timestamp(buf, cam->buffers[buf->index].ts);

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

	buf->m.offset = cam->buffers[buf->index].data - cam->frame_buffer;

	buf->length = cam->frame_size;

drivers/media/usb/stkwebcam/stk-webcam.c

+1 −1
Original line number Diff line number Diff line
@@ -1125,7 +1125,7 @@ static int stk_vidioc_dqbuf(struct file *filp, 
	sbuf->v4lbuf.flags &= ~V4L2_BUF_FLAG_QUEUED;

	sbuf->v4lbuf.flags |= V4L2_BUF_FLAG_DONE;

	sbuf->v4lbuf.sequence = ++dev->sequence;

	sbuf->v4lbuf.timestamp = ns_to_timeval(ktime_get_ns());

	v4l2_buffer_set_timestamp(&sbuf->v4lbuf, ktime_get_ns());



	*buf = sbuf->v4lbuf;

	return 0;

drivers/media/usb/usbvision/usbvision-video.c

+2 −2
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ static int vidioc_querybuf(struct file *file, 
	vb->length = usbvision->curwidth *

		usbvision->curheight *

		usbvision->palette.bytes_per_pixel;

	vb->timestamp = ns_to_timeval(usbvision->frame[vb->index].ts);

	v4l2_buffer_set_timestamp(vb, usbvision->frame[vb->index].ts);

	vb->sequence = usbvision->frame[vb->index].sequence;

	return 0;

}
@@ -765,7 +765,7 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *vb) 
		V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

	vb->index = f->index;

	vb->sequence = f->sequence;

	vb->timestamp = ns_to_timeval(f->ts);

	v4l2_buffer_set_timestamp(vb, f->ts);

	vb->field = V4L2_FIELD_NONE;

	vb->bytesused = f->scanlength;