Hi Jasmin,
Thank you for the patch.
On Sunday, 14 January 2018 12:21:43 EET Jasmin J. wrote:
> From: Jasmin Jessich <jas...@anw.at>
>
> Commit 828ee8c71950 ("media: uvcvideo: Use ktime_t for timestamps")
> changed to use ktime_t for timestamps. Older Kernels use a struct for
> ktime_t, which requires the conversion function ktime_to_ns to be used on
> some places. With this patch it will compile now also for older Kernel
> versions.
>
> Signed-off-by: Jasmin Jessich <jas...@anw.at>
Reviewed-by: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
and taken into my tree for v4.17.
> ---
> drivers/media/usb/uvc/uvc_video.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_video.c
> b/drivers/media/usb/uvc/uvc_video.c index 5441553..1670aeb 100644
> --- a/drivers/media/usb/uvc/uvc_video.c
> +++ b/drivers/media/usb/uvc/uvc_video.c
> @@ -1009,7 +1009,7 @@ static int uvc_video_decode_start(struct uvc_streaming
> *stream,
>
> buf->buf.field = V4L2_FIELD_NONE;
> buf->buf.sequence = stream->sequence;
> - buf->buf.vb2_buf.timestamp = uvc_video_get_time();
> + buf->buf.vb2_buf.timestamp = ktime_to_ns(uvc_video_get_time());
>
> /* TODO: Handle PTS and SCR. */
> buf->state = UVC_BUF_STATE_ACTIVE;
> @@ -1191,7 +1191,8 @@ static void uvc_video_decode_meta(struct uvc_streaming
> *stream,
>
> uvc_trace(UVC_TRACE_FRAME,
> "%s(): t-sys %lluns, SOF %u, len %u, flags 0x%x, PTS %u, STC
> %u frame
> SOF %u\n", - __func__, time, meta->sof, meta->length, meta->flags,
> + __func__, ktime_to_ns(time), meta->sof, meta->length,
> + meta->flags,
> has_pts ? *(u32 *)meta->buf : 0,
> has_scr ? *(u32 *)scr : 0,
> has_scr ? *(u32 *)(scr + 4) & 0x7ff : 0);
--
Regards,
Laurent Pinchart
