Commit 459d2a5d authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: usbvision: use u64 for the timestamp internally 



Just like vb2 does, use u64 internally to store the timestamps
of the buffers. Only convert to timeval when interfacing with
userspace.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent bbd217a4

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

+1 −1
Original line number Diff line number Diff line
@@ -1160,7 +1160,7 @@ static void usbvision_parse_data(struct usb_usbvision *usbvision) 


	if (newstate == parse_state_next_frame) {

		frame->grabstate = frame_state_done;

		v4l2_get_timestamp(&(frame->timestamp));

		frame->ts = ktime_get_ns();

		frame->sequence = usbvision->frame_num;



		spin_lock_irqsave(&usbvision->queue_lock, lock_flags);

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

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

		usbvision->curheight *

		usbvision->palette.bytes_per_pixel;

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

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

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

	return 0;

}
@@ -775,7 +775,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 = f->timestamp;

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

	vb->field = V4L2_FIELD_NONE;

	vb->bytesused = f->scanlength;

drivers/media/usb/usbvision/usbvision.h

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ struct usbvision_frame { 
	long bytes_read;				/* amount of scanlength that has been read from data */

	struct usbvision_v4l2_format_st v4l2_format;	/* format the user needs*/

	int v4l2_linesize;				/* bytes for one videoline*/

	struct timeval timestamp;

	u64 ts;

	int sequence;					/* How many video frames we send to user */

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE