{"id":3136,"url":"https://patchwork.libcamera.org/api/1.1/patches/3136/?format=json","web_url":"https://patchwork.libcamera.org/patch/3136/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200317035239.2697679-6-niklas.soderlund@ragnatech.se>","date":"2020-03-17T03:52:36","name":"[libcamera-devel,v2,5/8] libcamera: v4l2_videodevice: Remove usage of ImageFormats","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"6c8811c6e81a2587bcdb563bb4f6139f63683b9e","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/1.1/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3136/mbox/","series":[{"id":726,"url":"https://patchwork.libcamera.org/api/1.1/series/726/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=726","date":"2020-03-17T03:52:31","name":"libcamera: PixelFormat: Turn into a class","version":2,"mbox":"https://patchwork.libcamera.org/series/726/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3136/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3136/checks/","tags":{},"headers":{"Return-Path":"","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 DF85962950\n\tfor ;\n\tTue, 17 Mar 2020 04:53:38 +0100 (CET)","from bismarck.berto.se (p4fca2392.dip0.t-ipconnect.de\n\t[79.202.35.146]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid db59b448-6802-11ea-aa6d-005056917f90;\n\tTue, 17 Mar 2020 04:53:26 +0100 (CET)"],"X-Halon-ID":"db59b448-6802-11ea-aa6d-005056917f90","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 17 Mar 2020 04:52:36 +0100","Message-Id":"<20200317035239.2697679-6-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20200317035239.2697679-1-niklas.soderlund@ragnatech.se>","References":"<20200317035239.2697679-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 5/8] libcamera: v4l2_videodevice:\n\tRemove usage of ImageFormats","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Tue, 17 Mar 2020 03:53:39 -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 unsigned int to vector\nof sizes.\n\nSigned-off-by: Niklas Söderlund \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..62e6a657fc7eedb0 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> 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 14f7ddb18a765834..5ebd83f3c2099ffe 100644\n--- a/src/libcamera/pipeline/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo.cpp\n@@ -153,9 +153,8 @@ CameraConfiguration *PipelineHandlerUVC::generateConfiguration(Camera *camera,\n \tif (roles.empty())\n \t\treturn config;\n \n-\tImageFormats v4l2formats = data->video_->formats();\n \tstd::map> deviceformats;\n-\tfor (const auto &it : v4l2formats.data()) {\n+\tfor (const auto &it : data->video_->formats()) {\n \t\tPixelFormat pixelformat = V4L2VideoDevice::toPixelFormat(it.first);\n \t\tconst std::vector &ranges = it.second;\n \t\tdeviceformats[pixelformat] = ranges;\ndiff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp\nindex 858310c3b810350a..280cf1877c8936d7 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> V4L2VideoDevice::formats()\n {\n-\tImageFormats formats;\n+\tstd::map> formats;\n \n \tfor (unsigned int pixelformat : enumPixelformats()) {\n \t\tstd::vector 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","v2","5/8"]}