Patch Detail
Show a patch.
GET /api/1.1/patches/3106/?format=api
{ "id": 3106, "url": "https://patchwork.libcamera.org/api/1.1/patches/3106/?format=api", "web_url": "https://patchwork.libcamera.org/patch/3106/", "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": "<20200316024036.2474307-3-niklas.soderlund@ragnatech.se>", "date": "2020-03-16T02:40:34", "name": "[libcamera-devel,2/4] libcamera: v4l2_videodevice: Remove usage of ImageFormats", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "e2953e8e94a00c15f0857c0dd28ef0d2ffe57450", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/1.1/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/3106/mbox/", "series": [ { "id": 721, "url": "https://patchwork.libcamera.org/api/1.1/series/721/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=721", "date": "2020-03-16T02:40:32", "name": "libcamera: PixelFormat: Turn into a class", "version": 1, "mbox": "https://patchwork.libcamera.org/series/721/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/3106/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/3106/checks/", "tags": {}, "headers": { "Return-Path": "<niklas.soderlund@ragnatech.se>", "Received": [ "from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E8F8462928\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 16 Mar 2020 03:41:35 +0100 (CET)", "from bismarck.berto.se (p4fca2392.dip0.t-ipconnect.de\n\t[79.202.35.146]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA\n\tid 94d38ed0-672f-11ea-9f40-0050569116f7;\n\tMon, 16 Mar 2020 03:41:04 +0100 (CET)" ], "X-Halon-ID": "94d38ed0-672f-11ea-9f40-0050569116f7", "Authorized-sender": "niklas@soderlund.pp.se", "From": "=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 16 Mar 2020 03:40:34 +0100", "Message-Id": "<20200316024036.2474307-3-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20200316024036.2474307-1-niklas.soderlund@ragnatech.se>", "References": "<20200316024036.2474307-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 2/4] libcamera: v4l2_videodevice: Remove\n\tusage of ImageFormats", "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>", "X-List-Received-Date": "Mon, 16 Mar 2020 02:41:36 -0000" }, "content": "The ImageFormats class is not very nice as it forces the pixel format to\nbe an unsigned integer. Replace it with a map of PixelFormat to vector\nof sizes.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n---\n src/libcamera/include/v4l2_videodevice.h | 2 +-\n src/libcamera/pipeline/uvcvideo.cpp | 3 +--\n src/libcamera/v4l2_videodevice.cpp | 11 +++--------\n 3 files changed, 5 insertions(+), 11 deletions(-)", "diff": "diff --git a/src/libcamera/include/v4l2_videodevice.h b/src/libcamera/include/v4l2_videodevice.h\nindex 2507daf23efac66f..38dfd92544fa2c0e 100644\n--- a/src/libcamera/include/v4l2_videodevice.h\n+++ b/src/libcamera/include/v4l2_videodevice.h\n@@ -184,7 +184,7 @@ public:\n \n \tint getFormat(V4L2DeviceFormat *format);\n \tint setFormat(V4L2DeviceFormat *format);\n-\tImageFormats formats();\n+\tstd::map<PixelFormat, std::vector<SizeRange>> formats();\n \n \tint setCrop(Rectangle *rect);\n \tint setCompose(Rectangle *rect);\ndiff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\nindex 320da2685795c041..b5f98a96a14fe348 100644\n--- a/src/libcamera/pipeline/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo.cpp\n@@ -153,8 +153,7 @@ CameraConfiguration *PipelineHandlerUVC::generateConfiguration(Camera *camera,\n \tif (roles.empty())\n \t\treturn config;\n \n-\tImageFormats v4l2formats = data->video_->formats();\n-\tStreamFormats formats(v4l2formats.data());\n+\tStreamFormats formats(data->video_->formats());\n \tStreamConfiguration cfg(formats);\n \n \tcfg.pixelFormat = formats.pixelformats().front();\ndiff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp\nindex 858310c3b810350a..f9c59d5e3fb65737 100644\n--- a/src/libcamera/v4l2_videodevice.cpp\n+++ b/src/libcamera/v4l2_videodevice.cpp\n@@ -901,21 +901,16 @@ int V4L2VideoDevice::setFormatSingleplane(V4L2DeviceFormat *format)\n *\n * \\return A list of the supported video device formats\n */\n-ImageFormats V4L2VideoDevice::formats()\n+std::map<PixelFormat, std::vector<SizeRange>> V4L2VideoDevice::formats()\n {\n-\tImageFormats formats;\n+\tstd::map<PixelFormat, std::vector<SizeRange>> formats;\n \n \tfor (unsigned int pixelformat : enumPixelformats()) {\n \t\tstd::vector<SizeRange> sizes = enumSizes(pixelformat);\n \t\tif (sizes.empty())\n \t\t\treturn {};\n \n-\t\tif (formats.addFormat(pixelformat, sizes)) {\n-\t\t\tLOG(V4L2, Error)\n-\t\t\t\t<< \"Could not add sizes for pixel format \"\n-\t\t\t\t<< pixelformat;\n-\t\t\treturn {};\n-\t\t}\n+\t\tformats[pixelformat] = sizes;\n \t}\n \n \treturn formats;\n", "prefixes": [ "libcamera-devel", "2/4" ] }