Patch Detail
Show a patch.
GET /api/patches/3628/?format=api
{ "id": 3628, "url": "https://patchwork.libcamera.org/api/patches/3628/?format=api", "web_url": "https://patchwork.libcamera.org/patch/3628/", "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": "<20200430030723.8908-3-laurent.pinchart@ideasonboard.com>", "date": "2020-04-30T03:07:19", "name": "[libcamera-devel,v2,2/6] libcamera: v4l2_pixelformat: Move DRM/V4L2 format conversion", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "5400f930067ec3f837f2230313a7e2698cfb022a", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/3628/mbox/", "series": [ { "id": 858, "url": "https://patchwork.libcamera.org/api/series/858/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=858", "date": "2020-04-30T03:07:17", "name": "libcamera: Improve conversion between DRM and V4L2 formats", "version": 2, "mbox": "https://patchwork.libcamera.org/series/858/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/3628/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/3628/checks/", "tags": {}, "headers": { "Return-Path": "<laurent.pinchart@ideasonboard.com>", "Received": [ "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 90353603F7\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 30 Apr 2020 05:07:28 +0200 (CEST)", "from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 30C3E503\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 30 Apr 2020 05:07:28 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"DLPwxAOi\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1588216048;\n\tbh=1DPv91SrE0vT/B5mRyUlCvpnBNwWFn6rgo55EeunE1E=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=DLPwxAOignSRUqRhbF1FtR/uahu1P1kz9Z9jKBBPQ8Pc4Zs9nSqVPx9VSNUprkLe2\n\tVBXmzVq8mtFsEJ9ATAgGEYQvkQgj+2PcPrMb//mYxqpz+stCpbU87uBpR7q3OdV414\n\tr8ZiDMtL1DqJ+AOvB63oVp1dQiP4R6qJ5aKi3nTg=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 30 Apr 2020 06:07:19 +0300", "Message-Id": "<20200430030723.8908-3-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.25.3", "In-Reply-To": "<20200430030723.8908-1-laurent.pinchart@ideasonboard.com>", "References": "<20200430030723.8908-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 2/6] libcamera: v4l2_pixelformat: Move\n\tDRM/V4L2 format conversion", "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": "Thu, 30 Apr 2020 03:07:28 -0000" }, "content": "Move the DRM/V4L2 format conversion code from V4L2VideoDevice to\nV4L2PixelFormat. This is a more natural home for the code.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/libcamera/include/v4l2_pixelformat.h | 4 +\n src/libcamera/include/v4l2_videodevice.h | 3 -\n src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 2 +-\n src/libcamera/v4l2_pixelformat.cpp | 134 +++++++++++++++++\n src/libcamera/v4l2_videodevice.cpp | 147 +------------------\n test/libtest/buffer_source.cpp | 4 +-\n 6 files changed, 143 insertions(+), 151 deletions(-)", "diff": "diff --git a/src/libcamera/include/v4l2_pixelformat.h b/src/libcamera/include/v4l2_pixelformat.h\nindex 4d277569cb8c..0fe8a017de34 100644\n--- a/src/libcamera/include/v4l2_pixelformat.h\n+++ b/src/libcamera/include/v4l2_pixelformat.h\n@@ -36,6 +36,10 @@ public:\n \n \tstd::string toString() const;\n \n+\tPixelFormat toPixelFormat() const;\n+\tstatic V4L2PixelFormat fromPixelFormat(const PixelFormat &pixelFormat,\n+\t\t\t\t\t bool multiplanar);\n+\n private:\n \tuint32_t fourcc_;\n };\ndiff --git a/src/libcamera/include/v4l2_videodevice.h b/src/libcamera/include/v4l2_videodevice.h\nindex ff64bb357c7e..982fee6bf740 100644\n--- a/src/libcamera/include/v4l2_videodevice.h\n+++ b/src/libcamera/include/v4l2_videodevice.h\n@@ -210,10 +210,7 @@ public:\n \tstatic V4L2VideoDevice *fromEntityName(const MediaDevice *media,\n \t\t\t\t\t const std::string &entity);\n \n-\tstatic PixelFormat toPixelFormat(V4L2PixelFormat v4l2Fourcc);\n \tV4L2PixelFormat toV4L2PixelFormat(const PixelFormat &pixelFormat);\n-\tstatic V4L2PixelFormat toV4L2PixelFormat(const PixelFormat &pixelFormat,\n-\t\t\t\t\t\t bool multiplanar);\n \n protected:\n \tstd::string logPrefix() const;\ndiff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\nindex 030ac6864752..455693264c2e 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -166,7 +166,7 @@ CameraConfiguration *PipelineHandlerUVC::generateConfiguration(Camera *camera,\n \t\t std::inserter(deviceFormats, deviceFormats.begin()),\n \t\t [&](const decltype(v4l2Formats)::value_type &format) {\n \t\t\t return decltype(deviceFormats)::value_type{\n-\t\t\t\t data->video_->toPixelFormat(format.first),\n+\t\t\t\t format.first.toPixelFormat(),\n \t\t\t\t format.second\n \t\t\t };\n \t\t });\ndiff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp\nindex 57d65c380b0d..876f5de321f6 100644\n--- a/src/libcamera/v4l2_pixelformat.cpp\n+++ b/src/libcamera/v4l2_pixelformat.cpp\n@@ -103,4 +103,138 @@ std::string V4L2PixelFormat::toString() const\n \treturn ss;\n }\n \n+/**\n+ * \\brief Convert the V4L2 pixel format to the corresponding PixelFormat\n+ * \\return The PixelFormat corresponding to the V4L2 pixel format\n+ */\n+PixelFormat V4L2PixelFormat::toPixelFormat() const\n+{\n+\tswitch (fourcc_) {\n+\t/* RGB formats. */\n+\tcase V4L2_PIX_FMT_RGB24:\n+\t\treturn PixelFormat(DRM_FORMAT_BGR888);\n+\tcase V4L2_PIX_FMT_BGR24:\n+\t\treturn PixelFormat(DRM_FORMAT_RGB888);\n+\tcase V4L2_PIX_FMT_RGBA32:\n+\t\treturn PixelFormat(DRM_FORMAT_ABGR8888);\n+\tcase V4L2_PIX_FMT_ABGR32:\n+\t\treturn PixelFormat(DRM_FORMAT_ARGB8888);\n+\tcase V4L2_PIX_FMT_ARGB32:\n+\t\treturn PixelFormat(DRM_FORMAT_BGRA8888);\n+\tcase V4L2_PIX_FMT_BGRA32:\n+\t\treturn PixelFormat(DRM_FORMAT_RGBA8888);\n+\n+\t/* YUV packed formats. */\n+\tcase V4L2_PIX_FMT_YUYV:\n+\t\treturn PixelFormat(DRM_FORMAT_YUYV);\n+\tcase V4L2_PIX_FMT_YVYU:\n+\t\treturn PixelFormat(DRM_FORMAT_YVYU);\n+\tcase V4L2_PIX_FMT_UYVY:\n+\t\treturn PixelFormat(DRM_FORMAT_UYVY);\n+\tcase V4L2_PIX_FMT_VYUY:\n+\t\treturn PixelFormat(DRM_FORMAT_VYUY);\n+\n+\t/* YUY planar formats. */\n+\tcase V4L2_PIX_FMT_NV16:\n+\tcase V4L2_PIX_FMT_NV16M:\n+\t\treturn PixelFormat(DRM_FORMAT_NV16);\n+\tcase V4L2_PIX_FMT_NV61:\n+\tcase V4L2_PIX_FMT_NV61M:\n+\t\treturn PixelFormat(DRM_FORMAT_NV61);\n+\tcase V4L2_PIX_FMT_NV12:\n+\tcase V4L2_PIX_FMT_NV12M:\n+\t\treturn PixelFormat(DRM_FORMAT_NV12);\n+\tcase V4L2_PIX_FMT_NV21:\n+\tcase V4L2_PIX_FMT_NV21M:\n+\t\treturn PixelFormat(DRM_FORMAT_NV21);\n+\n+\t/* Greyscale formats. */\n+\tcase V4L2_PIX_FMT_GREY:\n+\t\treturn PixelFormat(DRM_FORMAT_R8);\n+\n+\t/* Compressed formats. */\n+\tcase V4L2_PIX_FMT_MJPEG:\n+\t\treturn PixelFormat(DRM_FORMAT_MJPEG);\n+\n+\t/* V4L2 formats not yet supported by DRM. */\n+\tdefault:\n+\t\tLOG(V4L2, Warning)\n+\t\t\t<< \"Unsupported V4L2 pixel format \"\n+\t\t\t<< toString();\n+\t\treturn PixelFormat();\n+\t}\n+}\n+\n+/**\n+ * \\brief Convert \\a pixelFormat to its corresponding V4L2PixelFormat\n+ * \\param[in] pixelFormat The PixelFormat to convert\n+ * \\param[in] multiplanar V4L2 Multiplanar API support flag\n+ *\n+ * Multiple V4L2 formats may exist for one PixelFormat when the format uses\n+ * multiple planes, as V4L2 defines separate 4CCs for contiguous and separate\n+ * planes formats. Set the \\a multiplanar parameter to false to select a format\n+ * with contiguous planes, or to true to select a format with non-contiguous\n+ * planes.\n+ *\n+ * \\return The V4L2PixelFormat corresponding to \\a pixelFormat\n+ */\n+V4L2PixelFormat V4L2PixelFormat::fromPixelFormat(const PixelFormat &pixelFormat,\n+\t\t\t\t\t\t bool multiplanar)\n+{\n+\tswitch (pixelFormat) {\n+\t/* RGB formats. */\n+\tcase DRM_FORMAT_BGR888:\n+\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_RGB24);\n+\tcase DRM_FORMAT_RGB888:\n+\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_BGR24);\n+\tcase DRM_FORMAT_ABGR8888:\n+\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_RGBA32);\n+\tcase DRM_FORMAT_ARGB8888:\n+\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_ABGR32);\n+\tcase DRM_FORMAT_BGRA8888:\n+\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_ARGB32);\n+\tcase DRM_FORMAT_RGBA8888:\n+\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_BGRA32);\n+\n+\t/* YUV packed formats. */\n+\tcase DRM_FORMAT_YUYV:\n+\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_YUYV);\n+\tcase DRM_FORMAT_YVYU:\n+\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_YVYU);\n+\tcase DRM_FORMAT_UYVY:\n+\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_UYVY);\n+\tcase DRM_FORMAT_VYUY:\n+\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_VYUY);\n+\n+\t/*\n+\t * YUY planar formats.\n+\t * \\todo Add support for non-contiguous memory planes\n+\t * \\todo Select the format variant not only based on \\a multiplanar but\n+\t * also take into account the formats supported by the device.\n+\t */\n+\tcase DRM_FORMAT_NV16:\n+\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_NV16);\n+\tcase DRM_FORMAT_NV61:\n+\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_NV61);\n+\tcase DRM_FORMAT_NV12:\n+\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_NV12);\n+\tcase DRM_FORMAT_NV21:\n+\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_NV21);\n+\n+\t/* Greyscale formats. */\n+\tcase DRM_FORMAT_R8:\n+\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_GREY);\n+\n+\t/* Compressed formats. */\n+\tcase DRM_FORMAT_MJPEG:\n+\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_MJPEG);\n+\n+\tdefault:\n+\t\tLOG(V4L2, Warning)\n+\t\t\t<< \"Unsupported pixel format \"\n+\t\t\t<< pixelFormat.toString();\n+\t\treturn V4L2PixelFormat();\n+\t}\n+}\n+\n } /* namespace libcamera */\ndiff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp\nindex 21df4f524212..e95b0c01cc85 100644\n--- a/src/libcamera/v4l2_videodevice.cpp\n+++ b/src/libcamera/v4l2_videodevice.cpp\n@@ -18,7 +18,6 @@\n #include <unistd.h>\n #include <vector>\n \n-#include <linux/drm_fourcc.h>\n #include <linux/version.h>\n \n #include <libcamera/event_notifier.h>\n@@ -1634,74 +1633,6 @@ V4L2VideoDevice *V4L2VideoDevice::fromEntityName(const MediaDevice *media,\n \treturn new V4L2VideoDevice(mediaEntity);\n }\n \n-/**\n- * \\brief Convert a \\a v4l2Fourcc to the corresponding PixelFormat\n- * \\param[in] v4l2Fourcc The V4L2 pixel format (V4L2_PIX_FORMAT_*)\n- * \\return The PixelFormat corresponding to \\a v4l2Fourcc\n- */\n-PixelFormat V4L2VideoDevice::toPixelFormat(V4L2PixelFormat v4l2Fourcc)\n-{\n-\tswitch (v4l2Fourcc) {\n-\t/* RGB formats. */\n-\tcase V4L2_PIX_FMT_RGB24:\n-\t\treturn PixelFormat(DRM_FORMAT_BGR888);\n-\tcase V4L2_PIX_FMT_BGR24:\n-\t\treturn PixelFormat(DRM_FORMAT_RGB888);\n-\tcase V4L2_PIX_FMT_RGBA32:\n-\t\treturn PixelFormat(DRM_FORMAT_ABGR8888);\n-\tcase V4L2_PIX_FMT_ABGR32:\n-\t\treturn PixelFormat(DRM_FORMAT_ARGB8888);\n-\tcase V4L2_PIX_FMT_ARGB32:\n-\t\treturn PixelFormat(DRM_FORMAT_BGRA8888);\n-\tcase V4L2_PIX_FMT_BGRA32:\n-\t\treturn PixelFormat(DRM_FORMAT_RGBA8888);\n-\n-\t/* YUV packed formats. */\n-\tcase V4L2_PIX_FMT_YUYV:\n-\t\treturn PixelFormat(DRM_FORMAT_YUYV);\n-\tcase V4L2_PIX_FMT_YVYU:\n-\t\treturn PixelFormat(DRM_FORMAT_YVYU);\n-\tcase V4L2_PIX_FMT_UYVY:\n-\t\treturn PixelFormat(DRM_FORMAT_UYVY);\n-\tcase V4L2_PIX_FMT_VYUY:\n-\t\treturn PixelFormat(DRM_FORMAT_VYUY);\n-\n-\t/* YUY planar formats. */\n-\tcase V4L2_PIX_FMT_NV16:\n-\tcase V4L2_PIX_FMT_NV16M:\n-\t\treturn PixelFormat(DRM_FORMAT_NV16);\n-\tcase V4L2_PIX_FMT_NV61:\n-\tcase V4L2_PIX_FMT_NV61M:\n-\t\treturn PixelFormat(DRM_FORMAT_NV61);\n-\tcase V4L2_PIX_FMT_NV12:\n-\tcase V4L2_PIX_FMT_NV12M:\n-\t\treturn PixelFormat(DRM_FORMAT_NV12);\n-\tcase V4L2_PIX_FMT_NV21:\n-\tcase V4L2_PIX_FMT_NV21M:\n-\t\treturn PixelFormat(DRM_FORMAT_NV21);\n-\n-\t/* Greyscale formats. */\n-\tcase V4L2_PIX_FMT_GREY:\n-\t\treturn PixelFormat(DRM_FORMAT_R8);\n-\n-\t/* Compressed formats. */\n-\tcase V4L2_PIX_FMT_MJPEG:\n-\t\treturn PixelFormat(DRM_FORMAT_MJPEG);\n-\n-\t/* V4L2 formats not yet supported by DRM. */\n-\tdefault:\n-\t\t/*\n-\t\t * \\todo We can't use LOG() in a static method of a Loggable\n-\t\t * class. Until we fix the logger, work around it.\n-\t\t */\n-\t\tlibcamera::_log(__FILE__, __LINE__, _LOG_CATEGORY(V4L2)(),\n-\t\t\t\tLogWarning).stream()\n-\t\t\t<< \"Unsupported V4L2 pixel format \"\n-\t\t\t<< v4l2Fourcc.toString();\n-\t\treturn PixelFormat();\n-\t}\n-}\n-\n /**\n * \\brief Convert \\a PixelFormat to its corresponding V4L2 FourCC\n * \\param[in] pixelFormat The PixelFormat to convert\n@@ -1715,82 +1646,8 @@ PixelFormat V4L2VideoDevice::toPixelFormat(V4L2PixelFormat v4l2Fourcc)\n */\n V4L2PixelFormat V4L2VideoDevice::toV4L2PixelFormat(const PixelFormat &pixelFormat)\n {\n-\treturn toV4L2PixelFormat(pixelFormat, caps_.isMultiplanar());\n-}\n-\n-/**\n- * \\brief Convert \\a pixelFormat to its corresponding V4L2 FourCC\n- * \\param[in] pixelFormat The PixelFormat to convert\n- * \\param[in] multiplanar V4L2 Multiplanar API support flag\n- *\n- * Multiple V4L2 formats may exist for one PixelFormat when the format uses\n- * multiple planes, as V4L2 defines separate 4CCs for contiguous and separate\n- * planes formats. Set the \\a multiplanar parameter to false to select a format\n- * with contiguous planes, or to true to select a format with non-contiguous\n- * planes.\n- *\n- * \\return The V4L2_PIX_FMT_* pixel format code corresponding to \\a pixelFormat\n- */\n-V4L2PixelFormat V4L2VideoDevice::toV4L2PixelFormat(const PixelFormat &pixelFormat,\n-\t\t\t\t\t\t bool multiplanar)\n-{\n-\tswitch (pixelFormat) {\n-\t/* RGB formats. */\n-\tcase DRM_FORMAT_BGR888:\n-\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_RGB24);\n-\tcase DRM_FORMAT_RGB888:\n-\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_BGR24);\n-\tcase DRM_FORMAT_ABGR8888:\n-\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_RGBA32);\n-\tcase DRM_FORMAT_ARGB8888:\n-\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_ABGR32);\n-\tcase DRM_FORMAT_BGRA8888:\n-\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_ARGB32);\n-\tcase DRM_FORMAT_RGBA8888:\n-\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_BGRA32);\n-\n-\t/* YUV packed formats. */\n-\tcase DRM_FORMAT_YUYV:\n-\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_YUYV);\n-\tcase DRM_FORMAT_YVYU:\n-\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_YVYU);\n-\tcase DRM_FORMAT_UYVY:\n-\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_UYVY);\n-\tcase DRM_FORMAT_VYUY:\n-\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_VYUY);\n-\n-\t/*\n-\t * YUY planar formats.\n-\t * \\todo Add support for non-contiguous memory planes\n-\t * \\todo Select the format variant not only based on \\a multiplanar but\n-\t * also take into account the formats supported by the device.\n-\t */\n-\tcase DRM_FORMAT_NV16:\n-\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_NV16);\n-\tcase DRM_FORMAT_NV61:\n-\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_NV61);\n-\tcase DRM_FORMAT_NV12:\n-\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_NV12);\n-\tcase DRM_FORMAT_NV21:\n-\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_NV21);\n-\n-\t/* Greyscale formats. */\n-\tcase DRM_FORMAT_R8:\n-\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_GREY);\n-\n-\t/* Compressed formats. */\n-\tcase DRM_FORMAT_MJPEG:\n-\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_MJPEG);\n-\t}\n-\n-\t/*\n-\t * \\todo We can't use LOG() in a static method of a Loggable\n-\t * class. Until we fix the logger, work around it.\n-\t */\n-\tlibcamera::_log(__FILE__, __LINE__, _LOG_CATEGORY(V4L2)(),\n-\t\t\tLogWarning).stream()\n-\t\t<< \"Unsupported V4L2 pixel format \" << pixelFormat.toString();\n-\treturn {};\n+\treturn V4L2PixelFormat::fromPixelFormat(pixelFormat,\n+\t\t\t\t\t\tcaps_.isMultiplanar());\n }\n \n /**\ndiff --git a/test/libtest/buffer_source.cpp b/test/libtest/buffer_source.cpp\nindex dae3cb9f7a6c..d1dad2a0f8cf 100644\n--- a/test/libtest/buffer_source.cpp\n+++ b/test/libtest/buffer_source.cpp\n@@ -70,8 +70,8 @@ int BufferSource::allocate(const StreamConfiguration &config)\n \t}\n \n \tformat.size = config.size;\n-\tformat.fourcc = V4L2VideoDevice::toV4L2PixelFormat(config.pixelFormat,\n-\t\t\t\t\t\t\t false);\n+\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(config.pixelFormat,\n+\t\t\t\t\t\t\t false);\n \tif (video->setFormat(&format)) {\n \t\tstd::cout << \"Failed to set format on output device\" << std::endl;\n \t\treturn TestFail;\n", "prefixes": [ "libcamera-devel", "v2", "2/6" ] }