From patchwork Fri Dec 3 22:42:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scally X-Patchwork-Id: 15035 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 EB743BF415 for ; Fri, 3 Dec 2021 22:42:43 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7EDF46087A; Fri, 3 Dec 2021 23:42:43 +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="XhKs6tSm"; 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 B07B16084B for ; Fri, 3 Dec 2021 23:42:40 +0100 (CET) Received: by mail-wm1-x331.google.com with SMTP id d72-20020a1c1d4b000000b00331140f3dc8so3304246wmd.1 for ; Fri, 03 Dec 2021 14:42:40 -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=qy80IB0hj+30GZcpPcUaOto0eNpJ4OUHDMk3aW6OLKQ=; b=XhKs6tSmg2MXyBPhjn8639AKxNQy93bDSPNfIfru1sRGuHuZym1dDy8p26/RplpbvD AOqBBR/lwFfFVYpNMw4xRohMMPmbA2ckB9Mm6Vk2IDZXYnKjfSu+SFCuICSQQ80XDbQX mkjUE8/ifL2+8EEHl7EtrYsz5XdTstYAS9FkHJPHXDR0TL66iHn+Dl2+UwGs+sAOhPxK e9zYhbd7KXSNw+4zMg5C5okZjM9pLrLPZI9dgb44bf9GvC1i7h/fcgh7fUjibPhGkoaf 1ebHEwx9iP7UxTWT4vFXLVboN4ljR8cP179pIffP3mvdKzBiwNe25/1nmr/vws3qi7u3 LYMQ== 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=qy80IB0hj+30GZcpPcUaOto0eNpJ4OUHDMk3aW6OLKQ=; b=w+bFsGdYpGLL65cNYllnzF0DFyPkWnBPmiEiTgmt4orZhmh0y0JVXJVDWcSJZGBEMS bta6qbbSSPuUhWdFyHlyKyd37uOFIcKIjisD9/ubZAz7/6cc/NYde3esnPPddwrXDKeX 4BeMcgvab1tBX6O95AGM00olq1BKKs1VY51uvU5QWEvdeefkXIGxDeq0+5AscaK07s/q PPdldgRIwgeCHu4aHbMEYWX8F1pRBwKRdOOh0AU54KD5gJ11vSQmQ69U098wnvUf47aE JR4ro51GlpzrjitEm/3UvKsnCF5QTilVIe0mIjNoMRgxtpkXmn07eoxUmdVpxjmFivbR il1g== X-Gm-Message-State: AOAM5318H900N1nCG6G5KVWeztNZqlLXFfv1WhzP+kxu5Q1lwegmSHLQ +lH22SG8calrARZkNPUsfpWa0N8yxqM= X-Google-Smtp-Source: ABdhPJwyUnMt8+wgl91HT9R00s5F2yv61mmzdlzvkiAcxDkbnqaINJRjcQMfdAxgXWXjsfRo1TK8AQ== X-Received: by 2002:a1c:7517:: with SMTP id o23mr18232950wmc.172.1638571360508; Fri, 03 Dec 2021 14:42:40 -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 o25sm3939919wms.17.2021.12.03.14.42.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Dec 2021 14:42:40 -0800 (PST) From: Daniel Scally To: libcamera-devel@lists.libcamera.org Date: Fri, 3 Dec 2021 22:42:28 +0000 Message-Id: <20211203224230.38700-6-djrscally@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211203224230.38700-1-djrscally@gmail.com> References: <20211203224230.38700-1-djrscally@gmail.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 5/7] 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 Signed-off-by: Daniel Scally Reviewed-by: Laurent Pinchart --- Changes in v2: - New patch 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.