Patch Detail
Show a patch.
GET /api/1.1/patches/17289/?format=api
{ "id": 17289, "url": "https://patchwork.libcamera.org/api/1.1/patches/17289/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17289/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20220903181037.1406-3-laurent.pinchart@ideasonboard.com>", "date": "2022-09-03T18:10:36", "name": "[libcamera-devel,2/3] pipeline: uvcvideo: Cache supported formats in UVCCameraData", "commit_ref": "f98919307e411c57f24de7587b22ac90a7850bdc", "pull_url": null, "state": "accepted", "archived": false, "hash": "e0a6e3f1e906bddc05383f1a006286bf098c24b7", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17289/mbox/", "series": [ { "id": 3466, "url": "https://patchwork.libcamera.org/api/1.1/series/3466/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3466", "date": "2022-09-03T18:10:34", "name": "libcamera: Fix crash with UVC cameras that expose no supported format", "version": 1, "mbox": "https://patchwork.libcamera.org/series/3466/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17289/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17289/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 434E3C327D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat, 3 Sep 2022 18:10:55 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AB3E562041;\n\tSat, 3 Sep 2022 20:10:54 +0200 (CEST)", "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 4455F62033\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 3 Sep 2022 20:10:53 +0200 (CEST)", "from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C147751E;\n\tSat, 3 Sep 2022 20:10:52 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1662228654;\n\tbh=h+Ea5s0Py13CdWRkDEd6pdhtJD2qNog0XbZAWrjL24o=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=ucgzWyxptvwUNRR/N+udfmSX9DTvDp9NK7lMwoowaj+2nPfK/hpituv47V72bfyTj\n\tPsTUlOvTlRzFpNls7RIBteEg5Ff2ubkoVJEhh8btelIExN7AZ9csbsvzujtv6PvqhT\n\t61B7O/KKmdlTNVbezicKSA9bqK2wpj/H3YBb1yfMe2LfKAVYFkHbCNMCcAQ0RyhcXs\n\tDOHww0VlTkb9j76tuAR3VSTOWPm/3tGUSD8iCeOhMc9iKZojK4+65QqSnkMGP6rgG2\n\tMPbO30DafDPCiY3Mv5XWc13D+0qBKHsRCCmxZqlmh02kB0RJYhx6/OJIPhijd+0GRc\n\t5+BxD4rbrgZew==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1662228653;\n\tbh=h+Ea5s0Py13CdWRkDEd6pdhtJD2qNog0XbZAWrjL24o=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=ISZQg2oVcxde0lZGgZu5a1QNZXwcFcyKMrlF729ekz1NPMyWYZjdlzUWkl5foJShO\n\tvYnvPQTwY2N9htfekLxpzYfIG2zQd+qblEJ1Z2rQWomyOOSR3LzlE7YU11vEkF/o9p\n\tz99Vx64Rod+N7d3jEa6YP99Zr8pvPfCrQWqxP5UY=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"ISZQg2oV\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Sat, 3 Sep 2022 21:10:36 +0300", "Message-Id": "<20220903181037.1406-3-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.35.1", "In-Reply-To": "<20220903181037.1406-1-laurent.pinchart@ideasonboard.com>", "References": "<20220903181037.1406-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 2/3] pipeline: uvcvideo: Cache supported\n\tformats in UVCCameraData", "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>", "From": "Laurent Pinchart via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Populate and cache the list of supported formats in\nUVCCameraData::init(), to avoid repeating the operation every time\ngenerateConfiguration() is called.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 44 ++++++++++----------\n 1 file changed, 22 insertions(+), 22 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\nindex 22b67faf309e..be0fbaea508a 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -50,6 +50,7 @@ public:\n \n \tstd::unique_ptr<V4L2VideoDevice> video_;\n \tStream stream_;\n+\tstd::map<PixelFormat, std::vector<SizeRange>> formats_;\n \n private:\n \tbool generateId();\n@@ -186,15 +187,7 @@ CameraConfiguration *PipelineHandlerUVC::generateConfiguration(Camera *camera,\n \tif (roles.empty())\n \t\treturn config;\n \n-\tV4L2VideoDevice::Formats v4l2Formats = data->video_->formats();\n-\tstd::map<PixelFormat, std::vector<SizeRange>> deviceFormats;\n-\tfor (const auto &format : v4l2Formats) {\n-\t\tPixelFormat pixelFormat = format.first.toPixelFormat();\n-\t\tif (pixelFormat.isValid())\n-\t\t\tdeviceFormats[pixelFormat] = format.second;\n-\t}\n-\n-\tStreamFormats formats(deviceFormats);\n+\tStreamFormats formats(data->formats_);\n \tStreamConfiguration cfg(formats);\n \n \tcfg.pixelFormat = formats.pixelformats().front();\n@@ -445,6 +438,26 @@ int UVCCameraData::init(MediaDevice *media)\n \t\treturn -EINVAL;\n \t}\n \n+\t/*\n+\t * Populate the map of supported formats, and infer the camera sensor\n+\t * resolution from the largest size it advertises.\n+\t */\n+\tSize resolution;\n+\tfor (const auto &format : video_->formats()) {\n+\t\tPixelFormat pixelFormat = format.first.toPixelFormat();\n+\t\tif (!pixelFormat.isValid())\n+\t\t\tcontinue;\n+\n+\t\tformats_[pixelFormat] = format.second;\n+\n+\t\tconst std::vector<SizeRange> &sizeRanges = format.second;\n+\t\tfor (const SizeRange &sizeRange : sizeRanges) {\n+\t\t\tif (sizeRange.max > resolution)\n+\t\t\t\tresolution = sizeRange.max;\n+\t\t}\n+\t}\n+\n+\t/* Populate the camera properties. */\n \tproperties_.set(properties::Model, utils::toAscii(media->model()));\n \n \t/*\n@@ -475,19 +488,6 @@ int UVCCameraData::init(MediaDevice *media)\n \n \tproperties_.set(properties::Location, location);\n \n-\t/*\n-\t * Get the current format in order to initialize the sensor array\n-\t * properties.\n-\t */\n-\tSize resolution;\n-\tfor (const auto &it : video_->formats()) {\n-\t\tconst std::vector<SizeRange> &sizeRanges = it.second;\n-\t\tfor (const SizeRange &sizeRange : sizeRanges) {\n-\t\t\tif (sizeRange.max > resolution)\n-\t\t\t\tresolution = sizeRange.max;\n-\t\t}\n-\t}\n-\n \tproperties_.set(properties::PixelArraySize, resolution);\n \tproperties_.set(properties::PixelArrayActiveAreas, { Rectangle(resolution) });\n \n", "prefixes": [ "libcamera-devel", "2/3" ] }