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

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
...@@ -350,7 +350,7 @@ struct cpia2_sbuf { ...@@ -350,7 +350,7 @@ struct cpia2_sbuf {
}; };
struct framebuf { struct framebuf {
struct timeval timestamp; u64 ts;
unsigned long seq; unsigned long seq;
int num; int num;
int length; int length;
......
...@@ -324,7 +324,7 @@ static void cpia2_usb_complete(struct urb *urb) ...@@ -324,7 +324,7 @@ static void cpia2_usb_complete(struct urb *urb)
continue; continue;
} }
DBG("Start of frame pattern found\n"); 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->seq = cam->frame_count++;
cam->workbuff->data[0] = 0xFF; cam->workbuff->data[0] = 0xFF;
cam->workbuff->data[1] = 0xD8; cam->workbuff->data[1] = 0xD8;
......
...@@ -833,7 +833,7 @@ static int cpia2_querybuf(struct file *file, void *fh, struct v4l2_buffer *buf) ...@@ -833,7 +833,7 @@ static int cpia2_querybuf(struct file *file, void *fh, struct v4l2_buffer *buf)
break; break;
case FRAME_READY: case FRAME_READY:
buf->bytesused = cam->buffers[buf->index].length; 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->sequence = cam->buffers[buf->index].seq;
buf->flags = V4L2_BUF_FLAG_DONE; buf->flags = V4L2_BUF_FLAG_DONE;
break; break;
...@@ -889,12 +889,7 @@ static int find_earliest_filled_buffer(struct camera_data *cam) ...@@ -889,12 +889,7 @@ static int find_earliest_filled_buffer(struct camera_data *cam)
found = i; found = i;
} else { } else {
/* find which buffer is earlier */ /* find which buffer is earlier */
struct timeval *tv1, *tv2; if (cam->buffers[i].ts < cam->buffers[found].ts)
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))
found = i; found = i;
} }
} }
...@@ -945,7 +940,7 @@ static int cpia2_dqbuf(struct file *file, void *fh, struct v4l2_buffer *buf) ...@@ -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 buf->flags = V4L2_BUF_FLAG_MAPPED | V4L2_BUF_FLAG_DONE
| V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; | V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
buf->field = V4L2_FIELD_NONE; 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->sequence = cam->buffers[buf->index].seq;
buf->m.offset = cam->buffers[buf->index].data - cam->frame_buffer; buf->m.offset = cam->buffers[buf->index].data - cam->frame_buffer;
buf->length = cam->frame_size; buf->length = cam->frame_size;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment