From patchwork Fri Jul 9 14:58:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 12885 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 80F32BD794 for ; Fri, 9 Jul 2021 14:58:34 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4189F68530; Fri, 9 Jul 2021 16:58:34 +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="DdJrvY7Y"; 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 BA2856851D for ; Fri, 9 Jul 2021 16:58:31 +0200 (CEST) Received: by mail-wm1-x333.google.com with SMTP id t14-20020a05600c198eb029020c8aac53d4so26039167wmq.1 for ; Fri, 09 Jul 2021 07:58:31 -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=CBcHuMVRJcBtnrr3Y7E6tv89VxQZh5+qq8+9trsTclk=; b=DdJrvY7YOzhlqfHAwUbCv+xwT9qWkr29lZcD1qcFQiCtfbYaIsXrPFgQoZdoNyHgQ1 Mx4nDC9ozxwtqXyKUSo1hRVMDqCphpu+/Vct6baO6/rBrVVypIMYguX4hAVTg3uWY8+R I4JDG6wT6wRHaA4EZs1y6YL8WZRvAZ6yrAZrsess1fMiIllnJ1HHFeSMTKa5XvG6gAWQ 6KgzOTP0zpjdGw44dS5+SbpjnRUb24TFZbgcIUkjq75wWaOuWn0Zph/tCg38Sq/aTuEy D5Smszr+DyLn0wVFUP8fOkWZPPtB4IMg/yrPGE3S0tSKZn9vxxxmtSIcZ6vH1Nq6QHNu 1zxg== 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=CBcHuMVRJcBtnrr3Y7E6tv89VxQZh5+qq8+9trsTclk=; b=TpWSeWEXrXRG1q3FSHzAEffNKr5YY9p2IIaPXJzMxypnIbGKOygSjSrPSX2TSDQE2+ G46nzwR5w88jO65DhvajoYn2tTe5Ee74ax6cl2H8tYaNI9WG4CExJWUK5iYaljt5Ah3N +73k/TXahRCiT2xfZazyFrehcLPsfXN7+40oBB5dGN/CsrfI9i+0aG6QyvAWSrpnN5+u oNVaRjW+XIaQNYxORptJK7kB7hwlJOEPxAy2Ghae8linzNAW23/Q/N7iwlroKn9HcgZX cVX/fs+NhjRwcmSOWk2cc6KjjP/98fIMgLgWtPlYJxCsjNemXvvwuCaY/O0e/8nPxXVW WzCQ== X-Gm-Message-State: AOAM53094AuuetUKDM3eCE/d+/J7AkPULppEaGqAu9lfJ0I/3/b0uFUx 98NaPkU927XbXgBsXrpRks6usJqyFNr7Qw== X-Google-Smtp-Source: ABdhPJy2B2rO3BjBYopqljufrekTVKuw+1PPhXmFRl7c1GyHDUr5gx9XA3GB3dH3wRbjkj/v1fCBlg== X-Received: by 2002:a05:600c:2058:: with SMTP id p24mr40235568wmg.76.1625842711155; Fri, 09 Jul 2021 07:58:31 -0700 (PDT) Received: from naush-laptop.pitowers.org ([2a00:1098:3142:14:35c2:26d3:e217:4410]) by smtp.gmail.com with ESMTPSA id c2sm1480995wrn.28.2021.07.09.07.58.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:58:30 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Fri, 9 Jul 2021 15:58:19 +0100 Message-Id: <20210709145825.2943443-3-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210709145825.2943443-1-naush@raspberrypi.com> References: <20210709145825.2943443-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v6 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/lux.cpp | 9 +-------- 3 files changed, 7 insertions(+), 9 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/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;