Patch Detail
Show a patch.
GET /api/patches/11581/?format=api
{ "id": 11581, "url": "https://patchwork.libcamera.org/api/patches/11581/?format=api", "web_url": "https://patchwork.libcamera.org/patch/11581/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20210316101842.18674-2-jeanmichel.hautbois@ideasonboard.com>", "date": "2021-03-16T10:18:38", "name": "[libcamera-devel,v2,1/2] libcamera: ipu3: Move Imgu configuration to IPU3CameraData", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "cca4dbea04ddac2164dc2cda4a8d807f768e4826", "submitter": { "id": 75, "url": "https://patchwork.libcamera.org/api/people/75/?format=api", "name": "Jean-Michel Hautbois", "email": "jeanmichel.hautbois@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/11581/mbox/", "series": [ { "id": 1793, "url": "https://patchwork.libcamera.org/api/series/1793/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1793", "date": "2021-03-16T10:18:37", "name": "Prepare IPU3 pipeline to pass BDS to IPA", "version": 2, "mbox": "https://patchwork.libcamera.org/series/1793/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/11581/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/11581/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 2ED0ABD80C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 16 Mar 2021 10:18:49 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DF33068D4B;\n\tTue, 16 Mar 2021 11:18:48 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7271468D3D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 16 Mar 2021 11:18:45 +0100 (CET)", "from localhost.localdomain (unknown\n\t[IPv6:2a01:e0a:169:7140:f840:1816:ba68:a009])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 23663D8B;\n\tTue, 16 Mar 2021 11:18:45 +0100 (CET)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"gzUBflEm\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1615889925;\n\tbh=IZA01gZFLG4IskMW8GZO0fqhzhl+H50SlZ3yTkWxgL8=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=gzUBflEmCYs4YBCba+1+25iM/AIhhpn31WeeBM9T38ZLpP9RSHoY7Hvvdj2Eru7N8\n\tQ5d7P9xE0dISq+oT27wfqyJWoN2Nr7I9UGSV0kkyMNhX0z41/8Ua4KE68mBCYKZceg\n\tskncYf8ckZX1+Oq3ky2Sm4I0kGRRT+s5IkY5zcwE=", "From": "Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 16 Mar 2021 11:18:38 +0100", "Message-Id": "<20210316101842.18674-2-jeanmichel.hautbois@ideasonboard.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20210316101842.18674-1-jeanmichel.hautbois@ideasonboard.com>", "References": "<20210316101842.18674-1-jeanmichel.hautbois@ideasonboard.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v2 1/2] libcamera: ipu3: Move Imgu\n\tconfiguration to IPU3CameraData", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "The IPU3 IPA needs to know the BayerDownScaler (BDS) configuration to\ncalculate the statistics grids.\nThis patch makes it possible for PipelineHandlerIPU3::start() to access\nthe BDS configuration and later pass the rectangle to the IPU3 IPA\nconfigure method.\n\nSigned-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>\n---\nv2:\n- move pipe configuration calculation from validate to configure\n- move ipa configuration from start to configure\n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 45 +++++++++++++---------------\n 1 file changed, 20 insertions(+), 25 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 2ea13ec9..3f49ded3 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -97,21 +97,23 @@ public:\n \tStatus validate() override;\n \n \tconst StreamConfiguration &cio2Format() const { return cio2Configuration_; }\n-\tconst ImgUDevice::PipeConfig imguConfig() const { return pipeConfig_; }\n \n \t/* Cache the combinedTransform_ that will be applied to the sensor */\n \tTransform combinedTransform_;\n \n+\t/* Store the pipe configuration */\n+\tImgUDevice::PipeConfig pipeConfig_;\n+\tImgUDevice::Pipe pipe_{};\n+\n private:\n \t/*\n \t * The IPU3CameraData instance is guaranteed to be valid as long as the\n \t * corresponding Camera instance is valid. In order to borrow a\n \t * reference to the camera data, store a new reference to the camera.\n \t */\n-\tconst IPU3CameraData *data_;\n+\tIPU3CameraData *data_;\n \n \tStreamConfiguration cio2Configuration_;\n-\tImgUDevice::PipeConfig pipeConfig_;\n };\n \n class PipelineHandlerIPU3 : public PipelineHandler\n@@ -272,8 +274,7 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \n \tLOG(IPU3, Debug) << \"CIO2 configuration: \" << cio2Configuration_.toString();\n \n-\tImgUDevice::Pipe pipe{};\n-\tpipe.input = cio2Configuration_.size;\n+\tpipe_.input = cio2Configuration_.size;\n \n \t/*\n \t * Adjust the configurations if needed and assign streams while\n@@ -349,15 +350,15 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \t\t\t\tcfg->setStream(const_cast<Stream *>(&data_->outStream_));\n \t\t\t\tmainOutputAvailable = false;\n \n-\t\t\t\tpipe.main = cfg->size;\n+\t\t\t\tpipe_.main = cfg->size;\n \t\t\t\tif (yuvCount == 1)\n-\t\t\t\t\tpipe.viewfinder = pipe.main;\n+\t\t\t\t\tpipe_.viewfinder = pipe_.main;\n \n \t\t\t\tLOG(IPU3, Debug) << \"Assigned \" << cfg->toString()\n \t\t\t\t\t\t << \" to the main output\";\n \t\t\t} else {\n \t\t\t\tcfg->setStream(const_cast<Stream *>(&data_->vfStream_));\n-\t\t\t\tpipe.viewfinder = cfg->size;\n+\t\t\t\tpipe_.viewfinder = cfg->size;\n \n \t\t\t\tLOG(IPU3, Debug) << \"Assigned \" << cfg->toString()\n \t\t\t\t\t\t << \" to the viewfinder output\";\n@@ -373,16 +374,6 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \t\t}\n \t}\n \n-\t/* Only compute the ImgU configuration if a YUV stream has been requested. */\n-\tif (yuvCount) {\n-\t\tpipeConfig_ = data_->imgu_->calculatePipeConfig(&pipe);\n-\t\tif (pipeConfig_.isNull()) {\n-\t\t\tLOG(IPU3, Error) << \"Failed to calculate pipe configuration: \"\n-\t\t\t\t\t << \"unsupported resolutions.\";\n-\t\t\treturn Invalid;\n-\t\t}\n-\t}\n-\n \treturn status;\n }\n \n@@ -576,11 +567,15 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \t * stream has been requested: return here to skip the ImgU configuration\n \t * part.\n \t */\n-\tImgUDevice::PipeConfig imguConfig = config->imguConfig();\n-\tif (imguConfig.isNull())\n+\n+\tconfig->pipeConfig_ = imgu->calculatePipeConfig(&config->pipe_);\n+\tif (config->pipeConfig_.isNull()) {\n+\t\tLOG(IPU3, Error) << \"Failed to calculate pipe configuration: \"\n+\t\t\t\t << \"unsupported resolutions.\";\n \t\treturn 0;\n+\t}\n \n-\tret = imgu->configure(imguConfig, &cio2Format);\n+\tret = imgu->configure(config->pipeConfig_, &cio2Format);\n \tif (ret)\n \t\treturn ret;\n \n@@ -633,6 +628,10 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \t\treturn ret;\n \t}\n \n+\tstd::map<uint32_t, ControlInfoMap> entityControls;\n+\tentityControls.emplace(0, data->cio2_.sensor()->controls());\n+\tdata->ipa_->configure(entityControls, config->pipeConfig_.bds);\n+\n \treturn 0;\n }\n \n@@ -717,7 +716,6 @@ int PipelineHandlerIPU3::freeBuffers(Camera *camera)\n \n int PipelineHandlerIPU3::start(Camera *camera, [[maybe_unused]] const ControlList *controls)\n {\n-\tstd::map<uint32_t, ControlInfoMap> entityControls;\n \tIPU3CameraData *data = cameraData(camera);\n \tCIO2Device *cio2 = &data->cio2_;\n \tImgUDevice *imgu = data->imgu_;\n@@ -744,9 +742,6 @@ int PipelineHandlerIPU3::start(Camera *camera, [[maybe_unused]] const ControlLis\n \tif (ret)\n \t\tgoto error;\n \n-\tentityControls.emplace(0, data->cio2_.sensor()->controls());\n-\tdata->ipa_->configure(entityControls);\n-\n \treturn 0;\n \n error:\n", "prefixes": [ "libcamera-devel", "v2", "1/2" ] }