From patchwork Tue Mar 7 11:48:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 18353 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 C3CADC329C for ; Tue, 7 Mar 2023 11:48:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 24D7F626C4; Tue, 7 Mar 2023 12:48:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1678189704; bh=Js72QCTaA6BDl8LnSR0Hc45/HYXluIjxQWxgDjOpCIE=; 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=BgKtLIZOgX8njUAU7HklsygP3N0eFQutLC6NK81t9e6wkayEIdWQbp3kCqzw77aJ5 U9j8lkljTxlOdhuyC4BtaRCQdlSH83DXEiKmONBKvPxxl0nD5CNqvEuInHd6JiSQEq F56EA5i/D1Ulfs3IfPDEDVWhz+GLALHUEcYRwpt1UurT4pDF2Uakjy/OlOP5qgThze lgC0w6j5hQhr7OPe1XHz+OZE+Jw0JiwGvWboYLz6CRa+QgndZyYL8lK4AU8tD19taq td9Za3BLxc0OHKqby6vSzLsPCmuxWNySHokkUt227Ih+b6hEWesA5QHKhkVq4uvARS UW0z0aT7dP68w== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7BAB1626BB for ; Tue, 7 Mar 2023 12:48:21 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="oPJefkvF"; dkim-atps=neutral Received: from uno.homenet.telecomitalia.it (host-79-47-54-87.retail.telecomitalia.it [79.47.54.87]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 9EAEC4AD; Tue, 7 Mar 2023 12:48:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1678189701; bh=Js72QCTaA6BDl8LnSR0Hc45/HYXluIjxQWxgDjOpCIE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oPJefkvFu3UBXjKCnpTNfljnBuRgcb/lUnP0nslV3Q5RENLDKvHWzuYScnc1hO7N4 HGhZvbb5vMBUt553wSFr6qktxizfPHatvU2ODO1y7g86t8Rmu6L/bbnDb+bixsEHsG a9K7PuVTpoXoPiLwHwVN0gHSMM9dEZGlwfYtbC2s= To: libcamera-devel@lists.libcamera.org Date: Tue, 7 Mar 2023 12:48:03 +0100 Message-Id: <20230307114804.42291-4-jacopo.mondi@ideasonboard.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230307114804.42291-1-jacopo.mondi@ideasonboard.com> References: <20230307114804.42291-1-jacopo.mondi@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 3/4] libcamera: rkisp1: Reserve main path for StillCapture 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: Jacopo Mondi via libcamera-devel From: Jacopo Mondi Reply-To: Jacopo Mondi Cc: Jacopo Mondi , libcamera@luigi311.com Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The main output path can produce images in higher resolution and should be reserved for the StillCapture role when a configuration is generated. Before this change if StillCapture was not requested first it got assigned to the self-path and thus down-scaled to 1920x1920. With this change, StillCapture can be asked last and it would take precedence over other streams for the usage of the main path. $ cam -c1 --stream role=viewfinder --stream role=still Camera camera.cpp:969 streams configuration: (0) 1920x1080-NV12 (1) 4208x3120-NV12 Signed-off-by: Jacopo Mondi Reviewed-by: Paul Elder Reviewed-by: Kieran Bingham --- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 60ab7380034c..cd92e99a50b3 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -643,6 +643,10 @@ PipelineHandlerRkISP1::generateConfiguration(Camera *camera, if (roles.empty()) return config; + /* If still capture is requested, reserve the main path for it. */ + bool reserveMainPath = std::find(roles.cbegin(), roles.cend(), + StreamRole::StillCapture) != roles.cend(); + /* * As the ISP can't output different color spaces for the main and self * path, pick a sensible default color space based on the role of the @@ -661,6 +665,9 @@ PipelineHandlerRkISP1::generateConfiguration(Camera *camera, if (!colorSpace) colorSpace = ColorSpace::Sycc; + /* Unlock usage of main path which was reserved. */ + reserveMainPath = false; + size = data->sensor_->resolution(); break; @@ -702,7 +709,7 @@ PipelineHandlerRkISP1::generateConfiguration(Camera *camera, RkISP1Path *path; - if (useMainPath) { + if (useMainPath && !reserveMainPath) { path = data->mainPath_; mainPathAvailable = false; } else {