From patchwork Mon Jul 12 10:02:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 12903 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 E936FC3226 for ; Mon, 12 Jul 2021 10:02:20 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4A8B968530; Mon, 12 Jul 2021 12:02:20 +0200 (CEST) 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="JG1+JvXj"; dkim-atps=neutral Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6E96D68513 for ; Mon, 12 Jul 2021 12:02:17 +0200 (CEST) Received: by mail-wm1-x333.google.com with SMTP id j25-20020a05600c1c19b02902269686f585so800986wms.0 for ; Mon, 12 Jul 2021 03:02:17 -0700 (PDT) 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=a0ZizHb7bTi3j6yd62ZDAnQqObfPtxZJzqDIOudippA=; b=JG1+JvXjfZ8kkysHva0wlUurAaVyRWKNcWf1HVD+8JcVrNyDyOSBWxAzCdc3Aya3rC XnMkPNOmLBPeATOyZLgoOXEjqiQBJU/7UaiI3HJrs9FTPS3TzoFLNMLHxXez3yjqJ+kK cMm6hDXNtUjk4ymZTJASuUKBp0mTYnYiSdz9errJqiv2faHszCyD9cocgwLuogmc1Zw1 SL9pV4xpOM0Ox9QFBi/OPWxitU0CEigAf7O2K4xZt5RUonxlSRtnvq88ENrcZh7kPpLo 5c52S8SiO9cAltMbhmUK4zzvv+GrDexELjuiEVHD0RdlPjgWesupf3Cu8Mzu+qPlfj4Y 72gQ== 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=a0ZizHb7bTi3j6yd62ZDAnQqObfPtxZJzqDIOudippA=; b=J0kerV9j81p1z2heAeRSYai+RrMNvXAHZlEMfy5JTl511clpYfwmv+PNIBwRwtZy1I 0uh/sS8pEZW5wY5LB0gkeYhfUuuXZY/ebR3ehnEfC9UXkDZLTF0Z2gRS/QUl8yuIvtg9 hXWuEi9wc8xqKRJPN53Tyhp7dNMo4XWbpcmLv55ejInoFee3nMwkeB/Os5BgQ39ObHgP x8Ub46f5mkfuc7ufQKDKIfA6vq06RluRQY1isxmOcqrsHknExWEWXwsuBx3Sir0090nl uEk2WeEpZw1bPxXzewdxiaJP8wJxNO/zUu3j1iNaB+7FddPxeAYwf+Lky5cW1+lHHgo1 xr0w== X-Gm-Message-State: AOAM5310yvk5Wa9Dg0u3JN4aCU3LimoM9k1A36+ep0BypC6vseVGEBgF uCaHLwIc+2qhxtJUmtkaBfDzfVCT1WdgnQ== X-Google-Smtp-Source: ABdhPJyP8LvHkePKVX2d/7ERQMsFYN9g3YQGKIE5p/CA1JZEkeOzkmMr0yi4r4v6b5c+5Oz6GXh3HQ== X-Received: by 2002:a05:600c:4f54:: with SMTP id m20mr3340728wmq.52.1626084136664; Mon, 12 Jul 2021 03:02:16 -0700 (PDT) Received: from naush-laptop.pitowers.org ([2a00:1098:3142:14:3395:5e50:10bb:f8fd]) by smtp.gmail.com with ESMTPSA id b16sm14249941wrs.51.2021.07.12.03.02.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 03:02:16 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Mon, 12 Jul 2021 11:02:03 +0100 Message-Id: <20210712100209.447893-3-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210712100209.447893-1-naush@raspberrypi.com> References: <20210712100209.447893-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v7 2/8] ipa: raspberrypi: Add a constructor struct DeviceStatus 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 constructor sets all fields to 0. This replaces the memset(0) and default value initialisation usage in the agc and lux controllers respectively. Signed-off-by: Naushir Patuck Reviewed-by: David Plowman Reviewed-by: Kieran Bingham Reviewed-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- src/ipa/raspberrypi/controller/device_status.h | 6 ++++++ src/ipa/raspberrypi/controller/rpi/agc.cpp | 1 - src/ipa/raspberrypi/controller/rpi/geq.cpp | 2 +- src/ipa/raspberrypi/controller/rpi/lux.cpp | 9 +-------- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/ipa/raspberrypi/controller/device_status.h b/src/ipa/raspberrypi/controller/device_status.h index 733378dbfa27..73df7ce228dd 100644 --- a/src/ipa/raspberrypi/controller/device_status.h +++ b/src/ipa/raspberrypi/controller/device_status.h @@ -14,6 +14,12 @@ */ struct DeviceStatus { + DeviceStatus() + : shutter_speed(std::chrono::seconds(0)), analogue_gain(0.0), + lens_position(0.0), aperture(0.0), flash_intensity(0.0) + { + } + /* time shutter is open */ libcamera::utils::Duration shutter_speed; double analogue_gain; diff --git a/src/ipa/raspberrypi/controller/rpi/agc.cpp b/src/ipa/raspberrypi/controller/rpi/agc.cpp index 6c3a4eb2a04d..f57783f821ec 100644 --- a/src/ipa/raspberrypi/controller/rpi/agc.cpp +++ b/src/ipa/raspberrypi/controller/rpi/agc.cpp @@ -172,7 +172,6 @@ Agc::Agc(Controller *controller) // it's not been calculated yet (i.e. Process hasn't yet run). memset(&status_, 0, sizeof(status_)); status_.ev = ev_; - memset(&last_device_status_, 0, sizeof(last_device_status_)); } char const *Agc::Name() const diff --git a/src/ipa/raspberrypi/controller/rpi/geq.cpp b/src/ipa/raspberrypi/controller/rpi/geq.cpp index bdceb1f3d3eb..4530cb75792c 100644 --- a/src/ipa/raspberrypi/controller/rpi/geq.cpp +++ b/src/ipa/raspberrypi/controller/rpi/geq.cpp @@ -49,7 +49,7 @@ void Geq::Prepare(Metadata *image_metadata) lux_status.lux = 400; if (image_metadata->Get("lux.status", lux_status)) LOG(RPiGeq, Warning) << "no lux data found"; - DeviceStatus device_status = {}; + DeviceStatus device_status; device_status.analogue_gain = 1.0; // in case not found if (image_metadata->Get("device.status", device_status)) LOG(RPiGeq, Warning) diff --git a/src/ipa/raspberrypi/controller/rpi/lux.cpp b/src/ipa/raspberrypi/controller/rpi/lux.cpp index f58d69397e1c..6367b17dc7f4 100644 --- a/src/ipa/raspberrypi/controller/rpi/lux.cpp +++ b/src/ipa/raspberrypi/controller/rpi/lux.cpp @@ -60,14 +60,7 @@ void Lux::Prepare(Metadata *image_metadata) void Lux::Process(StatisticsPtr &stats, Metadata *image_metadata) { - // set some initial values to shut the compiler up - DeviceStatus device_status = { - .shutter_speed = 1.0ms, - .analogue_gain = 1.0, - .lens_position = 0.0, - .aperture = 0.0, - .flash_intensity = 0.0 - }; + DeviceStatus device_status; if (image_metadata->Get("device.status", device_status) == 0) { double current_gain = device_status.analogue_gain; double current_aperture = device_status.aperture;