Patch Detail
Show a patch.
GET /api/patches/3881/?format=api
{ "id": 3881, "url": "https://patchwork.libcamera.org/api/patches/3881/?format=api", "web_url": "https://patchwork.libcamera.org/patch/3881/", "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": "<20200529110335.620503-5-jacopo@jmondi.org>", "date": "2020-05-29T11:03:34", "name": "[libcamera-devel,4/5] libcamera: v4l2_device: Add formatsMap typedef", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "0eda3fd49c1452d06dfdf8ab859246753ca4610c", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/3881/mbox/", "series": [ { "id": 938, "url": "https://patchwork.libcamera.org/api/series/938/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=938", "date": "2020-05-29T11:03:30", "name": "ImageFormats' not dead", "version": 1, "mbox": "https://patchwork.libcamera.org/series/938/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/3881/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/3881/checks/", "tags": {}, "headers": { "Return-Path": "<jacopo@jmondi.org>", "Received": [ "from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net\n\t[217.70.183.196])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 77EBA603CF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 29 May 2020 13:00:32 +0200 (CEST)", "from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 00933E000A;\n\tFri, 29 May 2020 11:00:31 +0000 (UTC)" ], "X-Originating-IP": "2.224.242.101", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 29 May 2020 13:03:34 +0200", "Message-Id": "<20200529110335.620503-5-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.26.2", "In-Reply-To": "<20200529110335.620503-1-jacopo@jmondi.org>", "References": "<20200529110335.620503-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 4/5] libcamera: v4l2_device: Add\n\tformatsMap typedef", "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": "Fri, 29 May 2020 11:00:32 -0000" }, "content": "Provide a type definition in the V4L2VideoDevice and V4L2Subdevice\nclasses to shorten the ImageFormatsMap<V4L2PixelFormat> and\nImageFormatsMap<uint32_t> spcialization names.\n\nThe new types reads as V4L2VideoDevice::formatsMap and\nV4L2Subdevice::formatsMap respectively.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n include/libcamera/internal/camera_sensor.h | 6 ++----\n include/libcamera/internal/v4l2_subdevice.h | 4 +++-\n include/libcamera/internal/v4l2_videodevice.h | 4 +++-\n src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 11 ++++++-----\n src/libcamera/pipeline/simple/simple.cpp | 2 +-\n src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 2 +-\n src/libcamera/v4l2_subdevice.cpp | 9 +++++++--\n src/libcamera/v4l2_videodevice.cpp | 9 +++++++--\n test/v4l2_subdevice/list_formats.cpp | 2 +-\n 9 files changed, 31 insertions(+), 18 deletions(-)", "diff": "diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\nindex 52eedb9ef880..1353edb1da28 100644\n--- a/include/libcamera/internal/camera_sensor.h\n+++ b/include/libcamera/internal/camera_sensor.h\n@@ -16,13 +16,11 @@\n \n #include \"libcamera/internal/formats.h\"\n #include \"libcamera/internal/log.h\"\n+#include \"libcamera/internal/v4l2_subdevice.h\"\n \n namespace libcamera {\n \n class MediaEntity;\n-class V4L2Subdevice;\n-\n-struct V4L2SubdeviceFormat;\n \n struct CameraSensorInfo {\n \tstd::string model;\n@@ -75,7 +73,7 @@ private:\n \n \tstd::string model_;\n \n-\tImageFormatsMap<uint32_t> formats_;\n+\tV4L2Subdevice::formatsMap formats_;\n \tSize resolution_;\n \tstd::vector<unsigned int> mbusCodes_;\n \tstd::vector<Size> sizes_;\ndiff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h\nindex c9aa3428f93c..06f10d7b4c5d 100644\n--- a/include/libcamera/internal/v4l2_subdevice.h\n+++ b/include/libcamera/internal/v4l2_subdevice.h\n@@ -32,6 +32,8 @@ struct V4L2SubdeviceFormat {\n class V4L2Subdevice : public V4L2Device\n {\n public:\n+\tusing formatsMap = ImageFormatsMap<uint32_t>;\n+\n \tenum Whence {\n \t\tActiveFormat,\n \t\tTryFormat,\n@@ -51,7 +53,7 @@ public:\n \tint setSelection(unsigned int pad, unsigned int target,\n \t\t\t Rectangle *rect);\n \n-\tImageFormatsMap<uint32_t> formats(unsigned int pad);\n+\tformatsMap formats(unsigned int pad);\n \n \tint getFormat(unsigned int pad, V4L2SubdeviceFormat *format,\n \t\t Whence whence = ActiveFormat);\ndiff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h\nindex 02d101db0b2b..9632ad71b988 100644\n--- a/include/libcamera/internal/v4l2_videodevice.h\n+++ b/include/libcamera/internal/v4l2_videodevice.h\n@@ -168,6 +168,8 @@ public:\n class V4L2VideoDevice : public V4L2Device\n {\n public:\n+\tusing formatsMap = ImageFormatsMap<V4L2PixelFormat>;\n+\n \texplicit V4L2VideoDevice(const std::string &deviceNode);\n \texplicit V4L2VideoDevice(const MediaEntity *entity);\n \tV4L2VideoDevice(const V4L2VideoDevice &) = delete;\n@@ -187,7 +189,7 @@ public:\n \n \tint getFormat(V4L2DeviceFormat *format);\n \tint setFormat(V4L2DeviceFormat *format);\n-\tImageFormatsMap<V4L2PixelFormat> formats(uint32_t code = 0);\n+\tformatsMap formats(uint32_t code = 0);\n \n \tint setSelection(unsigned int target, Rectangle *rect);\n \ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex e0132113b072..7dd579090ec6 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -65,7 +65,7 @@ double scoreFormat(double desired, double actual)\n \treturn score;\n }\n \n-V4L2DeviceFormat findBestMode(ImageFormatsMap<V4L2PixelFormat> &formatsMap, const Size &req)\n+V4L2DeviceFormat findBestMode(V4L2VideoDevice::formatsMap &formatsMap, const Size &req)\n {\n \tdouble bestScore = 9e9, score;\n \tV4L2DeviceFormat bestMode = {};\n@@ -424,7 +424,8 @@ CameraConfiguration::Status RPiCameraConfiguration::validate()\n \t\t\t * Calculate the best sensor mode we can use based on\n \t\t\t * the user request.\n \t\t\t */\n-\t\t\tImageFormatsMap<V4L2PixelFormat> fmts = data_->unicam_[Unicam::Image].dev()->formats();\n+\t\t\tV4L2VideoDevice::formatsMap fmts =\n+\t\t\t\tdata_->unicam_[Unicam::Image].dev()->formats();\n \t\t\tV4L2DeviceFormat sensorFormat = findBestMode(fmts, cfg.size);\n \t\t\tPixelFormat sensorPixFormat = sensorFormat.fourcc.toPixelFormat();\n \t\t\tif (cfg.size != sensorFormat.size ||\n@@ -478,7 +479,7 @@ CameraConfiguration::Status RPiCameraConfiguration::validate()\n \t\t *\n \t\t */\n \t\tPixelFormat &cfgPixFmt = config_.at(outSize[i].first).pixelFormat;\n-\t\tImageFormatsMap<V4L2PixelFormat> fmts;\n+\t\tV4L2VideoDevice::formatsMap fmts;\n \n \t\tif (i == maxIndex)\n \t\t\tfmts = data_->isp_[Isp::Output0].dev()->formats();\n@@ -515,7 +516,7 @@ CameraConfiguration *PipelineHandlerRPi::generateConfiguration(Camera *camera,\n \tRPiCameraData *data = cameraData(camera);\n \tCameraConfiguration *config = new RPiCameraConfiguration(data);\n \tV4L2DeviceFormat sensorFormat;\n-\tImageFormatsMap<V4L2PixelFormat> fmts;\n+\tV4L2VideoDevice::formatsMap fmts;\n \n \tif (roles.empty())\n \t\treturn config;\n@@ -602,7 +603,7 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n \t}\n \n \t/* First calculate the best sensor mode we can use based on the user request. */\n-\tImageFormatsMap<V4L2PixelFormat> fmts = data->unicam_[Unicam::Image].dev()->formats();\n+\tV4L2VideoDevice::formatsMap fmts = data->unicam_[Unicam::Image].dev()->formats();\n \tV4L2DeviceFormat sensorFormat = findBestMode(fmts, rawStream ? sensorSize : maxSize);\n \n \t/*\ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 62906b560d6a..feaa2854f037 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -275,7 +275,7 @@ int SimpleCameraData::init()\n \t\t\treturn ret;\n \t\t}\n \n-\t\tImageFormatsMap<V4L2PixelFormat> videoFormats = video_->formats(format.mbus_code);\n+\t\tV4L2VideoDevice::formatsMap videoFormats = video_->formats(format.mbus_code);\n \n \t\tLOG(SimplePipeline, Debug)\n \t\t\t<< \"Adding configuration for \" << format.size.toString()\ndiff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\nindex e1b1ae32b821..6250186e9390 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -159,7 +159,7 @@ CameraConfiguration *PipelineHandlerUVC::generateConfiguration(Camera *camera,\n \tif (roles.empty())\n \t\treturn config;\n \n-\tImageFormatsMap<V4L2PixelFormat> v4l2Formats = data->video_->formats();\n+\tV4L2VideoDevice::formatsMap v4l2Formats = data->video_->formats();\n \tstd::map<PixelFormat, std::vector<SizeRange>> deviceFormats;\n \tstd::transform(v4l2Formats.begin(), v4l2Formats.end(),\n \t\t std::inserter(deviceFormats, deviceFormats.begin()),\ndiff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp\nindex 80db4cda82bb..0dd8e8686967 100644\n--- a/src/libcamera/v4l2_subdevice.cpp\n+++ b/src/libcamera/v4l2_subdevice.cpp\n@@ -197,6 +197,11 @@ uint8_t V4L2SubdeviceFormat::bitsPerPixel() const\n * any device left open will be closed, and any resources released.\n */\n \n+/**\n+ * \\typedef V4L2Subdevice::formatsMap\n+ * \\brief Map of media bus codes to associated image sizes\n+ */\n+\n /**\n * \\enum V4L2Subdevice::Whence\n * \\brief Specify the type of format for getFormat() and setFormat() operations\n@@ -320,9 +325,9 @@ int V4L2Subdevice::setSelection(unsigned int pad, unsigned int target,\n *\n * \\return A list of the supported device formats\n */\n-ImageFormatsMap<uint32_t> V4L2Subdevice::formats(unsigned int pad)\n+V4L2Subdevice::formatsMap V4L2Subdevice::formats(unsigned int pad)\n {\n-\tImageFormatsMap<uint32_t> formats;\n+\tformatsMap formats;\n \n \tif (pad >= entity_->pads().size()) {\n \t\tLOG(V4L2, Error) << \"Invalid pad: \" << pad;\ndiff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp\nindex b264915cb73a..6d48018396c3 100644\n--- a/src/libcamera/v4l2_videodevice.cpp\n+++ b/src/libcamera/v4l2_videodevice.cpp\n@@ -461,6 +461,11 @@ const std::string V4L2DeviceFormat::toString() const\n * \\context This class is \\threadbound.\n */\n \n+/**\n+ * \\typedef V4L2VideoDevice::formatsMap\n+ * \\brief Map of V4l2PixelFormat to associated image sizes\n+ */\n+\n /**\n * \\brief Construct a V4L2VideoDevice\n * \\param[in] deviceNode The file-system path to the video device node\n@@ -925,9 +930,9 @@ int V4L2VideoDevice::setFormatSingleplane(V4L2DeviceFormat *format)\n *\n * \\return A list of the supported video device formats\n */\n-ImageFormatsMap<V4L2PixelFormat> V4L2VideoDevice::formats(uint32_t code)\n+V4L2VideoDevice::formatsMap V4L2VideoDevice::formats(uint32_t code)\n {\n-\tImageFormatsMap<V4L2PixelFormat> formats;\n+\tformatsMap formats;\n \n \tfor (V4L2PixelFormat pixelFormat : enumPixelformats(code)) {\n \t\tstd::vector<SizeRange> sizes = enumSizes(pixelFormat);\ndiff --git a/test/v4l2_subdevice/list_formats.cpp b/test/v4l2_subdevice/list_formats.cpp\nindex adcf5606c961..a32f5c833c28 100644\n--- a/test/v4l2_subdevice/list_formats.cpp\n+++ b/test/v4l2_subdevice/list_formats.cpp\n@@ -48,7 +48,7 @@ void ListFormatsTest::printFormats(unsigned int pad,\n int ListFormatsTest::run()\n {\n \t/* List all formats available on existing \"Scaler\" pads. */\n-\tImageFormatsMap<uint32_t> formats;\n+\tV4L2Subdevice::formatsMap formats;\n \n \tformats = scaler_->formats(0);\n \tif (formats.isEmpty()) {\n", "prefixes": [ "libcamera-devel", "4/5" ] }