From patchwork Mon Jan 31 22:33:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scally X-Patchwork-Id: 15311 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 06C58C325A for ; Mon, 31 Jan 2022 22:33:50 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id BEC48609C7; Mon, 31 Jan 2022 23:33:49 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AUx+Q5nX"; dkim-atps=neutral Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5C743609EA for ; Mon, 31 Jan 2022 23:33:47 +0100 (CET) Received: by mail-wr1-x433.google.com with SMTP id e8so28326548wrc.0 for ; Mon, 31 Jan 2022 14:33:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CN2Z8QoM3E2akRLSrUKptfBqOnf/BP1kVA/6OXokjQk=; b=AUx+Q5nXySVdD//PUByhv5+KXPIYkGbfnhmf0gaXEp4gRkwO7ZVjDWzfPi2Um9baxh E5INLdblY4b1GhxfSLts+zdYf1Tmi2edaQxANE4jX1MNKBSI55umd1i12X8QfunSnQRQ AaI2+OjUwoxWq//jCi3YDNZBXyJlWfKIHBlQoGPteHf2qNzccQIX8JqyETHLPbyr8Wwx DcUyru0WUrqAfTWx/C5Xqwfp5+wZ4943jh6kZ58so5waFQrPU1eQVQCif68tel7PY/yk ai6gBKevlYw6EotBNEJirIXNxVFpAhlnMqQuYgFviR5kJnFXPvBvjv0tiVC5ZWb800of SHsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CN2Z8QoM3E2akRLSrUKptfBqOnf/BP1kVA/6OXokjQk=; b=wc38vD2wnmlZTAoTx+MVI7PtDpeLCbdlktsjQx1U4puROUn6bQeSZI789Konh4tUtv ctpfUuAtlO+mm6Yza1k+5xDCdhyM4kz8nvU9ApkeDugOZNPiqnhYJB1KWfau2I6+H4AU e7oIuhIJcMWxG6YWPKxxwsgQOSSi+Ad6CUHv7wnSSvqhdAhdcCZuQk4flBWRX4ZJax65 RbhsfnJUHpBgiYrdoXsFTRcCyhDTN4EOUVYuq9lodjIw3br9JRlylCvxGDrmo8yHsIJ0 2UxfTbeQCZS0MnK6Xo3c8BLdVFidPF4wsWUTrUaJGHCkoTMUZXrk7MlcbJnKedTFq3kK vX0Q== X-Gm-Message-State: AOAM532bWVTH7kDFq3bSCJ0hpeLnT4bIbBl//iWaM8WfxZXfR4K1QKGf oXYWZHx1Mh6s8CZbbb5QQVw2FOg30Ag= X-Google-Smtp-Source: ABdhPJxI4vS48z3J226RzuF927nG6HB7WDSpMRu3/iNE+9xVKPT+5G7DWBohfXT9qYokvp8Ze9N8YA== X-Received: by 2002:adf:ee8b:: with SMTP id b11mr19482283wro.430.1643668427171; Mon, 31 Jan 2022 14:33:47 -0800 (PST) Received: from localhost.localdomain (cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net. [86.13.91.161]) by smtp.gmail.com with ESMTPSA id q2sm6986740wrw.14.2022.01.31.14.33.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jan 2022 14:33:46 -0800 (PST) From: Daniel Scally To: libcamera-devel@lists.libcamera.org Date: Mon, 31 Jan 2022 22:33:27 +0000 Message-Id: <20220131223330.61563-7-djrscally@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220131223330.61563-1-djrscally@gmail.com> References: <20220131223330.61563-1-djrscally@gmail.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 6/9] libcamera: ipa: Add lens control member to ipu3 ipa interface 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" Add further members to the ipu3 ipa interface that will hold lens controls passed in by configInfo Reviewed-by: Laurent Pinchart Signed-off-by: Daniel Scally --- Changes since v4: - None Changes in v3: - None include/libcamera/ipa/ipu3.mojom | 1 + src/ipa/ipu3/ipu3.cpp | 3 +++ 2 files changed, 4 insertions(+) diff --git a/include/libcamera/ipa/ipu3.mojom b/include/libcamera/ipa/ipu3.mojom index cc0d822f..18cdc744 100644 --- a/include/libcamera/ipa/ipu3.mojom +++ b/include/libcamera/ipa/ipu3.mojom @@ -37,6 +37,7 @@ struct IPU3Action { struct IPAConfigInfo { libcamera.IPACameraSensorInfo sensorInfo; libcamera.ControlInfoMap sensorControls; + libcamera.ControlInfoMap lensControls; libcamera.Size bdsOutputSize; libcamera.Size iif; }; diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp index b5149bcd..008f93a7 100644 --- a/src/ipa/ipu3/ipu3.cpp +++ b/src/ipa/ipu3/ipu3.cpp @@ -163,6 +163,7 @@ private: std::map buffers_; ControlInfoMap ctrls_; + ControlInfoMap lensCtrls_; IPACameraSensorInfo sensorInfo_; @@ -450,6 +451,8 @@ int IPAIPU3::configure(const IPAConfigInfo &configInfo, sensorInfo_ = configInfo.sensorInfo; + lensCtrls_ = configInfo.lensControls; + /* * Compute the sensor V4L2 controls to be used by the algorithms and * to be set on the sensor.