From patchwork Mon Apr 19 13:34:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 12002 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 92F54BD814 for ; Mon, 19 Apr 2021 13:35:02 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 19E2B68839; Mon, 19 Apr 2021 15:35:02 +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="YYHhqV32"; 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 9F901602CD for ; Mon, 19 Apr 2021 15:34:58 +0200 (CEST) Received: by mail-wr1-x435.google.com with SMTP id h4so25037318wrt.12 for ; Mon, 19 Apr 2021 06:34:58 -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=Jo8WkXMl8c5cRR6Ta7ynE+2nvwPxIi03CyEKeDa4jWM=; b=YYHhqV32uRwxKd6bnghJbhyAvakXbTqkj2xOGrR0z42bwEtAzmXnhpG023pRX2/yk3 C8eV6rNkC7ml0DzbP9wBkX5VqF6Y7yB0vUFvbQnpW2vgdjz2awlS9NSaHyRTAyXqNvbu +sRU5YnfzP+NOL1IewXiEjP0Kyg2QmIlHazkkjg4iMovWoJ1Q2W7gYR3YOZty5y61Glb VBbAWUfsfUD7hvop9KyX/g8htZCEXBBm4+1uLwgGikrQPYFq3OnpASZdlX3wYzbSHbDF CXQW0sSgpoWdcIGhkRMNmd6WvLAzYi31fVF9ygcD9EXadk4snvTWBd6odYpanqKHkOWn NvXg== 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=Jo8WkXMl8c5cRR6Ta7ynE+2nvwPxIi03CyEKeDa4jWM=; b=RWFywN+ZVgnIM55QURj081G1u4Ir/wLMCQ0VWK6/bQbp8U2zS+rJ1XnUauob6ElJUz imC6QMAlj68roaR/UpbByuFoRjF3OspClKU38yI1hxvviA2MICAgm0zcCB/FJuwFtMuA zHgG4WkcEq2BEciBsYV294ImlxSfGEfO9S4cfHHIPTvt2ewC7varhzcb2snNHCiuyg9u YHedUfYKafXjRsf0tvP1CqOcI18crDTBWJchB3wQIyHGik0lti4vnzdnhCksNKy/JMHw dMjKJ7GVXwVivtynPHl3J17P6ejg0TD8m+9vQ0uWgbsIS95ez+jExazs5fRd5KnuMjKq PTFQ== X-Gm-Message-State: AOAM5309gya0JUoImZl5tNbuiCMPZA5xikdUUoS78HhR3yrWMucZeywB Gx7FCxBCRO6DPcQ1oy6+PuF1vb+s5T5ZvA== X-Google-Smtp-Source: ABdhPJxEou7YCBnt8iOCjokRxtLZbeD74oOYpqTDNyrew/ClzhuMh8xRnglin43cWRXsz7kdnHOzGA== X-Received: by 2002:adf:ea84:: with SMTP id s4mr14656396wrm.142.1618839298181; Mon, 19 Apr 2021 06:34:58 -0700 (PDT) Received: from naush-laptop.pitowers.org ([2a00:1098:3142:15:5363:8f56:4f84:754]) by smtp.gmail.com with ESMTPSA id k11sm19952238wrx.88.2021.04.19.06.34.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 06:34:57 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Mon, 19 Apr 2021 14:34:47 +0100 Message-Id: <20210419133451.263733-2-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210419133451.263733-1-naush@raspberrypi.com> References: <20210419133451.263733-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v5 1/5] ipa: raspberrypi: Store dropped frame count in a member variable 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" Store the number of dropped frames on startup in a member variable. This will be used in a subsequent change for rate limiting the controller algorithms. Signed-off-by: Naushir Patuck Reviewed-by: David Plowman Reviewed-by: Laurent Pinchart --- src/ipa/raspberrypi/raspberrypi.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index b0f61d351e3a..f6d1ab16a290 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -143,6 +143,9 @@ private: /* How many frames we should avoid running control algos on. */ unsigned int mistrustCount_; + /* Number of frames that need to be dropped on startup. */ + unsigned int dropFrameCount_; + /* LS table allocation passed in from the pipeline handler. */ FileDescriptor lsTableHandle_; void *lsTable_; @@ -220,9 +223,8 @@ void IPARPi::start(const ControlList &controls, ipa::RPi::StartConfig *startConf */ frameCount_ = 0; checkCount_ = 0; - unsigned int dropFrame = 0; if (firstStart_) { - dropFrame = helper_->HideFramesStartup(); + dropFrameCount_ = helper_->HideFramesStartup(); mistrustCount_ = helper_->MistrustFramesStartup(); /* @@ -250,14 +252,14 @@ void IPARPi::start(const ControlList &controls, ipa::RPi::StartConfig *startConf awbConvergenceFrames += mistrustCount_; } - dropFrame = std::max({ dropFrame, agcConvergenceFrames, awbConvergenceFrames }); - LOG(IPARPI, Debug) << "Drop " << dropFrame << " frames on startup"; + dropFrameCount_ = std::max({ dropFrameCount_, agcConvergenceFrames, awbConvergenceFrames }); + LOG(IPARPI, Debug) << "Drop " << dropFrameCount_ << " frames on startup"; } else { - dropFrame = helper_->HideFramesModeSwitch(); + dropFrameCount_ = helper_->HideFramesModeSwitch(); mistrustCount_ = helper_->MistrustFramesModeSwitch(); } - startConfig->dropFrameCount = dropFrame; + startConfig->dropFrameCount = dropFrameCount_; firstStart_ = false; }