From patchwork Tue Dec 7 22:45:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scally X-Patchwork-Id: 15072 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 44FABBDB13 for ; Tue, 7 Dec 2021 22:45:38 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D0DA06087A; Tue, 7 Dec 2021 23:45:37 +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="bfoj0YwT"; dkim-atps=neutral Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E46906088C for ; Tue, 7 Dec 2021 23:45:32 +0100 (CET) Received: by mail-wm1-x331.google.com with SMTP id n33-20020a05600c502100b0032fb900951eso2869208wmr.4 for ; Tue, 07 Dec 2021 14:45:32 -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=s1xucXj0FIt6M1+ekbMacUO71Tt4NG9sYWi0tjjPPQ4=; b=bfoj0YwT7POVSzK89JzHSh6qNi0Hi7iBqWh6HFVAeIF4T5bWEh22dI6RbC6sYk9eDZ dvEN09cu6m+Dn0lr3nZjl62Y9Vca2KNdSuhC2EXhqF5O/9zVy22CBE2SDz6UTD8ZV4d5 OobN4BQmDp7Ag3qeytLhZkst70TFmucyxaSgtFaayaOCQ+kpDPcnZCVP1rV3V1poiW3b d29YTpCGdOy6FUcDeNlCG7fLz+p+h/n7itekPgdmzpbEOoqv5sqyi2vhDU7sRLDNedOi LqwQ5+dNX0cWbUn1uFCNq1LIXfIDfQL+xnZavlXdwynWN8Sx/iV7jsFx+/DmmZHuEdxq vyQA== 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=s1xucXj0FIt6M1+ekbMacUO71Tt4NG9sYWi0tjjPPQ4=; b=IXOXA8BU8QE5hzrjeRU77qXi0p4BwTRqJPldaCjbCYsY95uEv1YT423CVT3RUzI0ya KEg65OFzPTXbIL1BT58IKz2suFxPrBcyNlBrxrUn09d88LdM9CVaq7ePd7obV7u+V/3B +os3QqTUisrps+yNNQJMiWkNeZ+LYRoUsUm1lN/LoCZLEoqlGW2d93Dwq5xXRZ5V7Hmf OeMV0tTFvGoKVQXEJlMsUt4glb8KX0FxKBV1Np37pdwxZU0wRvC+QkIP3gOLhuxj5H8p cbT1tHWxAYuOD5taZ/WbgLZflu3Yp/J3wTqbw1hBKSI5dVamhYe81Dk42xWk2O7O+lGp S4AQ== X-Gm-Message-State: AOAM530h9mJgGoNWkNVZfrcZ+lyROTPWqCeXw8Cvfnd6Eruk0TIIEs7+ wWoBwW2Qbm3xwEaiNQtikoiksVr4Bck= X-Google-Smtp-Source: ABdhPJyj3whJKuXmyCQJU1CHuHNhQ7g0HD4gdFCuBnRyBvpeSfaYc3vbYyzHy8gYE1TQ1KrLc+ylcw== X-Received: by 2002:a05:600c:4982:: with SMTP id h2mr10687207wmp.4.1638917132733; Tue, 07 Dec 2021 14:45:32 -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 y12sm980332wrn.73.2021.12.07.14.45.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Dec 2021 14:45:32 -0800 (PST) From: Daniel Scally To: libcamera-devel@lists.libcamera.org Date: Tue, 7 Dec 2021 22:45:09 +0000 Message-Id: <20211207224512.753979-7-djrscally@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211207224512.753979-1-djrscally@gmail.com> References: <20211207224512.753979-1-djrscally@gmail.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 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 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 b7b48d9a..3828650d 100644 --- a/src/ipa/ipu3/ipu3.cpp +++ b/src/ipa/ipu3/ipu3.cpp @@ -162,6 +162,7 @@ private: std::map buffers_; ControlInfoMap ctrls_; + ControlInfoMap lensCtrls_; IPACameraSensorInfo sensorInfo_; @@ -422,6 +423,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.