{"id":11268,"url":"https://patchwork.libcamera.org/api/1.1/patches/11268/?format=json","web_url":"https://patchwork.libcamera.org/patch/11268/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20210212190557.13905-1-dafna.hirschfeld@collabora.com>","date":"2021-02-12T19:05:57","name":"[libcamera-devel] libcamera: pipeline: rkisp1: configure IPA from configure method instead of start method","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"eda6182ebefe62b3f839caa10d5314f489f8814d","submitter":{"id":46,"url":"https://patchwork.libcamera.org/api/1.1/people/46/?format=json","name":"Dafna Hirschfeld","email":"dafna.hirschfeld@collabora.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/11268/mbox/","series":[{"id":1686,"url":"https://patchwork.libcamera.org/api/1.1/series/1686/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1686","date":"2021-02-12T19:05:57","name":"[libcamera-devel] libcamera: pipeline: rkisp1: configure IPA from configure method instead of start method","version":1,"mbox":"https://patchwork.libcamera.org/series/1686/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11268/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11268/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 64BE8BD162\n\tfor ;\n\tFri, 12 Feb 2021 19:06:15 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C0AFF6379C;\n\tFri, 12 Feb 2021 20:06:14 +0100 (CET)","from bhuna.collabora.co.uk (bhuna.collabora.co.uk\n\t[IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B10B163794\n\tfor ;\n\tFri, 12 Feb 2021 20:06:13 +0100 (CET)","from guri.fritz.box\n\t(p200300c7cf1cce00ddb3fb9d3f058872.dip0.t-ipconnect.de\n\t[IPv6:2003:c7:cf1c:ce00:ddb3:fb9d:3f05:8872])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128\n\tbits))\n\t(No client certificate requested) (Authenticated sender: dafna)\n\tby bhuna.collabora.co.uk (Postfix) with ESMTPSA id 1B9431F4642D;\n\tFri, 12 Feb 2021 19:06:13 +0000 (GMT)"],"From":"Dafna Hirschfeld ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 12 Feb 2021 20:05:57 +0100","Message-Id":"<20210212190557.13905-1-dafna.hirschfeld@collabora.com>","X-Mailer":"git-send-email 2.17.1","Subject":"[libcamera-devel] [PATCH] libcamera: pipeline: rkisp1: configure\n\tIPA from configure method instead of start method","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","Cc":"kernel@collabora.com","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Currently the call to the configure method of rkisp1 IPA\nis called upon the 'start' of the pipeline. This should be done\nin the 'configure' method instead.\n\nSigned-off-by: Dafna Hirschfeld \n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 63 ++++++++++++------------\n 1 file changed, 31 insertions(+), 32 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex e85979a7..f15efa9f 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -607,11 +607,24 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n \t\t<< \"ISP output pad configured with \" << format.toString()\n \t\t<< \" crop \" << rect.toString();\n \n+\tstd::map streamConfig;\n+\n \tfor (const StreamConfiguration &cfg : *config) {\n-\t\tif (cfg.stream() == &data->mainPathStream_)\n+\t\tif (cfg.stream() == &data->mainPathStream_) {\n \t\t\tret = mainPath_.configure(cfg, format);\n-\t\telse\n+\t\t\tif (data->mainPath_->isEnabled())\n+\t\t\t\tstreamConfig[0] = {\n+\t\t\t\t\t.pixelFormat = cfg.pixelFormat,\n+\t\t\t\t\t.size = cfg.size,\n+\t\t\t\t};\n+\t\t} else {\n \t\t\tret = selfPath_.configure(cfg, format);\n+\t\t\tif (data->selfPath_->isEnabled())\n+\t\t\t\tstreamConfig[1] = {\n+\t\t\t\t\t.pixelFormat = cfg.pixelFormat,\n+\t\t\t\t\t.size = cfg.size,\n+\t\t\t\t};\n+\t\t}\n \n \t\tif (ret)\n \t\t\treturn ret;\n@@ -629,6 +642,22 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n \tif (ret)\n \t\treturn ret;\n \n+\t/* Inform IPA of stream configuration and sensor controls. */\n+\tCameraSensorInfo sensorInfo = {};\n+\tret = data->sensor_->sensorInfo(&sensorInfo);\n+\tif (ret) {\n+\t\t/* \\todo Turn this in an hard failure. */\n+\t\tLOG(RkISP1, Warning) << \"Camera sensor information not available\";\n+\t\tsensorInfo = {};\n+\t\tret = 0;\n+\t}\n+\n+\tstd::map entityControls;\n+\tentityControls.emplace(0, data->sensor_->controls());\n+\n+\tIPAOperationData ipaConfig;\n+\tdata->ipa_->configure(sensorInfo, streamConfig, entityControls, ipaConfig, nullptr);\n+\n \treturn 0;\n }\n \n@@ -759,8 +788,6 @@ int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] ControlList *c\n \t\treturn ret;\n \t}\n \n-\tstd::map streamConfig;\n-\n \tif (data->mainPath_->isEnabled()) {\n \t\tret = mainPath_.start();\n \t\tif (ret) {\n@@ -770,11 +797,6 @@ int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] ControlList *c\n \t\t\tfreeBuffers(camera);\n \t\t\treturn ret;\n \t\t}\n-\n-\t\tstreamConfig[0] = {\n-\t\t\t.pixelFormat = data->mainPathStream_.configuration().pixelFormat,\n-\t\t\t.size = data->mainPathStream_.configuration().size,\n-\t\t};\n \t}\n \n \tif (data->selfPath_->isEnabled()) {\n@@ -787,34 +809,11 @@ int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] ControlList *c\n \t\t\tfreeBuffers(camera);\n \t\t\treturn ret;\n \t\t}\n-\n-\t\tstreamConfig[1] = {\n-\t\t\t.pixelFormat = data->selfPathStream_.configuration().pixelFormat,\n-\t\t\t.size = data->selfPathStream_.configuration().size,\n-\t\t};\n \t}\n \n \tisp_->setFrameStartEnabled(true);\n \n \tactiveCamera_ = camera;\n-\n-\t/* Inform IPA of stream configuration and sensor controls. */\n-\tCameraSensorInfo sensorInfo = {};\n-\tret = data->sensor_->sensorInfo(&sensorInfo);\n-\tif (ret) {\n-\t\t/* \\todo Turn this in an hard failure. */\n-\t\tLOG(RkISP1, Warning) << \"Camera sensor information not available\";\n-\t\tsensorInfo = {};\n-\t\tret = 0;\n-\t}\n-\n-\tstd::map entityControls;\n-\tentityControls.emplace(0, data->sensor_->controls());\n-\n-\tIPAOperationData ipaConfig;\n-\tdata->ipa_->configure(sensorInfo, streamConfig, entityControls,\n-\t\t\t ipaConfig, nullptr);\n-\n \treturn ret;\n }\n \n","prefixes":["libcamera-devel"]}