{"id":3340,"url":"https://patchwork.libcamera.org/api/patches/3340/?format=json","web_url":"https://patchwork.libcamera.org/patch/3340/","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":"<20200326160819.4088361-6-niklas.soderlund@ragnatech.se>","date":"2020-03-26T16:08:17","name":"[libcamera-devel,RFCv2,5/7] libcamera: pipeline: rkisp1: Call IPA start() and stop()","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"1b5b42a517da0f1f87890cf3bb98f474749c1da1","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3340/mbox/","series":[{"id":783,"url":"https://patchwork.libcamera.org/api/series/783/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=783","date":"2020-03-26T16:08:12","name":"libcamera: ipa_manager: Proxy open-source IPAs to a thread","version":1,"mbox":"https://patchwork.libcamera.org/series/783/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3340/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3340/checks/","tags":{},"headers":{"Return-Path":"","Received":["from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AC26962D29\n\tfor ;\n\tThu, 26 Mar 2020 17:10:34 +0100 (CET)","from bismarck.berto.se (p4fca2392.dip0.t-ipconnect.de\n\t[79.202.35.146]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA\n\tid 4d7f1db1-6f7c-11ea-89d0-0050569116f7;\n\tThu, 26 Mar 2020 17:10:25 +0100 (CET)"],"X-Halon-ID":"4d7f1db1-6f7c-11ea-89d0-0050569116f7","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 26 Mar 2020 17:08:17 +0100","Message-Id":"<20200326160819.4088361-6-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20200326160819.4088361-1-niklas.soderlund@ragnatech.se>","References":"<20200326160819.4088361-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [RFCv2 5/7] libcamera: pipeline: rkisp1: Call IPA\n\tstart() and stop()","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","X-List-Received-Date":"Thu, 26 Mar 2020 16:10:36 -0000"},"content":"Call the IPA start()/stop() functions before/after the camera is\nstarted. This makes sure the IPA functions properly once thread\nmanagement is moved into the start/stop interface.\n\nSigned-off-by: Niklas Söderlund \n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 24 ++++++++++++++++++++++--\n 1 file changed, 22 insertions(+), 2 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex f49b3a7f0945ac92..3287fd3a18204cbc 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -113,8 +113,8 @@ class RkISP1CameraData : public CameraData\n {\n public:\n \tRkISP1CameraData(PipelineHandler *pipe)\n-\t\t: CameraData(pipe), sensor_(nullptr), frame_(0),\n-\t\t frameInfo_(pipe)\n+\t\t: CameraData(pipe), running_(false), sensor_(nullptr),\n+\t\t frame_(0), frameInfo_(pipe)\n \t{\n \t}\n \n@@ -125,6 +125,7 @@ public:\n \n \tint loadIPA();\n \n+\tbool running_;\n \tStream stream_;\n \tCameraSensor *sensor_;\n \tunsigned int frame_;\n@@ -394,6 +395,9 @@ int RkISP1CameraData::loadIPA()\n void RkISP1CameraData::queueFrameAction(unsigned int frame,\n \t\t\t\t\tconst IPAOperationData &action)\n {\n+\tif (!running_)\n+\t\treturn;\n+\n \tswitch (action.operation) {\n \tcase RKISP1_IPA_ACTION_V4L2_SET: {\n \t\tconst ControlList &controls = action.controls[0];\n@@ -764,10 +768,19 @@ int PipelineHandlerRkISP1::start(Camera *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->name();\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->name();\n@@ -777,6 +790,7 @@ int PipelineHandlerRkISP1::start(Camera *camera)\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->name();\n@@ -787,12 +801,14 @@ int PipelineHandlerRkISP1::start(Camera *camera)\n \tif (ret) {\n \t\tparam_->streamOff();\n \t\tstat_->streamOff();\n+\t\tdata->ipa_->stop();\n \t\tfreeBuffers(camera);\n \n \t\tLOG(RkISP1, Error)\n \t\t\t<< \"Failed to start camera \" << camera->name();\n \t}\n \n+\tdata->running_ = true;\n \tactiveCamera_ = camera;\n \n \t/* Inform IPA of stream configuration and sensor controls. */\n@@ -830,6 +846,10 @@ void PipelineHandlerRkISP1::stop(Camera *camera)\n \t\tLOG(RkISP1, Warning)\n \t\t\t<< \"Failed to stop parameters \" << camera->name();\n \n+\tdata->running_ = false;\n+\n+\tdata->ipa_->stop();\n+\n \tdata->timeline_.reset();\n \n \tfreeBuffers(camera);\n","prefixes":["libcamera-devel","RFCv2","5/7"]}