From patchwork Tue Mar 7 10:30:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 18348 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 9BD65BDE17 for ; Tue, 7 Mar 2023 10:30:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B3A51626BD; Tue, 7 Mar 2023 11:30:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1678185022; bh=uHukBppQ9A5OsTHDeu/tfXJdWD3XkC4RKes4mVrlEV4=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=q4gvgt+6S6j+q2Xc1LaTnEr7VrijStqCSherdLGcTlLTdpBKFJORWskvDF9g6+zDs WIoK6EdDHgz2yuDAXILHeno5FEtjI1+/QuB8fbuzQwDV/y98c8xTtYSRrKWmav9KEf sun9FJ4jrjqVwHjog1ehu4KZs86GYT5gaFNrrjmwMUxXB2u3Sws0eLSA1U4RtMAEAv G3yuZfcpOk33BEVoKa6RiUXHnFdv1h0J5j+3z7pmT+T2HMdnjxNgnPotOumrUN0brj 4vpmLC/lEj2IDROhyOjAhcxFPQ2pY8Gm+u2XxpNAkV2+Y4smDkYSp9R/xap62jGAER diDOdRGfE5i5w== Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E4A93626B0 for ; Tue, 7 Mar 2023 11:30:20 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="Oc9fJCg9"; dkim-atps=neutral Received: by mail-wr1-x430.google.com with SMTP id f11so11593612wrv.8 for ; Tue, 07 Mar 2023 02:30:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1678185020; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PhGw19Z6wfbl/Zl2QWmnDP+EBngZ5SCr/PEqqFZIILA=; b=Oc9fJCg9ZPDZuSAhHHHpSNC+hvh+yNyQQy1zfBqZUszNQR3QYNKZ+TFN3Jnv4AhiJr ZaPy5gp4WH4nzrOQrNPdZvV2UPyFTiZp1jPOAiBua2vBg3eHqPROehoxWuufO2u2B1Gs vkPNLsHdIbF0dMyCgEVU1r+t7J5sVUhDiGLCAmL7dTr3J+b8fwPrmZmJNM97X6P4l20P d6lDvPV5Ii/9Z1+8TOIVjKs2Ypb2Xg0eFsTvEckNY8VWPcOGsyb3BvaPh6Qcf++bwqcU NRo/Lw8O9T5LbqYSfU/4Z//EfToZu7/I6yzWXfmLtG2/cYEdS+wktmwwdhTqncH+DVAd j0bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678185020; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PhGw19Z6wfbl/Zl2QWmnDP+EBngZ5SCr/PEqqFZIILA=; b=NVfHT94pXL9ucif2yJ36fomWBmefgXlMGRLgmwhuFNyeiaNKpHyt1V5/IYUzAVS4kK alp+keYzRrDzz2ESyxb4FqeUCQqDUQZByRzhVVlIwII3hX41vFLCbe1Yildxl24S6RtO r7tK139W7FjmJdzMThVENupYpOnmtb43eDBZkHR3FF92aD6O8hMEBTamgPhQkY0QamiX /jzAP6UJN+sx+3n6lEO8p2tvg3VK86piXlTwoYJBhXZ/9hk5lkLiRIzSamRHTwOlXjm5 hGjUyev5TZjUu6ZmluLMzhce15JGt2n+Wo7L901+Fr3quvyhgrJXUpIMhf3gAQewqoJ0 4RpA== X-Gm-Message-State: AO0yUKXfWX+BL5x8Pd+bx82ZadO43xIl8rLvUduWCdWumJ0I7RojtIVc wcZhKaCEy76SIkNoKBPqi/mp54ercaco0+XtSSsYQw== X-Google-Smtp-Source: AK7set/tHWL+WysTpjUHHOQMyfFO1+L4GzQra+l0iQCdm1By4sMfTPofrg85+xjRLrb73df3wZ+E+A== X-Received: by 2002:adf:ec04:0:b0:2c7:d56:777b with SMTP id x4-20020adfec04000000b002c70d56777bmr9192339wrn.64.1678185020210; Tue, 07 Mar 2023 02:30:20 -0800 (PST) Received: from localhost.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id r1-20020a056000014100b002c5534db60bsm12523621wrx.71.2023.03.07.02.30.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 02:30:19 -0800 (PST) To: libcamera-devel@lists.libcamera.org Date: Tue, 7 Mar 2023 10:30:22 +0000 Message-Id: <20230307103023.3932-3-naush@raspberrypi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230307103023.3932-1-naush@raspberrypi.com> References: <20230307103023.3932-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 2/3] ipa: raspberrypi: Better heuristics for calculating Unicam timeout 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: , X-Patchwork-Original-From: Naushir Patuck via libcamera-devel From: Naushir Patuck Reply-To: Naushir Patuck Cc: Jacopo Mondi Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The existing mechanism of setting a timeout value simply uses the maximum possible frame length advertised by the sensor mode. This can be problematic when, for example, the IMX477 sensor can use a frame length of over 600 seconds. However, for typical usage the frame length will never go over several 100s of milliseconds, making the timeout very impractical. Store a list of the last 10 frame length values requested by the AGC. On startup, and at the end of every frame, take the maximum frame length value from this list and return that to the pipeline handler through the setCameraTimeoutValue() signal. This allows the timeout value to better track the actual sensor usage. Signed-off-by: Naushir Patuck Reviewed-by: David Plowman Reviewed-by: Jacopo Mondi --- src/ipa/raspberrypi/raspberrypi.cpp | 45 +++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index f6826bf27fe1..1375795568e2 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -64,6 +65,9 @@ using utils::Duration; /* Number of metadata objects available in the context list. */ constexpr unsigned int numMetadataContexts = 16; +/* Number of frame length times to hold in the queue. */ +constexpr unsigned int FrameLengthsQueueSize = 10; + /* Configure the sensor with these values initially. */ constexpr double defaultAnalogueGain = 1.0; constexpr Duration defaultExposureTime = 20.0ms; @@ -121,7 +125,8 @@ class IPARPi : public IPARPiInterface public: IPARPi() : controller_(), frameCount_(0), checkCount_(0), mistrustCount_(0), - lastRunTimestamp_(0), lsTable_(nullptr), firstStart_(true) + lastRunTimestamp_(0), lsTable_(nullptr), firstStart_(true), + lastTimeout_(0s) { } @@ -155,6 +160,7 @@ private: void fillDeviceStatus(const ControlList &sensorControls, unsigned int ipaContext); RPiController::StatisticsPtr fillStatistics(bcm2835_isp_stats *stats) const; void processStats(unsigned int bufferId, unsigned int ipaContext); + void setCameraTimeoutValue(); void applyFrameDurations(Duration minFrameDuration, Duration maxFrameDuration); void applyAGC(const struct AgcStatus *agcStatus, ControlList &ctrls); void applyAWB(const struct AwbStatus *awbStatus, ControlList &ctrls); @@ -220,6 +226,10 @@ private: /* Maximum gain code for the sensor. */ uint32_t maxSensorGainCode_; + + /* Track the frame length times over FrameLengthsQueueSize frames. */ + std::deque frameLengths_; + Duration lastTimeout_; }; int IPARPi::init(const IPASettings &settings, bool lensPresent, IPAInitResult *result) @@ -284,6 +294,11 @@ void IPARPi::start(const ControlList &controls, StartConfig *startConfig) controller_.switchMode(mode_, &metadata); + /* Reset the frame lengths queue state. */ + lastTimeout_ = 0s; + frameLengths_.clear(); + frameLengths_.resize(FrameLengthsQueueSize, 0s); + /* SwitchMode may supply updated exposure/gain values to use. */ AgcStatus agcStatus; agcStatus.shutterTime = 0.0s; @@ -294,6 +309,7 @@ void IPARPi::start(const ControlList &controls, StartConfig *startConfig) ControlList ctrls(sensorCtrls_); applyAGC(&agcStatus, ctrls); startConfig->controls = std::move(ctrls); + setCameraTimeoutValue(); } /* @@ -340,8 +356,6 @@ void IPARPi::start(const ControlList &controls, StartConfig *startConfig) } startConfig->dropFrameCount = dropFrameCount_; - const Duration maxSensorFrameDuration = mode_.maxFrameLength * mode_.maxLineLength; - setCameraTimeout.emit(maxSensorFrameDuration.get()); firstStart_ = false; lastRunTimestamp_ = 0; @@ -1434,6 +1448,22 @@ void IPARPi::processStats(unsigned int bufferId, unsigned int ipaContext) applyAGC(&agcStatus, ctrls); setDelayedControls.emit(ctrls, ipaContext); + setCameraTimeoutValue(); + } +} + +void IPARPi::setCameraTimeoutValue() +{ + /* + * Take the maximum value of the exposure queue as the camera timeout + * value to pass back to the pipeline handler. Only signal if it has changed + * from the last set value. + */ + auto max = std::max_element(frameLengths_.begin(), frameLengths_.end()); + + if (*max != lastTimeout_) { + setCameraTimeout.emit(max->get()); + lastTimeout_ = *max; } } @@ -1522,6 +1552,15 @@ void IPARPi::applyAGC(const struct AgcStatus *agcStatus, ControlList &ctrls) */ if (mode_.minLineLength != mode_.maxLineLength) ctrls.set(V4L2_CID_HBLANK, static_cast(hblank)); + + /* + * Store the frame length times in a circular queue, up-to FrameLengthsQueueSize + * elements. This will be used to advertise a camera timeout value to the + * pipeline handler. + */ + frameLengths_.pop_front(); + frameLengths_.push_back(helper_->exposure(vblank + mode_.height, + helper_->hblankToLineLength(hblank))); } void IPARPi::applyDG(const struct AgcStatus *dgStatus, ControlList &ctrls)