From patchwork Tue Oct 4 02:18:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 17522 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 6A4E2C327C for ; Tue, 4 Oct 2022 02:18:50 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B260860A83; Tue, 4 Oct 2022 04:18:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1664849929; bh=57uD8ABTeHqCUB1yX5Da460OcM4Bc+iWhUsCaW+Hkfs=; 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=W99JEyMqsmlGK/xDPQV0Om2l+GwHHqBOt3cHIcKnQaQ2TdcEYGHlQsB7Al82jPloK xfnvUyUWua9BoCd/ukRYRwRmRXFGd0ZjafDRcLh4+7SL/yFe9/ovP5Hj+a1Lar2gWu Nq0Yq2lWMnZRR11epdT23o9IPSMuB8aIl963o3GVlZJwB54A2HyZ0U0vcvATF8HYNv krGbU6/Oj4f1MdQns/DdTxEMduLsfXAPwM+WVlBcfMoGtM6q42K4FQZFctCRRSZoRK h8NCo1kAxBzHD1LzNTrAMMQYjxycpXD5tHCmaX68GG3fYRT7oSzcaliak1i1UvYBjT MjwuNPDf3Hlkg== 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 A00B3603F6 for ; Tue, 4 Oct 2022 04:18:48 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="XWNlLP/7"; 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 256769DE; Tue, 4 Oct 2022 04:18:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1664849928; bh=57uD8ABTeHqCUB1yX5Da460OcM4Bc+iWhUsCaW+Hkfs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XWNlLP/7qTwuPBc5tHGCYoczB/PqYUuszR8dWUr/D2c03tUSIjqgmGaATg5LLNmme a5ktsBw7yXX8X4HnHBATyW6zJDHOC4sgOny5rLntmpSxjLbJ7Y0BqS2NlTPCXwtteG EEdSlBpEBa+NQKu2hgObLBRLcBqyR5hvPxhz7trE= To: libcamera-devel@lists.libcamera.org Date: Tue, 4 Oct 2022 05:18:42 +0300 Message-Id: <20221004021842.6345-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221004021842.6345-1-laurent.pinchart@ideasonboard.com> References: <20221004021842.6345-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/2] pipeline: rkisp1: Use utils::Cleaner 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::Cleaner class. Signed-off-by: Laurent Pinchart Reviewed-by: Xavier Roumegue Reviewed-by: Paul Elder --- 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..33f3b0c5ab00 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::Cleaner cleaner; int ret; /* Allocate buffers for internal pipeline usage. */ ret = allocateBuffers(camera); if (ret) return ret; + cleaner.defer([&]() { freeBuffers(camera); }); ret = data->ipa_->start(); if (ret) { - freeBuffers(camera); LOG(RkISP1, Error) << "Failed to start IPA " << camera->id(); return ret; } + cleaner.defer([&]() { 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; } + cleaner.defer([&]() { 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; } + cleaner.defer([&]() { stat_->streamOff(); }); if (data->mainPath_->isEnabled()) { ret = mainPath_.start(); - if (ret) { - param_->streamOff(); - stat_->streamOff(); - data->ipa_->stop(); - freeBuffers(camera); + if (ret) return ret; - } + cleaner.defer([&]() { 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; + + cleaner.clear(); + return 0; } void PipelineHandlerRkISP1::stopDevice(Camera *camera)