From patchwork Sun Oct 16 21:02:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 17610 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 D89BBC3285 for ; Sun, 16 Oct 2022 21:02:31 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7C5EB62DE7; Sun, 16 Oct 2022 23:02:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1665954151; bh=OckelQTzkgbKx/wZd0Zr0lZiOK9Q4QlZf8YQwQa+h7g=; 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=y3GxlR0yWDfP+i8LcgidD69JAEts3PkLLc2AYxHDQm7gd5QtDM1GusPIb0RXNvTYg e3Z4XeBVfzFHWAofdlwghqDfSyyhBhu92XcMNGcxXEoIMrfEFgjVqMrnSbq8obpOIc 7ZvUciw3UoYNXylHcOOHOMThtaSd5YYxCtPE331GHPluAN0gcJb48y290pmyaRFW5X tnDUdDtKD6em/kZAaQzi6n7NIy9QkPgM6qdTOL8X70cYtYrnmwieLmzIb1upHz+lUU uQtuByl0lD8eM1tFaO9cL/TKjdLQq8uFLSTNQE94+P+bTEOFfMO0yw4XgYj+yodeU2 DGxp9MHwXZF0Q== 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 72B2C62DDB for ; Sun, 16 Oct 2022 23:02:29 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="XxluujwB"; dkim-atps=neutral Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A3E69E65; Sun, 16 Oct 2022 23:02:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1665954148; bh=OckelQTzkgbKx/wZd0Zr0lZiOK9Q4QlZf8YQwQa+h7g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XxluujwBzo47OZaOcEIRWlplcndC/PlImMN0l9wUigy+BJgocgBGn2DHXSveLzkBg evsYA7DHw/0bncIXJkImNTP/okXDugjS6HSp1P/kRKI50qZE6VhfzdgSHjjgblu7D6 NPB/UH/oJuEF+qhob2ZFIuS778JCZEjX910Vh60E= To: libcamera-devel@lists.libcamera.org Date: Mon, 17 Oct 2022 00:02:02 +0300 Message-Id: <20221016210202.1107-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221016210202.1107-1-laurent.pinchart@ideasonboard.com> References: <20221016210202.1107-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 2/2] pipeline: rkisp1: Use ScopeExitActions to simplify error handling in start 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: Laurent Pinchart via libcamera-devel From: Laurent Pinchart Reply-To: Laurent Pinchart Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Error handling in the PipelineHandlerRkISP1::start() function is cumbersome. Simplify it using the utils::ScopeExitActions class. Signed-off-by: Laurent Pinchart Reviewed-by: Xavier Roumegue --- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 31 +++++++++--------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 455ee2a0a711..59bc6951cde3 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -823,69 +823,60 @@ int PipelineHandlerRkISP1::freeBuffers(Camera *camera) int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] const ControlList *controls) { RkISP1CameraData *data = cameraData(camera); + utils::ScopeExitActions actions; int ret; /* Allocate buffers for internal pipeline usage. */ ret = allocateBuffers(camera); if (ret) return ret; + actions += [&]() { freeBuffers(camera); }; ret = data->ipa_->start(); if (ret) { - freeBuffers(camera); LOG(RkISP1, Error) << "Failed to start IPA " << camera->id(); return ret; } + actions += [&]() { data->ipa_->stop(); }; data->frame_ = 0; ret = param_->streamOn(); if (ret) { - data->ipa_->stop(); - freeBuffers(camera); LOG(RkISP1, Error) << "Failed to start parameters " << camera->id(); return ret; } + actions += [&]() { param_->streamOff(); }; ret = stat_->streamOn(); if (ret) { - param_->streamOff(); - data->ipa_->stop(); - freeBuffers(camera); LOG(RkISP1, Error) << "Failed to start statistics " << camera->id(); return ret; } + actions += [&]() { stat_->streamOff(); }; if (data->mainPath_->isEnabled()) { ret = mainPath_.start(); - if (ret) { - param_->streamOff(); - stat_->streamOff(); - data->ipa_->stop(); - freeBuffers(camera); + if (ret) return ret; - } + actions += [&]() { mainPath_.stop(); }; } if (hasSelfPath_ && data->selfPath_->isEnabled()) { ret = selfPath_.start(); - if (ret) { - mainPath_.stop(); - param_->streamOff(); - stat_->streamOff(); - data->ipa_->stop(); - freeBuffers(camera); + if (ret) return ret; - } } isp_->setFrameStartEnabled(true); activeCamera_ = camera; - return ret; + + actions.release(); + return 0; } void PipelineHandlerRkISP1::stopDevice(Camera *camera)