Patch Detail
Show a patch.
GET /api/patches/11093/?format=api
{ "id": 11093, "url": "https://patchwork.libcamera.org/api/patches/11093/?format=api", "web_url": "https://patchwork.libcamera.org/patch/11093/", "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": "<20210131224702.8838-15-laurent.pinchart@ideasonboard.com>", "date": "2021-01-31T22:46:56", "name": "[libcamera-devel,14/20] libcamera: pipeline: simple: Cache pipeline config in SimpleCameraConfiguration", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "f059d3421e9fa325a1e6ff817dcbb51a1b542406", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": { "id": 14, "url": "https://patchwork.libcamera.org/api/users/14/?format=api", "username": "pinchartl", "first_name": "Laurent", "last_name": "Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "mbox": "https://patchwork.libcamera.org/patch/11093/mbox/", "series": [ { "id": 1633, "url": "https://patchwork.libcamera.org/api/series/1633/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1633", "date": "2021-01-31T22:46:42", "name": "[libcamera-devel,01/20] libcamera: pipeline: simple: Manage converter with std::unique_ptr<>", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1633/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/11093/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/11093/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 933ABBD808\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSun, 31 Jan 2021 22:47:43 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5FA6F683D9;\n\tSun, 31 Jan 2021 23:47:43 +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 8B138683E3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 31 Jan 2021 23:47:33 +0100 (CET)", "from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 184EB182D; \n\tSun, 31 Jan 2021 23:47:33 +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=\"eEdTs/Dq\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1612133253;\n\tbh=jigumEo2DE/9bxKJVy7h3VHqG3W5V3REGWObfLeKwMg=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=eEdTs/Dq9pMvoA8xZ1MTqFdhJ+0lsUsooYdEfdISLnvQ6cGCzp25GkKpJ0EQJYkZ1\n\tzPq7S+icEMkd6L5CICOAUoQOh4a6IZm/QFhITchcb9TCZG/WVRL8IVrpU7vq4r1SlO\n\tqsFyVTeB+00OxSBfssUQEG28kD7WevGONGV9mRU0=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 1 Feb 2021 00:46:56 +0200", "Message-Id": "<20210131224702.8838-15-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.28.0", "In-Reply-To": "<20210131224702.8838-1-laurent.pinchart@ideasonboard.com>", "References": "<20210131224702.8838-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH 14/20] libcamera: pipeline: simple: Cache\n\tpipeline config in SimpleCameraConfiguration", "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>", "Cc": "Phi-Bang Nguyen <pnguyen@baylibre.com>", "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": "As the pipeline configuration is selected in\nSimpleCameraConfiguration::validate() already, cache it in the\nSimpleCameraConfiguration instead of looking it up in\nSimplePipelineHandler::configure(). This makes little difference at the\nmoment, but will save duplication of more complex logic between\nvalidate() and configure() when adding support for multiple streams.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/libcamera/pipeline/simple/simple.cpp | 38 +++++++++++++-----------\n 1 file changed, 21 insertions(+), 17 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 72a18cc0b97f..c44fa9ee28ed 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -177,6 +177,11 @@ public:\n \n \tStatus validate() override;\n \n+\tconst SimpleCameraData::Configuration *pipeConfig() const\n+\t{\n+\t\treturn pipeConfig_;\n+\t}\n+\n \tbool needConversion() const { return needConversion_; }\n \n private:\n@@ -188,6 +193,7 @@ private:\n \tstd::shared_ptr<Camera> camera_;\n \tconst SimpleCameraData *data_;\n \n+\tconst SimpleCameraData::Configuration *pipeConfig_;\n \tbool needConversion_;\n };\n \n@@ -506,7 +512,7 @@ int SimpleCameraData::setupFormats(V4L2SubdeviceFormat *format,\n SimpleCameraConfiguration::SimpleCameraConfiguration(Camera *camera,\n \t\t\t\t\t\t SimpleCameraData *data)\n \t: CameraConfiguration(), camera_(camera->shared_from_this()),\n-\t data_(data)\n+\t data_(data), pipeConfig_(nullptr)\n {\n }\n \n@@ -542,17 +548,17 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()\n \t\tstatus = Adjusted;\n \t}\n \n-\tconst SimpleCameraData::Configuration &pipeConfig = it->second;\n-\tif (!pipeConfig.outputSizes.contains(cfg.size)) {\n+\tpipeConfig_ = &it->second;\n+\tif (!pipeConfig_->outputSizes.contains(cfg.size)) {\n \t\tLOG(SimplePipeline, Debug)\n \t\t\t<< \"Adjusting size from \" << cfg.size.toString()\n-\t\t\t<< \" to \" << pipeConfig.captureSize.toString();\n-\t\tcfg.size = pipeConfig.captureSize;\n+\t\t\t<< \" to \" << pipeConfig_->captureSize.toString();\n+\t\tcfg.size = pipeConfig_->captureSize;\n \t\tstatus = Adjusted;\n \t}\n \n-\tneedConversion_ = cfg.pixelFormat != pipeConfig.captureFormat\n-\t\t\t|| cfg.size != pipeConfig.captureSize;\n+\tneedConversion_ = cfg.pixelFormat != pipeConfig_->captureFormat\n+\t\t\t|| cfg.size != pipeConfig_->captureSize;\n \n \tcfg.bufferCount = 3;\n \n@@ -646,21 +652,19 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n \tif (ret < 0)\n \t\treturn ret;\n \n-\tconst SimpleCameraData::Configuration &pipeConfig =\n-\t\tdata->formats_[cfg.pixelFormat];\n-\n-\tV4L2SubdeviceFormat format{ pipeConfig.code, data->sensor_->resolution() };\n+\tconst SimpleCameraData::Configuration *pipeConfig = config->pipeConfig();\n+\tV4L2SubdeviceFormat format{ pipeConfig->code, data->sensor_->resolution() };\n \n \tret = data->setupFormats(&format, V4L2Subdevice::ActiveFormat);\n \tif (ret < 0)\n \t\treturn ret;\n \n \t/* Configure the video node. */\n-\tV4L2PixelFormat videoFormat = video->toV4L2PixelFormat(pipeConfig.captureFormat);\n+\tV4L2PixelFormat videoFormat = video->toV4L2PixelFormat(pipeConfig->captureFormat);\n \n \tV4L2DeviceFormat captureFormat;\n \tcaptureFormat.fourcc = videoFormat;\n-\tcaptureFormat.size = pipeConfig.captureSize;\n+\tcaptureFormat.size = pipeConfig->captureSize;\n \n \tret = video->setFormat(&captureFormat);\n \tif (ret)\n@@ -673,10 +677,10 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n \t}\n \n \tif (captureFormat.fourcc != videoFormat ||\n-\t captureFormat.size != pipeConfig.captureSize) {\n+\t captureFormat.size != pipeConfig->captureSize) {\n \t\tLOG(SimplePipeline, Error)\n \t\t\t<< \"Unable to configure capture in \"\n-\t\t\t<< pipeConfig.captureSize.toString() << \"-\"\n+\t\t\t<< pipeConfig->captureSize.toString() << \"-\"\n \t\t\t<< videoFormat.toString();\n \t\treturn -EINVAL;\n \t}\n@@ -686,8 +690,8 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n \n \tif (useConverter_) {\n \t\tStreamConfiguration inputCfg;\n-\t\tinputCfg.pixelFormat = pipeConfig.captureFormat;\n-\t\tinputCfg.size = pipeConfig.captureSize;\n+\t\tinputCfg.pixelFormat = pipeConfig->captureFormat;\n+\t\tinputCfg.size = pipeConfig->captureSize;\n \t\tinputCfg.stride = captureFormat.planes[0].bpl;\n \t\tinputCfg.bufferCount = cfg.bufferCount;\n \n", "prefixes": [ "libcamera-devel", "14/20" ] }