{"id":9820,"url":"https://patchwork.libcamera.org/api/patches/9820/?format=json","web_url":"https://patchwork.libcamera.org/patch/9820/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200925014207.1455796-23-niklas.soderlund@ragnatech.se>","date":"2020-09-25T01:42:07","name":"[libcamera-devel,v3,22/22] libcamera: pipeline: rkisp1: Use cleanup error paths for start()","commit_ref":null,"pull_url":null,"state":"rejected","archived":false,"hash":"c2ab1c1d3ef1a7e743f9044c2fb5e157c0eeabe5","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":{"id":16,"url":"https://patchwork.libcamera.org/api/users/16/?format=json","username":"neg","first_name":"Niklas","last_name":"Söderlund","email":"niklas.soderlund@ragnatech.se"},"mbox":"https://patchwork.libcamera.org/patch/9820/mbox/","series":[{"id":1325,"url":"https://patchwork.libcamera.org/api/series/1325/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1325","date":"2020-09-25T01:41:45","name":"libcamera: pipeline: rkisp1: Extend to support two streams","version":3,"mbox":"https://patchwork.libcamera.org/series/1325/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9820/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9820/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 77DF8C3B5F\n\tfor ;\n\tFri, 25 Sep 2020 01:43:04 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1CA6463019;\n\tFri, 25 Sep 2020 03:43:04 +0200 (CEST)","from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6072063034\n\tfor ;\n\tFri, 25 Sep 2020 03:42:58 +0200 (CEST)","from bismarck.berto.se (p54ac52a8.dip0.t-ipconnect.de\n\t[84.172.82.168]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid 6fca2bdb-fed0-11ea-92dc-005056917a89;\n\tFri, 25 Sep 2020 03:42:57 +0200 (CEST)"],"X-Halon-ID":"6fca2bdb-fed0-11ea-92dc-005056917a89","Authorized-sender":"niklas.soderlund@fsdn.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 25 Sep 2020 03:42:07 +0200","Message-Id":"<20200925014207.1455796-23-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20200925014207.1455796-1-niklas.soderlund@ragnatech.se>","References":"<20200925014207.1455796-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 22/22] libcamera: pipeline: rkisp1: Use\n\tcleanup error paths for start()","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Use a lambda function to make the error paths a bit cleaner in start(),\nno functional change.\n\nSigned-off-by: Niklas Söderlund \n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 98 ++++++++++++------------\n 1 file changed, 51 insertions(+), 47 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex c6c2e3aa3dc6d0dc..34196af3057b14bb 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -827,58 +827,62 @@ int PipelineHandlerRkISP1::start(Camera *camera)\n \tRkISP1CameraData *data = cameraData(camera);\n \tint ret;\n \n-\t/* Allocate buffers for internal pipeline usage. */\n-\tret = allocateBuffers(camera);\n-\tif (ret)\n-\t\treturn ret;\n-\n-\tret = data->ipa_->start();\n-\tif (ret) {\n-\t\tfreeBuffers(camera);\n-\t\tLOG(RkISP1, Error)\n-\t\t\t<< \"Failed to start IPA \" << camera->id();\n-\t\treturn ret;\n-\t}\n-\n-\tdata->frame_ = 0;\n-\n-\tret = param_->streamOn();\n-\tif (ret) {\n-\t\tdata->ipa_->stop();\n-\t\tfreeBuffers(camera);\n-\t\tLOG(RkISP1, Error)\n-\t\t\t<< \"Failed to start parameters \" << camera->id();\n-\t\treturn ret;\n-\t}\n-\n-\tret = stat_->streamOn();\n-\tif (ret) {\n-\t\tparam_->streamOff();\n-\t\tdata->ipa_->stop();\n-\t\tfreeBuffers(camera);\n-\t\tLOG(RkISP1, Error)\n-\t\t\t<< \"Failed to start statistics \" << camera->id();\n-\t\treturn ret;\n-\t}\n-\n-\tret = mainPath_.start();\n-\tif (ret) {\n-\t\tparam_->streamOff();\n-\t\tstat_->streamOff();\n-\t\tdata->ipa_->stop();\n-\t\tfreeBuffers(camera);\n-\t\treturn ret;\n-\t}\n-\n-\tret = selfPath_.start();\n-\tif (ret) {\n+\tauto startDevices = [this](Camera *camera, RkISP1CameraData *data) {\n+\t\tint ret;\n+\n+\t\t/* Allocate buffers for internal pipeline usage. */\n+\t\tret = allocateBuffers(camera);\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\n+\t\tret = data->ipa_->start();\n+\t\tif (ret) {\n+\t\t\tLOG(RkISP1, Error)\n+\t\t\t\t<< \"Failed to start IPA \" << camera->id();\n+\t\t\tgoto err_allocate;\n+\t\t}\n+\n+\t\tdata->frame_ = 0;\n+\n+\t\tret = param_->streamOn();\n+\t\tif (ret) {\n+\t\t\tLOG(RkISP1, Error)\n+\t\t\t\t<< \"Failed to start parameters \" << camera->id();\n+\t\t\tgoto err_ipa;\n+\t\t}\n+\n+\t\tret = stat_->streamOn();\n+\t\tif (ret) {\n+\t\t\tLOG(RkISP1, Error)\n+\t\t\t\t<< \"Failed to start statistics \" << camera->id();\n+\t\t\tgoto err_param;\n+\t\t}\n+\n+\t\tret = mainPath_.start();\n+\t\tif (ret)\n+\t\t\tgoto err_stat;\n+\n+\t\tret = selfPath_.start();\n+\t\tif (ret)\n+\t\t\tgoto err_main;\n+\n+\t\treturn 0;\n+\terr_main:\n \t\tmainPath_.stop();\n-\t\tparam_->streamOff();\n+\terr_stat:\n \t\tstat_->streamOff();\n+\terr_param:\n+\t\tparam_->streamOff();\n+\terr_ipa:\n \t\tdata->ipa_->stop();\n+\terr_allocate:\n \t\tfreeBuffers(camera);\n \t\treturn ret;\n-\t}\n+\t};\n+\n+\tret = startDevices(camera, data);\n+\tif (ret)\n+\t\treturn ret;\n \n \tactiveCamera_ = camera;\n \n","prefixes":["libcamera-devel","v3","22/22"]}