UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] omap3isp: Use monotonic timestamps for statistics buffers 

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>
This commit is contained in:
Laurent Pinchart 2012-09-12 22:10:40 -03:00 committed by Mauro Carvalho Chehab
parent 64ae9958a6
commit 07d19e3cce
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/platform/omap3isp/ispstat.c
View File

@ -256,7 +256,7 @@ static int isp_stat_buf_queue(struct ispstat *stat)
if (!stat->active_buf) if (!stat->active_buf)
return STAT_NO_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; stat->active_buf->buf_size = stat->buf_size;
if (isp_stat_buf_check_magic(stat, stat->active_buf)) { if (isp_stat_buf_check_magic(stat, stat->active_buf)) {
@ -536,7 +536,8 @@ int omap3isp_stat_request_statistics(struct ispstat *stat,
return PTR_ERR(buf); 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->config_counter = buf->config_counter;
data->frame_number = buf->frame_number; data->frame_number = buf->frame_number;
data->buf_size = buf->buf_size; data->buf_size = buf->buf_size;

2
drivers/media/platform/omap3isp/ispstat.h
View File

@ -50,7 +50,7 @@ struct ispstat_buffer {
struct iovm_struct *iovm; struct iovm_struct *iovm;
void *virt_addr; void *virt_addr;
dma_addr_t dma_addr; dma_addr_t dma_addr;
struct timeval ts; struct timespec ts;
u32 buf_size; u32 buf_size;
u32 frame_number; u32 frame_number;
u16 config_counter; u16 config_counter;