Commit 597f8e9c authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: cpia2: 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 cb7130ea

drivers/media/usb/cpia2/cpia2.h

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ struct cpia2_sbuf { 
};



struct framebuf {

	struct timeval timestamp;

	u64 ts;

	unsigned long seq;

	int num;

	int length;

drivers/media/usb/cpia2/cpia2_usb.c

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ static void cpia2_usb_complete(struct urb *urb) 
				continue;

			}

			DBG("Start of frame pattern found\n");

			v4l2_get_timestamp(&cam->workbuff->timestamp);

			cam->workbuff->ts = ktime_get_ns();

			cam->workbuff->seq = cam->frame_count++;

			cam->workbuff->data[0] = 0xFF;

			cam->workbuff->data[1] = 0xD8;

drivers/media/usb/cpia2/cpia2_v4l.c

+3 −8
Original line number Diff line number Diff line
@@ -833,7 +833,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 = cam->buffers[buf->index].timestamp;

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

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

		buf->flags = V4L2_BUF_FLAG_DONE;

		break;
@@ -889,12 +889,7 @@ static int find_earliest_filled_buffer(struct camera_data *cam) 
				found = i;

			} else {

				/* find which buffer is earlier */

				struct timeval *tv1, *tv2;

				tv1 = &cam->buffers[i].timestamp;

				tv2 = &cam->buffers[found].timestamp;

				if(tv1->tv_sec < tv2->tv_sec ||

				   (tv1->tv_sec == tv2->tv_sec &&

				    tv1->tv_usec < tv2->tv_usec))

				if (cam->buffers[i].ts < cam->buffers[found].ts)

					found = i;

			}

		}
@@ -945,7 +940,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 = cam->buffers[buf->index].timestamp;

	buf->timestamp = ns_to_timeval(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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE