From patchwork Fri Dec 6 14:27:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 22215 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id ECD5CBE173 for ; Fri, 6 Dec 2024 14:27:58 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 848F766176; Fri, 6 Dec 2024 15:27:53 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="RRatNyea"; dkim-atps=neutral Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 71FC866166 for ; Fri, 6 Dec 2024 15:27:48 +0100 (CET) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-434e3953b65so892865e9.1 for ; Fri, 06 Dec 2024 06:27:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1733495268; x=1734100068; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1BggXtC9eS3Pe4g0NtueKve30BwBdwUvqTaJYJVa6/M=; b=RRatNyea6Em4dta/RFj+dngdEc1LRNia//ut4tB6Gj8BaSFXdag3y/aj291mGt4YLK 1m946IpMnLnm+RFuBqIati12kYGBatJKq1fXkaXqFRSXozH3417YrVv7TTucKMdg2/4F 0jC9uYAIIxV2p7jSOlwcyorMhrd2AmbyEwvBvhzOsjSQB27HoSAukRq6baak1vy1OuL9 /LBGnTLqm6qqzOfd0nttSih8fHxRI9NLXDLK5oSOAbJ8bV4XgjJpkAGhly6Si0IYLxv6 R4ioFF6X3hCzDIodLSppfiw6pnMOfuw8QPTV6v4j2zZHJHc4ZUxeaClvSYbzraMXyDpR Rlfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733495268; x=1734100068; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1BggXtC9eS3Pe4g0NtueKve30BwBdwUvqTaJYJVa6/M=; b=QlnPgSwxo00qfZRfhlEgVY41mt/BlzvtKrEygCWR3fAUU7V6YKCCrnHZWqpuQu6Sw9 ce+ZQm8i2jv0gDEOG7gcuEcjl1iRRMtnnp8w17bDAvha66cpvijoLhRbKB1Q1ihSaTRp u9+EpDingTzApIhMduxuEpfHLeF4Rsqdvql0gFU03I3TWvolin2q3DRWu5T7jNm8mkDA GMMe+LSYN0p/HFTJIhWg+5x/g37W8q1C9GnlGmpW3WcuMhwb2Qb+dizGpkkarLIBmw5U u2uQ1I92wD+uvd6JJRgOrPVWOPEQG4KO7YQt1/MMPuMRa6ueFBp0f9cAKGa9+kwMX5ii lriw== X-Gm-Message-State: AOJu0YwWJUC2qMJIQ4aH9Yvz9w2/yw28d9Z4g1Wx9dNW+sRIM4FG6coZ laIdwSsuGVZtesCYmFGVnzS6HwMPeQWSUSdlQQ7pVvugPJuUr/dDDC6bID2bWDx0rClmNwIeEd2 m X-Gm-Gg: ASbGnctQMctdyxFz21QhzGdVXQHZ0uxu+FLBKgN6hAG0cCVG+f5b0Jt3t0yhDEuk4pv M/52fYGC96oF7MBgSWAokUU/wx2y1xSlKCsDm3W1nq+kJ54h4ow34CqqiBd5YGCi2ce4KxtFmEv WcgEAetf2u1QcIOvpCKOi4gZu1P1yFvQOV3+JxL1WfAN0DrDRqykoyoRBGQi35XIWKq3A1DSZiB 5ECVmXNwD3k4yYCQmTT2H5IOjmRfM2hzEeEpUHEg32tnV79FFXtNch5HUx8JViT0MuErCeLRs8= X-Google-Smtp-Source: AGHT+IEXkMvfVT8xbVSxt6RfxVlUst44WgdaWvUFvMVNhgXZDhYeuw2c7MRK0aHrZGrbOa3UQgoQBg== X-Received: by 2002:a05:6000:178a:b0:385:f417:ee46 with SMTP id ffacd0b85a97d-3862b33b786mr2368320f8f.2.1733495267690; Fri, 06 Dec 2024 06:27:47 -0800 (PST) Received: from localhost.localdomain ([88.202.252.90]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-386220b071dsm4608219f8f.101.2024.12.06.06.27.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Dec 2024 06:27:47 -0800 (PST) From: David Plowman To: libcamera-devel@lists.libcamera.org Cc: David Plowman Subject: [PATCH 4/5] pipeline: rpi: common: Add wallclock timestamp support Date: Fri, 6 Dec 2024 14:27:41 +0000 Message-Id: <20241206142742.7931-5-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241206142742.7931-1-david.plowman@raspberrypi.com> References: <20241206142742.7931-1-david.plowman@raspberrypi.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" A ClockRecovery object is added for derived classes to use, and wallclock timetamps are copied into the request metadata for applications. Signed-off-by: David Plowman --- src/libcamera/pipeline/rpi/common/pipeline_base.cpp | 2 ++ src/libcamera/pipeline/rpi/common/pipeline_base.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp index 6f278b29..34971973 100644 --- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp +++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp @@ -1509,6 +1509,8 @@ void CameraData::fillRequestMetadata(const ControlList &bufferControls, Request { request->metadata().set(controls::SensorTimestamp, bufferControls.get(controls::SensorTimestamp).value_or(0)); + request->metadata().set(controls::FrameWallClock, + bufferControls.get(controls::FrameWallClock).value_or(0)); if (cropParams_.size()) { std::vector crops; diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.h b/src/libcamera/pipeline/rpi/common/pipeline_base.h index aae0c2f3..9aa591d6 100644 --- a/src/libcamera/pipeline/rpi/common/pipeline_base.h +++ b/src/libcamera/pipeline/rpi/common/pipeline_base.h @@ -20,6 +20,7 @@ #include "libcamera/internal/bayer_format.h" #include "libcamera/internal/camera.h" #include "libcamera/internal/camera_sensor.h" +#include "libcamera/internal/clock_recovery.h" #include "libcamera/internal/framebuffer.h" #include "libcamera/internal/media_device.h" #include "libcamera/internal/media_object.h" @@ -237,6 +238,8 @@ protected: virtual int platformRegister(std::unique_ptr &cameraData, MediaDevice *unicam, MediaDevice *isp) = 0; + ClockRecovery wallClockRecoery_; + private: CameraData *cameraData(Camera *camera) {