From 93029eb3e979111f67bdc627b6143a3f07bdebb6 Mon Sep 17 00:00:00 2001 From: Sakari Ailus Date: Sat, 15 Sep 2012 07:51:47 -0300 Subject: [PATCH] --- yaml --- r: 357030 b: refs/heads/master c: abd23295648a9e3ae72a806e70a510d3dcd8b374 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/v4l2-core/v4l2-common.c | 10 ++++++++++ trunk/include/media/v4l2-common.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2ad95e724027..c141877a95ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1202ecdc24fc88d5b144824f55ec9c8899591caf +refs/heads/master: abd23295648a9e3ae72a806e70a510d3dcd8b374 diff --git a/trunk/drivers/media/v4l2-core/v4l2-common.c b/trunk/drivers/media/v4l2-core/v4l2-common.c index 380ddd89fa4c..614316f9b7a4 100644 --- a/trunk/drivers/media/v4l2-core/v4l2-common.c +++ b/trunk/drivers/media/v4l2-core/v4l2-common.c @@ -978,3 +978,13 @@ const struct v4l2_frmsize_discrete *v4l2_find_nearest_format( return best; } EXPORT_SYMBOL_GPL(v4l2_find_nearest_format); + +void v4l2_get_timestamp(struct timeval *tv) +{ + struct timespec ts; + + ktime_get_ts(&ts); + tv->tv_sec = ts.tv_sec; + tv->tv_usec = ts.tv_nsec / NSEC_PER_USEC; +} +EXPORT_SYMBOL_GPL(v4l2_get_timestamp); diff --git a/trunk/include/media/v4l2-common.h b/trunk/include/media/v4l2-common.h index 1a0b2db4c5d3..ec7c9c00b256 100644 --- a/trunk/include/media/v4l2-common.h +++ b/trunk/include/media/v4l2-common.h @@ -225,4 +225,6 @@ bool v4l2_detect_gtf(unsigned frame_height, unsigned hfreq, unsigned vsync, struct v4l2_fract v4l2_calc_aspect_ratio(u8 hor_landscape, u8 vert_portrait); +void v4l2_get_timestamp(struct timeval *tv); + #endif /* V4L2_COMMON_H_ */