Patch Detail
Show a patch.
GET /api/patches/11094/?format=api
{ "id": 11094, "url": "https://patchwork.libcamera.org/api/patches/11094/?format=api", "web_url": "https://patchwork.libcamera.org/patch/11094/", "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-16-laurent.pinchart@ideasonboard.com>", "date": "2021-01-31T22:46:57", "name": "[libcamera-devel,15/20] libcamera: pipeline: simple: Add output formats to Configuration", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b7d09f01a4cb88b54fdae98ecbb923878614f73c", "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/11094/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/11094/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/11094/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 166A7BD808\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSun, 31 Jan 2021 22:47:44 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D4FC9683E5;\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 01794683F7\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 31 Jan 2021 23:47:34 +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 7F2481830; \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=\"t5fF9UbN\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1612133253;\n\tbh=2SAvivIhcxfowTyvt/rn9nFkZARojyA8NX8axkOSUWg=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=t5fF9UbNbvKlKn6pbSaB+rt3CBEN4I4Mmypz8ZbYG7OCYAZsSXLb6YGr5lDpKLNck\n\taYBRpHvlB0H3eRLXH6Qu3gUcMoYmr6Bfpy7weLAzy97EDA/LrRTlGwc49fZSyVQ34T\n\tbX5W1vDN63qOIXHa0q+gvTiSxtJijBrrpJeM0Ezk=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 1 Feb 2021 00:46:57 +0200", "Message-Id": "<20210131224702.8838-16-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 15/20] libcamera: pipeline: simple: Add\n\toutput formats to Configuration", "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": "Store the list of converter output formats in the Configuration\nstructure, to be used to implement multi-stream support. As the\nConfiguration structure grows bigger, avoid duplicating it in the\nformats_ map for each supported pixel format by storing it in a configs_\nvector instead, and storing pointers only in the map.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/libcamera/pipeline/simple/simple.cpp | 40 ++++++++++++++----------\n 1 file changed, 23 insertions(+), 17 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex c44fa9ee28ed..6a8253101a61 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -159,6 +159,7 @@ public:\n \t\tuint32_t code;\n \t\tPixelFormat captureFormat;\n \t\tSize captureSize;\n+\t\tstd::vector<PixelFormat> outputFormats;\n \t\tSizeRange outputSizes;\n \t};\n \n@@ -167,7 +168,8 @@ public:\n \tstd::list<Entity> entities_;\n \tV4L2VideoDevice *video_;\n \n-\tstd::map<PixelFormat, Configuration> formats_;\n+\tstd::vector<Configuration> configs_;\n+\tstd::map<PixelFormat, const Configuration *> formats_;\n };\n \n class SimpleCameraConfiguration : public CameraConfiguration\n@@ -371,13 +373,6 @@ int SimpleCameraData::init()\n \t\t\t\t })\n \t\t\t<< \" ]\";\n \n-\t\t/*\n-\t\t * Store the configuration in the formats_ map, mapping the\n-\t\t * PixelFormat to the corresponding configuration. Any\n-\t\t * previously stored value is overwritten, as the pipeline\n-\t\t * handler currently doesn't care about how a particular\n-\t\t * PixelFormat is achieved.\n-\t\t */\n \t\tfor (const auto &videoFormat : videoFormats) {\n \t\t\tPixelFormat pixelFormat = videoFormat.first.toPixelFormat();\n \t\t\tif (!pixelFormat)\n@@ -389,23 +384,34 @@ int SimpleCameraData::init()\n \t\t\tconfig.captureSize = format.size;\n \n \t\t\tif (!converter) {\n+\t\t\t\tconfig.outputFormats = { pixelFormat };\n \t\t\t\tconfig.outputSizes = config.captureSize;\n-\t\t\t\tformats_[pixelFormat] = config;\n-\t\t\t\tcontinue;\n+\t\t\t} else {\n+\t\t\t\tconfig.outputFormats = converter->formats(pixelFormat);\n+\t\t\t\tconfig.outputSizes = converter->sizes(format.size);\n \t\t\t}\n \n-\t\t\tconfig.outputSizes = converter->sizes(format.size);\n-\n-\t\t\tfor (PixelFormat fmt : converter->formats(pixelFormat))\n-\t\t\t\tformats_[fmt] = config;\n+\t\t\tconfigs_.push_back(config);\n \t\t}\n \t}\n \n-\tif (formats_.empty()) {\n+\tif (configs_.empty()) {\n \t\tLOG(SimplePipeline, Error) << \"No valid configuration found\";\n \t\treturn -EINVAL;\n \t}\n \n+\t/*\n+\t * Map the pixel formats to configurations. Any previously stored value\n+\t * is overwritten, as the pipeline handler currently doesn't care about\n+\t * how a particular PixelFormat is achieved.\n+\t */\n+\tfor (const Configuration &config : configs_) {\n+\t\tformats_[config.captureFormat] = &config;\n+\n+\t\tfor (PixelFormat fmt : config.outputFormats)\n+\t\t\tformats_[fmt] = &config;\n+\t}\n+\n \tproperties_ = sensor_->properties();\n \n \treturn 0;\n@@ -548,7 +554,7 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()\n \t\tstatus = Adjusted;\n \t}\n \n-\tpipeConfig_ = &it->second;\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@@ -614,7 +620,7 @@ CameraConfiguration *SimplePipelineHandler::generateConfiguration(Camera *camera\n \t\t std::inserter(formats, formats.end()),\n \t\t [](const auto &format) -> decltype(formats)::value_type {\n \t\t\t const PixelFormat &pixelFormat = format.first;\n-\t\t\t const Size &size = format.second.captureSize;\n+\t\t\t const Size &size = format.second->captureSize;\n \t\t\t return { pixelFormat, { size } };\n \t\t });\n \n", "prefixes": [ "libcamera-devel", "15/20" ] }