From patchwork Mon Jun 10 19:17:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13692386 Received: from mail-ot1-f47.google.com (mail-ot1-f47.google.com [209.85.210.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5A2641C694 for ; Mon, 10 Jun 2024 19:18:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718047085; cv=none; b=sGJEMkGMxedM2v9k/5qKCuhKMYBRv7ic8DQGJUho9k7e+v+p3tU8ZGh9YSUDf1setrwNkfoZR/vLMD/FwCopmxpRm1g/bTd/nVapZmypQNo8mtpFGIukfnWhRzF9tDdUKIdtQXjMZxpn8XdnTWAT7TWl06hZlbA74Vj+x1qGkaw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718047085; c=relaxed/simple; bh=e8QAijiS+vWnLQpugeeTYJFotv4VJR9R4QIMdah8zUs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oqHBxWe1/WJXXAj3cqkDo6tuC0n6g/1QypfnyX6m/F4KhByqeqXiJqnZG/rHE3KH6KCnH9mSvsU+dWVF93WqU5aZHvUoA20oB+LmsyfvRtkfzddOJy7gZbdZUbXtOP+KAO9jteV3h+oUwXTQERUtEi237Ua4RKfRbGdmDwsmX5Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=I+lIlsk1; arc=none smtp.client-ip=209.85.210.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="I+lIlsk1" Received: by mail-ot1-f47.google.com with SMTP id 46e09a7af769-6f980c89db8so1168421a34.1 for ; Mon, 10 Jun 2024 12:18:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1718047083; x=1718651883; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=C1ZskNZ0DEFVgNBAvorO0HFPnB7vczxbbUnw5BSBQT4=; b=I+lIlsk1aVXtjXI4th3FZP7V2fS7uz+YVMS0q7D1aLHrbjmn7SGjquQDvnG5uwvqV/ 7yw5voTgHcKMx+CXgQy2ugexiJa+85chWkJM/BInQue3/89mZL5fj/amu8StGrFJaz8J HZzunJx1X2OfbbF+2VTfkijr1VqvJjG7iWoZQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718047083; x=1718651883; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C1ZskNZ0DEFVgNBAvorO0HFPnB7vczxbbUnw5BSBQT4=; b=YaiShy6B3fYiIQLUA6acMmFfQsnRSja1KHji4E8kHgAbfOIelFZdtmLHfB5LoswqVn Uo27qtQIYU5ELYp0PXlaHCmqYxnVh0kJJ2v9Ho+4an9eoBkalSt0MmnXXwLyx7WDwU5O 8b/2WOkSGJWOfY53vb9Pq9dHiFYEIvJ7HC1/rxDn5TCChsvelsMJ78QK8Lw0XCPPhNz0 CJ2csWkGNheM5R4C9x9zikviQ40Alwbe1XqX510An5GjSnjiZZD7NfXUP+7+CopyU/EV cnV4UqNhaEv3igUD/ZRKLH4/usnQrKj59CHlSyrWCWZpiwaKG14YI/bfb2uDFB9jbSUf IU1A== X-Forwarded-Encrypted: i=1; AJvYcCW0hkka48YEgEhwW7qguOjSEAJrv63lC3sCy2Dp0fiLjQzFHNTJbU6S+YEUMdyB9HoERj++IdM1LAMIcyBzU7O4sDh1q0RUuFj61m0= X-Gm-Message-State: AOJu0YyvQXp7FlheAeYiaCaDJUtK65hMu/4XcB+sCupZh9DC79KGK7oa GUleNpkwvKgxiMKNkk3rkdJ0aF/8eTkXO4ED0hrt6+iHNM1MpsFxloAF0SUQEg== X-Google-Smtp-Source: AGHT+IF4eYv4EReM/nxxzD6ehaqsLavj92SzMNnIGlCozlFThq/B614BQ9LCW1qL6n8vFMy7zMWFHA== X-Received: by 2002:a9d:6c57:0:b0:6f9:df67:a8f2 with SMTP id 46e09a7af769-6f9df67ac08mr1454050a34.28.1718047083384; Mon, 10 Jun 2024 12:18:03 -0700 (PDT) Received: from denia.c.googlers.com (123.178.145.34.bc.googleusercontent.com. [34.145.178.123]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b06e66ad80sm26224546d6.129.2024.06.10.12.18.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jun 2024 12:18:02 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 10 Jun 2024 19:17:48 +0000 Subject: [PATCH 1/2] media: uvcvideo: Fix hw timestamp handling for slow FPS Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240610-hwtimestamp-followup-v1-1-f9eaed7be7f0@chromium.org> References: <20240610-hwtimestamp-followup-v1-0-f9eaed7be7f0@chromium.org> In-Reply-To: <20240610-hwtimestamp-followup-v1-0-f9eaed7be7f0@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda , HungNien Chen , Sergey Senozhatsky , Tomasz Figa X-Mailer: b4 0.12.4 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 Reviewed-by: Sergey Senozhatsky Reviewed-by: Tomasz Figa Signed-off-by: Ricardo Ribalda Reviewed-by: Laurent Pinchart --- drivers/media/usb/uvc/uvc_video.c | 23 +++++++++++++++++++++++ drivers/media/usb/uvc/uvcvideo.h | 1 + 2 files changed, 24 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 76a375fe47dc..869876afdcce 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -471,8 +471,30 @@ 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); + /* Handle SOF overflows. */ + 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. */ memcpy(&clock->samples[clock->head], sample, sizeof(*sample)); clock->head = (clock->head + 1) % clock->size; clock->count = min(clock->count + 1, clock->size); @@ -605,6 +627,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 e5b12717016f..f21207debd54 100644 --- 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;