From patchwork Thu Mar 3 23:49:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scally X-Patchwork-Id: 15413 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 A3015C3261 for ; Thu, 3 Mar 2022 23:50:22 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3EA0661191; Fri, 4 Mar 2022 00:50:22 +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="iSE2M/RI"; dkim-atps=neutral Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id BAF286116B for ; Fri, 4 Mar 2022 00:50:16 +0100 (CET) Received: by mail-wr1-x434.google.com with SMTP id d3so10170062wrf.1 for ; Thu, 03 Mar 2022 15:50:16 -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=WoqbY1BZWhs2mt4/JE/+3IHD5MvVw0hkaOsxP+mksXM=; b=iSE2M/RI6UXXOtAT0qriNzJViwbwHCJtrnNUVFZPmcPq2gqGF2y4R9qvmJDYehIiZl 5irWq+80qZSmZQHIZNhBqbO1tBQK7HEsYHwkxeiaY6c5SrDPblrRXJRpdqganmld+VOH zNL6u0pBo2yNg8e1CTWgBfXLlHDvblqIRJQbGlPTXaDR5NSedLiriprORYP6KpzZGnE5 b0eqoWB4NmH5XkUkuh4wOxBPiDbXKGoRpBUlxomZC594QxnrsJDhcKS2GUcUE/yLWgZ8 azMbFlFqC4v4SyK/a9xvnnXR2Y7FuKw04nENGzxssrMjo65OZc1KDR281T4jL/weatqT yDJg== 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=WoqbY1BZWhs2mt4/JE/+3IHD5MvVw0hkaOsxP+mksXM=; b=Cy1X7oDuFRCq7yA5BXrskxoIwApFwQikAt5cH7FbNB4uRyPMzGJNOJD4iqZvGMYqmO ASsOhwmVbTKHQIuaHOoGYb4hydd8Kj9efhkJkSY2FHsPTCDRXBJhoBtnSORP7iAsn41q ilBeR8mallrCepQjG5zT/L/ywWxjDHtC3ApvNUXCJFIGuddY+ffV2yUtbJK9YVtRTkW1 FXGp8WyporkJyCEebVh/7kIPGxsUcbbjsCzYJSXSRLIrcVN/uddyVqWhzmF3zoqnS95H dF0x+t3MX3GNm7/cAkrC+wVUvQw4k0Nu5nBx1vFyeyv6pcS7k/MhOr8k/88PrWsdN2iY HlTw== X-Gm-Message-State: AOAM5310HQ4RNre5yLMLm3WBCTahNtbzFd1pP2qtE/wdIEEW7CD3z6YT g0RE1Wk/RjNdLnMTmOSb3RxpBHI3bhCKag== X-Google-Smtp-Source: ABdhPJza977agO6u47q/dnxseFn17+15gwlAx/FOVSYxNySJZuGmaBhSUAPuAX7Qoqjxph+pMn4kNQ== X-Received: by 2002:a5d:6d4e:0:b0:1e3:3636:b104 with SMTP id k14-20020a5d6d4e000000b001e33636b104mr28480437wri.605.1646351416558; Thu, 03 Mar 2022 15:50:16 -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 y4-20020adff144000000b001f022290737sm3079779wro.6.2022.03.03.15.50.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Mar 2022 15:50:16 -0800 (PST) From: Daniel Scally To: libcamera-devel@lists.libcamera.org Date: Thu, 3 Mar 2022 23:49:53 +0000 Message-Id: <20220303234956.1463551-7-djrscally@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220303234956.1463551-1-djrscally@gmail.com> References: <20220303234956.1463551-1-djrscally@gmail.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v5 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 Reviewed-by: Jean-Michel Hautbois --- Changes in v5: - None 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.