From patchwork Tue Mar 9 14:44:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marian Cichy X-Patchwork-Id: 11540 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 406CFBD80C for ; Tue, 9 Mar 2021 14:45:02 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C01DE68A9C; Tue, 9 Mar 2021 15:45:01 +0100 (CET) Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 591F468A99 for ; Tue, 9 Mar 2021 15:45:00 +0100 (CET) Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lJdbX-00022z-Oa; Tue, 09 Mar 2021 15:44:59 +0100 Received: from mci by dude02.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1lJdbX-00009P-Dn; Tue, 09 Mar 2021 15:44:59 +0100 From: Marian Cichy To: libcamera-devel@lists.libcamera.org Date: Tue, 9 Mar 2021 15:44:57 +0100 Message-Id: <20210309144457.32412-1-m.cichy@pengutronix.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::28 X-SA-Exim-Mail-From: mci@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: libcamera-devel@lists.libcamera.org Subject: [libcamera-devel] [PATCH] libcamera: v4l2_subdevice: Fix formats() returning only sizes for last mbus code 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: , Cc: graphics@pengutronix.de, Marian Cichy Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" V4L2Subdevice::formats() wants to enumerate all media bus codes and frame sizes on a pad, however, the current implementation always overwrites the SizeRange of the last mbus code, effectively returning only this SizeRange. This can be even fatal, as camera_sensor is using this function to enumerate all codes and sizes. If the last mbus code has no SizeRange for whatever reason, the camera_sensor will error out, claiming that it didn't found any image formats at all. Signed-off-by: Marian Cichy --- src/libcamera/v4l2_subdevice.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp index 9af1c0ab..37bafb9b 100644 --- a/src/libcamera/v4l2_subdevice.cpp +++ b/src/libcamera/v4l2_subdevice.cpp @@ -354,10 +354,10 @@ V4L2Subdevice::Formats V4L2Subdevice::formats(unsigned int pad) return {}; } + std::vector sizes = {}; for (unsigned int code : enumPadCodes(pad)) { - std::vector sizes = enumPadSizes(pad, code); - if (sizes.empty()) - return {}; + std::vector codeSizeRange = enumPadSizes(pad, code); + sizes.insert(sizes.end(), codeSizeRange.begin(), codeSizeRange.end()); const auto inserted = formats.insert({ code, sizes }); if (!inserted.second) {