From patchwork Mon Mar 8 22:39:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 11524 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 977DDBD1F1 for ; Mon, 8 Mar 2021 22:39:49 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id CBBD668AB0; Mon, 8 Mar 2021 23:39:48 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="TM5Mnlek"; dkim-atps=neutral Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7932A68A92 for ; Mon, 8 Mar 2021 23:39:47 +0100 (CET) Received: by mail-wr1-x435.google.com with SMTP id b18so13145124wrn.6 for ; Mon, 08 Mar 2021 14:39:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=u+gFQSGRNNhD2P9SkZ4c6rCGJV1jyRmT9Rhqq+A1UBI=; b=TM5Mnlekpb1JpOHdDsNTv05ivgGjgbScnPtZpfofGOnk8FfByEsb4wi0fFcLjjJM6L jdCgZn0JvRGf1Stc51lypCCSMGAAR11aFgf+JZ6fChGEZd7DVedMOeFRwED2xahsYPzx AMh0Hm3pXhxMeUOQc5nZlggvC5c5/D+ERk6v3IIaxkpLZU7oG0LnzcSqZnNc3IFO1lea vDJAhcGLYOyFskpvCTEFu6O8fGXxx8NbGCv4s02J9xwiB0pTA3sbPl5siPVLDtlV84ML WgFvG1jdkxndqMkKWk3ZNaiiwRMyB2ZpcKqyNxOk5YhXpzCr13mNBkYmJR+NnjVECYs+ 7RjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=u+gFQSGRNNhD2P9SkZ4c6rCGJV1jyRmT9Rhqq+A1UBI=; b=HIazzwBijjVFPa/XRNtYejmjiSFNgZDz68bXfFxJXhL4TCtBPitliTCo9uodwbSj8z gE34QtTj5D+9zHdtAPubn+ycYy+E6MbPgdRP9T/SKWnnDE6Kxpx6MJqQCk8KkbUoEsuR tq4KX97xEDppPbgUx9fu2kMg1kNxBOX7bxSxhVqiMf+jjfcN86WEvMOgngF6ebliv5XB UyY2s0sAoVXeSx02AuIxmvS9hL411RrI8/04LCKohgkZnC7fH1sMQ3FcuKH198mTv89/ 2T8A+ef4HKzh4ArAOtBz9NH9UWKqodDGgsFZdkf7wka3UuhrKLeMocPbn412TsYMHAdK wbvg== X-Gm-Message-State: AOAM530XDDLJi94CwNQRY1JXlJgy4g8KWSx1KPFsoEvayZh3GeKjcRnk B81Yp5Grf1yxwFXlUUkK7xXFKxGPhjYHLA== X-Google-Smtp-Source: ABdhPJwZTnm0WL+hNMs2Mr2v7En/sX8BgQdFqqDnzuQfWaXRy4MqGK/EdOZHjMoOrbv7IuZn1+OKjg== X-Received: by 2002:a5d:658d:: with SMTP id q13mr25136520wru.388.1615243187038; Mon, 08 Mar 2021 14:39:47 -0800 (PST) Received: from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72]) by smtp.gmail.com with ESMTPSA id f17sm19811322wru.31.2021.03.08.14.39.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 14:39:46 -0800 (PST) From: David Plowman To: libcamera-devel@lists.libcamera.org Date: Mon, 8 Mar 2021 22:39:39 +0000 Message-Id: <20210308223939.2088-4-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210308223939.2088-1-david.plowman@raspberrypi.com> References: <20210308223939.2088-1-david.plowman@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 3/3] ipa: raspberrypi: Rename vblank field in SensorConfig to vblankDelay 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" The name vblankDelay is clearer. Signed-off-by: David Plowman --- include/libcamera/ipa/raspberrypi.mojom | 2 +- src/ipa/raspberrypi/raspberrypi.cpp | 2 +- src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom index f733a2cd..c3d614b8 100644 --- a/include/libcamera/ipa/raspberrypi.mojom +++ b/include/libcamera/ipa/raspberrypi.mojom @@ -22,7 +22,7 @@ enum ConfigOutputParameters { struct SensorConfig { uint32 gainDelay; uint32 exposureDelay; - uint32 vblank; + uint32 vblankDelay; uint32 sensorMetadata; }; diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index 741bff4c..85a2b846 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -349,7 +349,7 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo, result->params |= ipa::RPi::ConfigSensorParams; result->sensorConfig.gainDelay = gainDelay; result->sensorConfig.exposureDelay = exposureDelay; - result->sensorConfig.vblank = vblankDelay; + result->sensorConfig.vblankDelay = vblankDelay; result->sensorConfig.sensorMetadata = sensorMetadata; } diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index db91f1b5..6387fae5 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -1266,7 +1266,7 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config) std::unordered_map delays = { { V4L2_CID_ANALOGUE_GAIN, result.sensorConfig.gainDelay }, { V4L2_CID_EXPOSURE, result.sensorConfig.exposureDelay }, - { V4L2_CID_VBLANK, result.sensorConfig.vblank } + { V4L2_CID_VBLANK, result.sensorConfig.vblankDelay } }; delayedCtrls_ = std::make_unique(unicam_[Unicam::Image].dev(), delays);