diff options
author | Sakari Ailus <sakari.ailus@iki.fi> | 2012-09-15 14:14:42 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-12-21 07:56:43 -0500 |
commit | 8e6057b510aad354e017c6dfca7f386a0eb91b63 (patch) | |
tree | ac76cc2593f255325972f05bde025954f2d3b41c /drivers/media/pci/zoran | |
parent | abd23295648a9e3ae72a806e70a510d3dcd8b374 (diff) |
[media] v4l: Convert drivers to use monotonic timestamps
Convert drivers using wall clock time (CLOCK_REALTIME) to timestamp from the
monotonic timer (CLOCK_MONOTONIC).
Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/zoran')
-rw-r--r-- | drivers/media/pci/zoran/zoran_device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/pci/zoran/zoran_device.c b/drivers/media/pci/zoran/zoran_device.c index a4cd504b8eee..519164c572c8 100644 --- a/drivers/media/pci/zoran/zoran_device.c +++ b/drivers/media/pci/zoran/zoran_device.c | |||
@@ -1169,7 +1169,7 @@ zoran_reap_stat_com (struct zoran *zr) | |||
1169 | } | 1169 | } |
1170 | frame = zr->jpg_pend[zr->jpg_dma_tail & BUZ_MASK_FRAME]; | 1170 | frame = zr->jpg_pend[zr->jpg_dma_tail & BUZ_MASK_FRAME]; |
1171 | buffer = &zr->jpg_buffers.buffer[frame]; | 1171 | buffer = &zr->jpg_buffers.buffer[frame]; |
1172 | do_gettimeofday(&buffer->bs.timestamp); | 1172 | v4l2_get_timestamp(&buffer->bs.timestamp); |
1173 | 1173 | ||
1174 | if (zr->codec_mode == BUZ_MODE_MOTION_COMPRESS) { | 1174 | if (zr->codec_mode == BUZ_MODE_MOTION_COMPRESS) { |
1175 | buffer->bs.length = (stat_com & 0x7fffff) >> 1; | 1175 | buffer->bs.length = (stat_com & 0x7fffff) >> 1; |
@@ -1407,7 +1407,7 @@ zoran_irq (int irq, | |||
1407 | 1407 | ||
1408 | zr->v4l_buffers.buffer[zr->v4l_grab_frame].state = BUZ_STATE_DONE; | 1408 | zr->v4l_buffers.buffer[zr->v4l_grab_frame].state = BUZ_STATE_DONE; |
1409 | zr->v4l_buffers.buffer[zr->v4l_grab_frame].bs.seq = zr->v4l_grab_seq; | 1409 | zr->v4l_buffers.buffer[zr->v4l_grab_frame].bs.seq = zr->v4l_grab_seq; |
1410 | do_gettimeofday(&zr->v4l_buffers.buffer[zr->v4l_grab_frame].bs.timestamp); | 1410 | v4l2_get_timestamp(&zr->v4l_buffers.buffer[zr->v4l_grab_frame].bs.timestamp); |
1411 | zr->v4l_grab_frame = NO_GRAB_ACTIVE; | 1411 | zr->v4l_grab_frame = NO_GRAB_ACTIVE; |
1412 | zr->v4l_pend_tail++; | 1412 | zr->v4l_pend_tail++; |
1413 | } | 1413 | } |