From patchwork Mon Oct 23 13:54:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 19179 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 DF0A0C0DA4 for ; Mon, 23 Oct 2023 13:54:50 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 58A9962973; Mon, 23 Oct 2023 15:54:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1698069290; bh=0sS0uGRDvhWpTK2ASpeQ/CPWSQKZ3ZbeoHft5ZM2E+g=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=tAgT3faXArqDFEFcOvTi6pqTp1a/PQk1H/g+FSvBzGgEaos0ITF3fMiZPtaCyW0Oy 37vQoI2+dZOzoPN6AwPP1WSJMnQVfY9oJ3oQdFsplujaR8NVWsEbehjR6kv1kzh+uP VdlqCvMmopd2hs5GzMJL6o5ceFU5997M7DKEdaqU+zziA/VJNDd1W3S4IbhebE1UGL OusmA9ZwlyqDlH+wXqhlou5e4HMcD9fmEDwmCcwT5RneJpg4rYZ3ZwYd+QWtq1SW9G kUoydhr78IYU2BLEPiS9XyRpQkSRnqFm5Zvmsg1E9HUAsCXgFQNsN7oqgAMpd5TLQ9 TIkzaHQ065E9g== 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 0332561DCE for ; Mon, 23 Oct 2023 15:54:47 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="PUFIdJW0"; dkim-atps=neutral Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40859c46447so14150325e9.1 for ; Mon, 23 Oct 2023 06:54:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1698069287; x=1698674087; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=riUtgq6RT7/KsDfQUo1ATcfV9dam6TTHY2NPA44GLwk=; b=PUFIdJW0anZCqQa7ie16XzwsKNgZsjQZ9t/QOwAtuelnZRx8oYsbuOF+YdgqKtUYIG e13UKCWrJoHOPmcn2Kz3amC0q0Ed4JPl4LLPpZR+fgMZzSSPBrh3RNAP4qbU5Dm+E/RS w4Iw/B3XTmaNP6E/XS8zMTUAN3W8RVrX55WR/7wr2oVtJy7VTpXKHlm3A5qzXYyXzfUe u9CI0CeBIuM8i4NxvaPgdkzzxQ3AIT7bqWh5iUx/R49vPCiNGBQ46rIzfSw9MfTQfgEL V0er5BhZ6Id2snwQVpLcJcw8EkmUe2HHfpdxY1mXPPaHjJAmZSCsUj7IdocKuL79wuPT 9W4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698069287; x=1698674087; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=riUtgq6RT7/KsDfQUo1ATcfV9dam6TTHY2NPA44GLwk=; b=U7wWJvHMphNzlUuMHLW50l5m2EaZ07xpoPc9v5+wAJKPvmcO/iQczqhdFxyXoL7Zkd h9teW1YXv18qcsoDWJixzliC5x4cMtvGzbosTjygjMwwlI1j4XRkorfwuW4u+vJVaLD1 Gv2dKxSei1EQqhI3oOH60QPDh8Mu0ivrnOgm6Gcf7OhS4FR+gCMDd86EIm3NhTWnzKFq Wn+Zw9F3nJQxpQ65M8UnIeJ2+z59Dln7fXXHmOvzP7Vw8Hu8o9DCbH8lt0SSv6pQL7Vt 5ExVXPhVl5rt4yN5QORL4yHcTIDuTGTwUnf+KKT0WnPfhoYjH1HrikFmtTEXJSUjhB5e 2XCg== X-Gm-Message-State: AOJu0YxwCRO5cb8Z3ZMQ4eR/OXKmlj0Md49VcPqT998RN7rRJ8/XolJZ IvZrY0Cidsb5391e9jKR8u49X95Rjo/nHIAMlVQUqw== X-Google-Smtp-Source: AGHT+IEMqd8YgqD0Esi0gtdWSiWDgAjrWkNYS86//xslWY8xL3iN04/41go/fcsUDweI71XhYvqfCQ== X-Received: by 2002:a05:600c:4f45:b0:407:7e7a:6017 with SMTP id m5-20020a05600c4f4500b004077e7a6017mr7197204wmq.11.1698069287086; Mon, 23 Oct 2023 06:54:47 -0700 (PDT) Received: from localhost.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id p7-20020a5d4587000000b0032db430fb9bsm7822371wrq.68.2023.10.23.06.54.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 06:54:46 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Mon, 23 Oct 2023 14:54:46 +0100 Message-Id: <20231023135446.10579-1-naush@raspberrypi.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] pipeline: rpi: vc4: Fix drop frame bug when no ISP streams are configured 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" If no ISP output streams are configured, the ISP output count is skipped for the the low res stream, and causes the drop frame logic to fail because of a count mismatch. This in-turn stops any requests from completing correctly. Fix this by ensuring the low res output is counted correctly when no ISP output streams are configured. Signed-off-by: Naushir Patuck Reviewed-by: Kieran Bingham --- src/libcamera/pipeline/rpi/vc4/vc4.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcamera/pipeline/rpi/vc4/vc4.cpp b/src/libcamera/pipeline/rpi/vc4/vc4.cpp index 616e0bc95021..a5cc4fc11471 100644 --- a/src/libcamera/pipeline/rpi/vc4/vc4.cpp +++ b/src/libcamera/pipeline/rpi/vc4/vc4.cpp @@ -628,7 +628,7 @@ int Vc4CameraData::platformConfigure(const RPi::RPiCameraConfiguration *rpiConfi * \todo If Output 1 format is not YUV420, Output 1 ought to be disabled as * colour denoise will not run. */ - if (outStreams.size() == 1) { + if (outStreams.size() <= 1) { V4L2VideoDevice *dev = isp_[Isp::Output1].dev(); V4L2DeviceFormat output1Format;