{"id":24231,"url":"https://patchwork.libcamera.org/api/patches/24231/?format=json","web_url":"https://patchwork.libcamera.org/patch/24231/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20250825114435.570351-1-paul.elder@ideasonboard.com>","date":"2025-08-25T11:44:35","name":"libcamera: clock_recovery: Use nanoseconds in addSample()","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"44ac353f513d030730248edf7003ef84853102b5","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/24231/mbox/","series":[{"id":5403,"url":"https://patchwork.libcamera.org/api/series/5403/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5403","date":"2025-08-25T11:44:35","name":"libcamera: clock_recovery: Use nanoseconds in addSample()","version":1,"mbox":"https://patchwork.libcamera.org/series/5403/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/24231/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/24231/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 89513BEFBE\n\tfor ;\n\tMon, 25 Aug 2025 11:44:49 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2DC2F692E1;\n\tMon, 25 Aug 2025 13:44:49 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2B825692CA\n\tfor ;\n\tMon, 25 Aug 2025 13:44:47 +0200 (CEST)","from neptunite.infra.iob (unknown\n\t[IPv6:2404:7a81:160:2100:39d7:37aa:64a2:5533])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 252532285;\n\tMon, 25 Aug 2025 13:43:43 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"t89ymJe+\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1756122225;\n\tbh=NQvSBFAPvMusXBmYYHfn5GFpM6WuZdz3Rgw9gpiLhSQ=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=t89ymJe+CgmCHMi/v2WN5E+cT0qQAEi7E6eA6Mu2jP4vKLXBIhhZ4SojEmRzNjF2L\n\tSbBKNoEaV+hYdl/Tk2PRbGZ3YkfD1akVv/bd2J9whdxpp0RdY4ypDzulJVVHfYSYM3\n\t255VhOGglIME26wFIVNZ1D/WLsRIV+PTdySJq0NY=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Cc":"Paul Elder ","Subject":"[PATCH] libcamera: clock_recovery: Use nanoseconds in addSample()","Date":"Mon, 25 Aug 2025 20:44:35 +0900","Message-ID":"<20250825114435.570351-1-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.47.2","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"FrameWallClock was recently changed to nanoseconds, and all users of\nClockRecovery use SensorTimestamp directly, which is also in\nnanoseconds. Thus addSample() should also use nanoseconds. Fix this.\n\nSigned-off-by: Paul Elder \n---\n src/libcamera/clock_recovery.cpp | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)","diff":"diff --git a/src/libcamera/clock_recovery.cpp b/src/libcamera/clock_recovery.cpp\nindex abacf444fbf8..f9ccb6ae2144 100644\n--- a/src/libcamera/clock_recovery.cpp\n+++ b/src/libcamera/clock_recovery.cpp\n@@ -118,10 +118,10 @@ void ClockRecovery::addSample()\n \tclock_gettime(CLOCK_BOOTTIME, &bootTime1);\n \tclock_gettime(CLOCK_REALTIME, &wallTime);\n \tclock_gettime(CLOCK_BOOTTIME, &bootTime2);\n-\tuint64_t boot1 = bootTime1.tv_sec * 1000000ULL + bootTime1.tv_nsec / 1000;\n-\tuint64_t boot2 = bootTime2.tv_sec * 1000000ULL + bootTime2.tv_nsec / 1000;\n+\tuint64_t boot1 = bootTime1.tv_sec * 1000000000ULL + bootTime1.tv_nsec;\n+\tuint64_t boot2 = bootTime2.tv_sec * 1000000000ULL + bootTime2.tv_nsec;\n \tuint64_t boot = (boot1 + boot2) / 2;\n-\tuint64_t wall = wallTime.tv_sec * 1000000ULL + wallTime.tv_nsec / 1000;\n+\tuint64_t wall = wallTime.tv_sec * 1000000000ULL + wallTime.tv_nsec;\n \n \taddSample(boot, wall);\n }\n","prefixes":[]}