{"id":1459,"url":"https://patchwork.libcamera.org/api/patches/1459/?format=json","web_url":"https://patchwork.libcamera.org/patch/1459/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20190619025129.21164-10-niklas.soderlund@ragnatech.se>","date":"2019-06-19T02:51:22","name":"[libcamera-devel,v4,09/16] libcamera: v4l2_device: Add enumeration of pixelformats and frame sizes","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"96c143a1972beef0cf9e17292a96bb86c03d6d28","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1459/mbox/","series":[{"id":361,"url":"https://patchwork.libcamera.org/api/series/361/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=361","date":"2019-06-19T02:51:13","name":"libcamera: Add support for format information and validation","version":4,"mbox":"https://patchwork.libcamera.org/series/361/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1459/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1459/checks/","tags":{},"headers":{"Return-Path":"","Received":["from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2864861A26\n\tfor ;\n\tWed, 19 Jun 2019 04:52:29 +0200 (CEST)","from bismarck.berto.se (unknown [89.233.230.99])\n\tby bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid 3e849a76-923d-11e9-8ab4-005056917a89;\n\tWed, 19 Jun 2019 04:52:15 +0200 (CEST)"],"X-Halon-ID":"3e849a76-923d-11e9-8ab4-005056917a89","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 19 Jun 2019 04:51:22 +0200","Message-Id":"<20190619025129.21164-10-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20190619025129.21164-1-niklas.soderlund@ragnatech.se>","References":"<20190619025129.21164-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 09/16] libcamera: v4l2_device: Add\n\tenumeration of pixelformats and frame sizes","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Wed, 19 Jun 2019 02:52:29 -0000"},"content":"Add methods to enumerate pixelformats and frame sizes from a v4l2\ndevice. The interface is similar to how V4L2Subdevice enumerates mbus\ncodes and frame sizes.\n\nSigned-off-by: Niklas Söderlund \nReviewed-by: Jacopo Mondi \n---\n* Changes since v3\n- Catch the error from V4L2Device::enumSizes() in V4L2Device::formats()\n- s/pixelformats/pixel formats/\n---\n src/libcamera/include/v4l2_device.h | 5 ++\n src/libcamera/v4l2_device.cpp | 114 ++++++++++++++++++++++++++++\n 2 files changed, 119 insertions(+)","diff":"diff --git a/src/libcamera/include/v4l2_device.h b/src/libcamera/include/v4l2_device.h\nindex bdecc087fe5afae0..1a67850ac4c1088f 100644\n--- a/src/libcamera/include/v4l2_device.h\n+++ b/src/libcamera/include/v4l2_device.h\n@@ -16,6 +16,7 @@\n #include \n #include \n \n+#include \"formats.h\"\n #include \"log.h\"\n \n namespace libcamera {\n@@ -132,6 +133,7 @@ public:\n \n \tint getFormat(V4L2DeviceFormat *format);\n \tint setFormat(V4L2DeviceFormat *format);\n+\tImageFormats formats();\n \n \tint exportBuffers(BufferPool *pool);\n \tint importBuffers(BufferPool *pool);\n@@ -163,6 +165,9 @@ private:\n \tint createPlane(Buffer *buffer, unsigned int plane,\n \t\t\tunsigned int length);\n \n+\tstd::vector enumPixelformats();\n+\tstd::vector enumSizes(unsigned int pixelFormat);\n+\n \tBuffer *dequeueBuffer();\n \tvoid bufferAvailable(EventNotifier *notifier);\n \ndiff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\nindex 0821bd75fb428766..e14fc6109a4db470 100644\n--- a/src/libcamera/v4l2_device.cpp\n+++ b/src/libcamera/v4l2_device.cpp\n@@ -634,6 +634,33 @@ int V4L2Device::setFormatSingleplane(V4L2DeviceFormat *format)\n \treturn 0;\n }\n \n+/**\n+ * \\brief Enumerate all pixel formats and frame sizes\n+ *\n+ * Enumerate all pixel formats and frame sizes supported by the video device.\n+ *\n+ * \\return A list of the supported device formats\n+ */\n+ImageFormats V4L2Device::formats()\n+{\n+\tImageFormats 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}\n+\n+\treturn formats;\n+}\n+\n int V4L2Device::requestBuffers(unsigned int count)\n {\n \tstruct v4l2_requestbuffers rb = {};\n@@ -763,6 +790,93 @@ int V4L2Device::createPlane(Buffer *buffer, unsigned int planeIndex,\n \treturn 0;\n }\n \n+std::vector V4L2Device::enumPixelformats()\n+{\n+\tstd::vector formats;\n+\tint ret;\n+\n+\tfor (unsigned int index = 0; ; index++) {\n+\t\tstruct v4l2_fmtdesc pixelformatEnum = {};\n+\t\tpixelformatEnum.index = index;\n+\t\tpixelformatEnum.type = bufferType_;\n+\n+\t\tret = ioctl(fd_, VIDIOC_ENUM_FMT, &pixelformatEnum);\n+\t\tif (ret)\n+\t\t\tbreak;\n+\n+\t\tformats.push_back(pixelformatEnum.pixelformat);\n+\t}\n+\n+\tif (ret && errno != EINVAL) {\n+\t\tret = -errno;\n+\t\tLOG(V4L2, Error)\n+\t\t\t<< \"Unable to enumerate pixel formats: \"\n+\t\t\t<< strerror(-ret);\n+\t\treturn {};\n+\t}\n+\n+\treturn formats;\n+}\n+\n+std::vector V4L2Device::enumSizes(unsigned int pixelFormat)\n+{\n+\tstd::vector sizes;\n+\tint ret;\n+\n+\tfor (unsigned int index = 0;; index++) {\n+\t\tstruct v4l2_frmsizeenum frameSize = {};\n+\t\tframeSize.index = index;\n+\t\tframeSize.pixel_format = pixelFormat;\n+\n+\t\tret = ioctl(fd_, VIDIOC_ENUM_FRAMESIZES, &frameSize);\n+\t\tif (ret)\n+\t\t\tbreak;\n+\n+\t\tif (index != 0 &&\n+\t\t frameSize.type != V4L2_FRMSIZE_TYPE_DISCRETE) {\n+\t\t\tLOG(V4L2, Error)\n+\t\t\t\t<< \"Non-zero index for non discrete type\";\n+\t\t\treturn {};\n+\t\t}\n+\n+\t\tswitch (frameSize.type) {\n+\t\tcase V4L2_FRMSIZE_TYPE_DISCRETE:\n+\t\t\tsizes.emplace_back(frameSize.discrete.width,\n+\t\t\t\t\t frameSize.discrete.height);\n+\t\t\tbreak;\n+\t\tcase V4L2_FRMSIZE_TYPE_CONTINUOUS:\n+\t\t\tsizes.emplace_back(frameSize.stepwise.min_width,\n+\t\t\t\t\t frameSize.stepwise.min_height,\n+\t\t\t\t\t frameSize.stepwise.max_width,\n+\t\t\t\t\t frameSize.stepwise.max_height);\n+\t\t\tbreak;\n+\t\tcase V4L2_FRMSIZE_TYPE_STEPWISE:\n+\t\t\tsizes.emplace_back(frameSize.stepwise.min_width,\n+\t\t\t\t\t frameSize.stepwise.min_height,\n+\t\t\t\t\t frameSize.stepwise.max_width,\n+\t\t\t\t\t frameSize.stepwise.max_height,\n+\t\t\t\t\t frameSize.stepwise.step_width,\n+\t\t\t\t\t frameSize.stepwise.step_height);\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tLOG(V4L2, Error)\n+\t\t\t\t<< \"Unknown VIDIOC_ENUM_FRAMESIZES type \"\n+\t\t\t\t<< frameSize.type;\n+\t\t\treturn {};\n+\t\t}\n+\t}\n+\n+\tif (ret && errno != EINVAL) {\n+\t\tret = -errno;\n+\t\tLOG(V4L2, Error)\n+\t\t\t<< \"Unable to enumerate frame sizes: \"\n+\t\t\t<< strerror(-ret);\n+\t\treturn {};\n+\t}\n+\n+\treturn sizes;\n+}\n+\n /**\n * \\brief Import the externally allocated \\a pool of buffers\n * \\param[in] pool BufferPool of buffers to import\n","prefixes":["libcamera-devel","v4","09/16"]}