media: uvcvideo: Fix hw timestamp handling for slow FPS

In UVC 1.5 we get a single clock value per frame. With the current
buffer size of 32, FPS slowers than 32 might roll-over twice.

The current code cannot handle two roll-over and provide invalid
timestamps.

Revome all the samples from the circular buffer that are more than two
rollovers old, so the algorithm always provides good timestamps.

Note that we are removing values that are more than one second old,
which means that there is enough distance between the two points that
we use for the interpolation to provide good values.

Tested-by: HungNien Chen <hn.chen@sunplusit.com>
Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://lore.kernel.org/r/20240610-hwtimestamp-followup-v1-1-f9eaed7be7f0@chromium.org
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
index 5df8f61d39cd12ec7f56cd962d16a5292e1c09dd..aebcf9b25a16c71c7637c80af1e73dfa8755b822 100644 (file)
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -471,8 +471,29 @@ static void uvc_video_clock_add_sample(struct uvc_clock *clock,
 {
        unsigned long flags;
 
+       /*
+        * If we write new data on the position where we had the last
+        * overflow, remove the overflow pointer. There is no SOF overflow
+        * in the whole circular buffer.
+        */
+       if (clock->head == clock->last_sof_overflow)
+               clock->last_sof_overflow = -1;
+
        spin_lock_irqsave(&clock->lock, flags);
 
+       if (clock->count > 0 && clock->last_sof > sample->dev_sof) {
+               /*
+                * Remove data from the circular buffer that is older than the
+                * last SOF overflow. We only support one SOF overflow per
+                * circular buffer.
+                */
+               if (clock->last_sof_overflow != -1)
+                       clock->count = (clock->head - clock->last_sof_overflow
+                                       + clock->size) % clock->size;
+               clock->last_sof_overflow = clock->head;
+       }
+
+       /* Add sample. */
        clock->samples[clock->head] = *sample;
        clock->head = (clock->head + 1) % clock->size;
        clock->count = min(clock->count + 1, clock->size);
@@ -616,6 +637,7 @@ static void uvc_video_clock_reset(struct uvc_clock *clock)
        clock->head = 0;
        clock->count = 0;
        clock->last_sof = -1;
+       clock->last_sof_overflow = -1;
        clock->sof_offset = -1;
 }
 

diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index e5b12717016fa307229443219048ce4010f38ab1..f21207debd540d0b4c94ca4dcae50cea60d581d1 100644 (file)
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -501,6 +501,7 @@ struct uvc_streaming {
                unsigned int head;
                unsigned int count;
                unsigned int size;
+               unsigned int last_sof_overflow;
 
                u16 last_sof;
                u16 sof_offset;