From patchwork Wed Nov 30 11:37:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 17920 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 EC399BDE6B for ; Wed, 30 Nov 2022 11:37:32 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A220A63336; Wed, 30 Nov 2022 12:37:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1669808252; bh=hOwXpYEbokN/9FzGW9HbnyOVGStujn0uJbY7Of4SplM=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=0HEPuKZeNYI2dtmwxkEtjlFpmyqNTriGpj2+ao8h0GuqiYiwxwDh0EFe/3fAy0C40 bXVPXB5X94nF8XoFyUow/DCylhdHKb7ZNVOUIRPwUJkY6jN7a4bf5cXU3S5ULEOvy2 ASQR8j8ROSAZtbR5I5yYmXc6H+Y6Wog1qKBZKSww2LIBMN4Nh7L9IH4UuLTtZarNZQ vDyNz04BxVY/3QA1WrQMVvC1LrXWCOAgrK78Vo6gSH6zbU8g1+0jStTgdKu41qGbxk Vggu7k0iVeZXh2eG58NDOP5w0HeBRLkFDZyc2S1W+16XTuhXexzX+RKUgso7nY6M4i weBAM0Kae3+dQ== Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0C61161F23 for ; Wed, 30 Nov 2022 12:37:31 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="YvEvgefo"; dkim-atps=neutral Received: by mail-wm1-x335.google.com with SMTP id 2-20020a1c0202000000b003d0760654d3so593078wmc.4 for ; Wed, 30 Nov 2022 03:37:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; 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=jV0DkeSD9+ryVwEfDFqMUMlzS2JZq+Z7ewx9Mer0lCk=; b=YvEvgefof4VM7zofLYro6LqNvc7Uv3s1N6y7Cytw+mtfOq1WjNMqNLPL1ouR1LrfPp 94oJKCTu/bDUb6ck2N8IT8hDypV+EKqyZNhAEEGpb43LrirI8EKSS3l6CLxKqn6ngZW9 5qBjNPMqb0bQnkXf5wjE6FGO6v5ZGVSf7PAkHTHEW/wBNZCxa+YHnyYqilEk2m4MjnkV b2LMnU5YS2JCRU3eNF/4dOQbYqoiYRUNpP1F8gvQNTIjOB9J0oOQfLFVOy6zVYkSNHUk lBu1mHpJjkfdWYiVkjtBRTA3gBdDafqOhZvj+CN+tHxSkWN0JDgLk1XZGQQQzAIGq6To bqUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=jV0DkeSD9+ryVwEfDFqMUMlzS2JZq+Z7ewx9Mer0lCk=; b=pCTHGNiGnE+Q6ftewTkLSYCrrKxUQcVT5cyRT3JSApUlPp2K6N/y8M/IvYp/yZcCxW YiMW5MXqonYo5m4xzvxnnLixhGOxKboN5Fpaz9AMcJd0AWy86QJco6/OzFHMlq7q97ym yDY2JNnu2tudNL7WCD4rN0FUyaIr7AazUtun7geVWHkohOxufCxYSTjS5WlxhPJpcMgq IWJZMMLCf0F7zzmi45Q0Lev1XlpFCuP/EjZHEjkIT86+DFcon3JkHfvNbXV7uUW7Y6ZC bAJfJeAC3lfvxrojlaBlVokT5hmP7kCPu+RK/SHRZ+hBJy8qWA1CGM0nCmi6fWklfXKB Jn3Q== X-Gm-Message-State: ANoB5plsTy7f1Zr593nRzbRVOCzF5PdH0s0QWIME1mvUPeNmsEaN3WTA uDIqIhtMFCsbhA2wTprSkBUYVkuelXUCqA== X-Google-Smtp-Source: AA0mqf5eSozeH+LikIcp3TfRqUxdSyjC7Af/hNu+l8rN00i7IYWTTr+gKssvo3xTF4OyoBpAh1T3eQ== X-Received: by 2002:a05:600c:4e50:b0:3d0:bda:f2c with SMTP id e16-20020a05600c4e5000b003d00bda0f2cmr31740878wmq.117.1669808250493; Wed, 30 Nov 2022 03:37:30 -0800 (PST) Received: from naush-laptop.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id ay2-20020a05600c1e0200b003cfd0bd8c0asm1684453wmb.30.2022.11.30.03.37.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Nov 2022 03:37:30 -0800 (PST) To: libcamera-devel@lists.libcamera.org Date: Wed, 30 Nov 2022 11:37:27 +0000 Message-Id: <20221130113727.13299-1-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221130105253.12497-1-naush@raspberrypi.com> References: <20221130105253.12497-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] ipa: raspberrypi: Fix bug in IPA frame drop logic 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 Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Fix a bug in the IPA frame dropping (for rate control) logic, where the metadata for the current context was copied from itself (i.e. a no-op), instead of being copied from the previous context. This bug does not occur in normal conditions, only when running with a low exposure time and unconstrained framerate, which happens in a particular picamera2 test. Fixes: 546154b13433 ("pipeline: ipa: raspberrypi: Use IPA cookies") Signed-off-by: Naushir Patuck Reviewed-by: Kieran Bingham Reviewed-by: David Plowman --- src/ipa/raspberrypi/raspberrypi.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index 0f914f841e54..bead436def3c 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -1062,7 +1062,7 @@ void IPARPi::prepareISP(const ISPConfig &data) * in helper_->Prepare(). */ RPiController::Metadata &lastMetadata = - rpiMetadata_[ipaContext ? ipaContext : rpiMetadata_.size()]; + rpiMetadata_[(ipaContext ? ipaContext : rpiMetadata_.size()) - 1]; rpiMetadata.mergeCopy(lastMetadata); processPending_ = false; return;