Skip to content

Commit

Permalink
[media] omap3isp: Use monotonic timestamps for statistics buffers
Browse files Browse the repository at this point in the history
V4L2 buffers use the monotonic clock, while statistics buffers use wall
time. This makes it difficult to correlate video frames and statistics.
Switch statistics buffers to the monotonic clock to fix this.

Reported-by: Antoine Reversat <a.reversat@gmail.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Laurent Pinchart authored and Mauro Carvalho Chehab committed Nov 28, 2012
1 parent 64ae995 commit 07d19e3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions drivers/media/platform/omap3isp/ispstat.c
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ static int isp_stat_buf_queue(struct ispstat *stat)
if (!stat->active_buf)
return STAT_NO_BUF;

do_gettimeofday(&stat->active_buf->ts);
ktime_get_ts(&stat->active_buf->ts);

stat->active_buf->buf_size = stat->buf_size;
if (isp_stat_buf_check_magic(stat, stat->active_buf)) {
Expand Down Expand Up @@ -536,7 +536,8 @@ int omap3isp_stat_request_statistics(struct ispstat *stat,
return PTR_ERR(buf);
}

data->ts = buf->ts;
data->ts.tv_sec = buf->ts.tv_sec;
data->ts.tv_usec = buf->ts.tv_nsec / NSEC_PER_USEC;
data->config_counter = buf->config_counter;
data->frame_number = buf->frame_number;
data->buf_size = buf->buf_size;
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/omap3isp/ispstat.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ struct ispstat_buffer {
struct iovm_struct *iovm;
void *virt_addr;
dma_addr_t dma_addr;
struct timeval ts;
struct timespec ts;
u32 buf_size;
u32 frame_number;
u16 config_counter;
Expand Down

0 comments on commit 07d19e3

Please sign in to comment.