Patch Detail
Show a patch.
GET /api/patches/16641/?format=api
{ "id": 16641, "url": "https://patchwork.libcamera.org/api/patches/16641/?format=api", "web_url": "https://patchwork.libcamera.org/patch/16641/", "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": "<20220715135007.53574-4-jacopo@jmondi.org>", "date": "2022-07-15T13:50:03", "name": "[libcamera-devel,3/7] libcamera: v4l2_pixelformat: Return a format list in fromPixelFormat()", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "19af842c59d831497f5e87d625602d07ff353568", "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/16641/mbox/", "series": [ { "id": 3288, "url": "https://patchwork.libcamera.org/api/series/3288/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3288", "date": "2022-07-15T13:50:00", "name": "libcamera: Map multiple V4L2 formats to a single libcamera::format", "version": 1, "mbox": "https://patchwork.libcamera.org/series/3288/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/16641/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/16641/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 6D077BE173\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 15 Jul 2022 13:50:26 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 034F66331C;\n\tFri, 15 Jul 2022 15:50:25 +0200 (CEST)", "from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net\n\t[217.70.183.195])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 38DC06330F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 15 Jul 2022 15:50:23 +0200 (CEST)", "(Authenticated sender: jacopo@jmondi.org)\n\tby mail.gandi.net (Postfix) with ESMTPSA id 0B47C6000F;\n\tFri, 15 Jul 2022 13:50:21 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1657893026;\n\tbh=kB5V6ZYhOif8/B69RxWU2gF8W9eQavO9ZjYs+bHCKQY=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=zFkfdEv+GtE57L9eB62ytAgE6MYxgxFyWtUKm7Suzy/C8RHa6pDWqgQ2vJHbNJvSp\n\tYmgollMxJRyRnUrYKbNvvigNJXzFeqRIYhSu8JICcMUSrWTfEllc8+WIkUi/PEoGL2\n\tXN1LVBwtYq6cdG8HkHV8UmUEBQBH2uftj6Vg10Y8KDuxK0CqpRXu5WK6LAA3x027UY\n\tcjz5ObALUxUfhcRbFBD2UWJO8c0I0f1Zo5iajARl1d4TQkrlhYaaZ564ApeqAIUSx9\n\tKpidDvV8b7Roj2R0UXHP6VRF2cGp7mUpvkOIPKUkea3VmmSBNpRqcT/g0zvoVdyxU3\n\tBp5hDu4qPxtzQ==", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 15 Jul 2022 15:50:03 +0200", "Message-Id": "<20220715135007.53574-4-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.36.1", "In-Reply-To": "<20220715135007.53574-1-jacopo@jmondi.org>", "References": "<20220715135007.53574-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 3/7] libcamera: v4l2_pixelformat: Return a\n\tformat list in fromPixelFormat()", "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>", "From": "Jacopo Mondi via libcamera-devel <libcamera-devel@lists.libcamera.org>", "Reply-To": "Jacopo Mondi <jacopo@jmondi.org>", "Cc": "jozef@mlich.cz, Pavel Machek <pavel@ucw.cz>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "As we prepare to associate multiple V4L2 FourCC to a single libcamera\nformat, make the V4L2PixelFormat::fromPixelFormat() return a list of\nformats and convert all its users to pick the first one.\n\nThis change prepares to re-introduce V4L2VideoDevice::toV4L2PixelFormat()\nwhich will instead match the list of V4L2 FourCC against the formats\nsupported by the video device.\n\nWhile at it, reword the V4L2PixelFormat::fromPixelFormat() documentation\nto distinguish between planar/multiplanar and contiguous/non-contiguous.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n include/libcamera/internal/v4l2_pixelformat.h | 6 ++++--\n src/libcamera/pipeline/ipu3/cio2.cpp | 2 +-\n src/libcamera/pipeline/ipu3/imgu.cpp | 2 +-\n .../pipeline/raspberrypi/raspberrypi.cpp | 12 +++++------\n src/libcamera/pipeline/rkisp1/rkisp1_path.cpp | 6 +++---\n src/libcamera/pipeline/simple/converter.cpp | 8 ++++----\n src/libcamera/pipeline/simple/simple.cpp | 4 ++--\n src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 6 +++---\n src/libcamera/pipeline/vimc/vimc.cpp | 8 ++++----\n src/libcamera/v4l2_pixelformat.cpp | 20 +++++++++----------\n src/v4l2/v4l2_camera_proxy.cpp | 6 +++---\n test/libtest/buffer_source.cpp | 2 +-\n 12 files changed, 42 insertions(+), 40 deletions(-)", "diff": "diff --git a/include/libcamera/internal/v4l2_pixelformat.h b/include/libcamera/internal/v4l2_pixelformat.h\nindex fb2d5d0b93df..750f31fc1926 100644\n--- a/include/libcamera/internal/v4l2_pixelformat.h\n+++ b/include/libcamera/internal/v4l2_pixelformat.h\n@@ -11,6 +11,7 @@\n #include <ostream>\n #include <stdint.h>\n #include <string>\n+#include <vector>\n \n #include <linux/videodev2.h>\n \n@@ -44,8 +45,9 @@ public:\n \tconst char *description() const;\n \n \tPixelFormat toPixelFormat() const;\n-\tstatic V4L2PixelFormat fromPixelFormat(const PixelFormat &pixelFormat,\n-\t\t\t\t\t bool multiplanar = false);\n+\tstatic std::vector<V4L2PixelFormat>\n+\t\tfromPixelFormat(const PixelFormat &pixelFormat,\n+\t\t\t\tbool multiplanar = false);\n \n private:\n \tuint32_t fourcc_;\ndiff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp\nindex 08e254f75eee..4a13d16973e9 100644\n--- a/src/libcamera/pipeline/ipu3/cio2.cpp\n+++ b/src/libcamera/pipeline/ipu3/cio2.cpp\n@@ -203,7 +203,7 @@ int CIO2Device::configure(const Size &size, V4L2DeviceFormat *outputFormat)\n \tif (itInfo == mbusCodesToPixelFormat.end())\n \t\treturn -EINVAL;\n \n-\toutputFormat->fourcc = V4L2PixelFormat::fromPixelFormat(itInfo->second);\n+\toutputFormat->fourcc = V4L2PixelFormat::fromPixelFormat(itInfo->second)[0];\n \toutputFormat->size = sensorFormat.size;\n \toutputFormat->planesCount = 1;\n \ndiff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp\nindex 59305f85073c..251164001ffd 100644\n--- a/src/libcamera/pipeline/ipu3/imgu.cpp\n+++ b/src/libcamera/pipeline/ipu3/imgu.cpp\n@@ -558,7 +558,7 @@ int ImgUDevice::configureVideoDevice(V4L2VideoDevice *dev, unsigned int pad,\n \t\treturn 0;\n \n \t*outputFormat = {};\n-\toutputFormat->fourcc = V4L2PixelFormat::fromPixelFormat(formats::NV12);\n+\toutputFormat->fourcc = V4L2PixelFormat::fromPixelFormat(formats::NV12)[0];\n \toutputFormat->size = cfg.size;\n \toutputFormat->planesCount = 2;\n \ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex fdc24cd530c2..f698d3329429 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -96,7 +96,7 @@ V4L2DeviceFormat toV4L2DeviceFormat(const V4L2SubdeviceFormat &format,\n \tconst PixelFormat pix = mbusCodeToPixelFormat(format.mbus_code, packingReq);\n \tV4L2DeviceFormat deviceFormat;\n \n-\tdeviceFormat.fourcc = V4L2PixelFormat::fromPixelFormat(pix);\n+\tdeviceFormat.fourcc = V4L2PixelFormat::fromPixelFormat(pix)[0];\n \tdeviceFormat.size = format.size;\n \tdeviceFormat.colorSpace = format.colorSpace;\n \treturn deviceFormat;\n@@ -516,14 +516,14 @@ CameraConfiguration::Status RPiCameraConfiguration::validate()\n \n \t\tV4L2VideoDevice::Formats fmts = dev->formats();\n \n-\t\tif (fmts.find(V4L2PixelFormat::fromPixelFormat(cfgPixFmt)) == fmts.end()) {\n+\t\tif (fmts.find(V4L2PixelFormat::fromPixelFormat(cfgPixFmt)[0]) == fmts.end()) {\n \t\t\t/* If we cannot find a native format, use a default one. */\n \t\t\tcfgPixFmt = formats::NV12;\n \t\t\tstatus = Adjusted;\n \t\t}\n \n \t\tV4L2DeviceFormat format;\n-\t\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(cfg.pixelFormat);\n+\t\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(cfg.pixelFormat)[0];\n \t\tformat.size = cfg.size;\n \t\tformat.colorSpace = cfg.colorSpace;\n \n@@ -783,7 +783,7 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n \t\tRPi::Stream *stream = i == maxIndex ? &data->isp_[Isp::Output0]\n \t\t\t\t\t\t : &data->isp_[Isp::Output1];\n \n-\t\tV4L2PixelFormat fourcc = V4L2PixelFormat::fromPixelFormat(cfg.pixelFormat);\n+\t\tV4L2PixelFormat fourcc = V4L2PixelFormat::fromPixelFormat(cfg.pixelFormat)[0];\n \t\tformat.size = cfg.size;\n \t\tformat.fourcc = fourcc;\n \t\tformat.colorSpace = cfg.colorSpace;\n@@ -829,7 +829,7 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n \t\tmaxSize = Size(320, 240);\n \t\tformat = {};\n \t\tformat.size = maxSize;\n-\t\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(formats::YUV420);\n+\t\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(formats::YUV420)[0];\n \t\t/* No one asked for output, so the color space doesn't matter. */\n \t\tformat.colorSpace = ColorSpace::Jpeg;\n \t\tret = data->isp_[Isp::Output0].dev()->setFormat(&format);\n@@ -862,7 +862,7 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n \n \t\toutput1Format.size = (format.size / 2).boundedTo(limit).alignedDownTo(2, 2);\n \t\toutput1Format.colorSpace = format.colorSpace;\n-\t\toutput1Format.fourcc = V4L2PixelFormat::fromPixelFormat(formats::YUV420);\n+\t\toutput1Format.fourcc = V4L2PixelFormat::fromPixelFormat(formats::YUV420)[0];\n \n \t\tLOG(RPI, Debug) << \"Setting ISP Output1 (internal) to \"\n \t\t\t\t<< output1Format;\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\nindex 6f175758665d..f4e71bab00ed 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n@@ -81,7 +81,7 @@ CameraConfiguration::Status RkISP1Path::validate(StreamConfiguration *cfg)\n \tcfg->bufferCount = RKISP1_BUFFER_COUNT;\n \n \tV4L2DeviceFormat format;\n-\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(cfg->pixelFormat);\n+\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(cfg->pixelFormat)[0];\n \tformat.size = cfg->size;\n \n \tint ret = video_->tryFormat(&format);\n@@ -147,7 +147,7 @@ int RkISP1Path::configure(const StreamConfiguration &config,\n \n \tconst PixelFormatInfo &info = PixelFormatInfo::info(config.pixelFormat);\n \tV4L2DeviceFormat outputFormat;\n-\toutputFormat.fourcc = V4L2PixelFormat::fromPixelFormat(config.pixelFormat);\n+\toutputFormat.fourcc = V4L2PixelFormat::fromPixelFormat(config.pixelFormat)[0];\n \toutputFormat.size = config.size;\n \toutputFormat.planesCount = info.numPlanes();\n \n@@ -156,7 +156,7 @@ int RkISP1Path::configure(const StreamConfiguration &config,\n \t\treturn ret;\n \n \tif (outputFormat.size != config.size ||\n-\t outputFormat.fourcc != V4L2PixelFormat::fromPixelFormat(config.pixelFormat)) {\n+\t outputFormat.fourcc != V4L2PixelFormat::fromPixelFormat(config.pixelFormat)[0]) {\n \t\tLOG(RkISP1, Error)\n \t\t\t<< \"Unable to configure capture in \" << config.toString();\n \t\treturn -EINVAL;\ndiff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp\nindex 77c44fc8714f..490ee5eb4ec4 100644\n--- a/src/libcamera/pipeline/simple/converter.cpp\n+++ b/src/libcamera/pipeline/simple/converter.cpp\n@@ -46,7 +46,7 @@ int SimpleConverter::Stream::configure(const StreamConfiguration &inputCfg,\n \t\t\t\t const StreamConfiguration &outputCfg)\n {\n \tV4L2PixelFormat videoFormat =\n-\t\tV4L2PixelFormat::fromPixelFormat(inputCfg.pixelFormat);\n+\t\tV4L2PixelFormat::fromPixelFormat(inputCfg.pixelFormat)[0];\n \n \tV4L2DeviceFormat format;\n \tformat.fourcc = videoFormat;\n@@ -71,7 +71,7 @@ int SimpleConverter::Stream::configure(const StreamConfiguration &inputCfg,\n \t}\n \n \t/* Set the pixel format and size on the output. */\n-\tvideoFormat = V4L2PixelFormat::fromPixelFormat(outputCfg.pixelFormat);\n+\tvideoFormat = V4L2PixelFormat::fromPixelFormat(outputCfg.pixelFormat)[0];\n \tformat = {};\n \tformat.fourcc = videoFormat;\n \tformat.size = outputCfg.size;\n@@ -210,7 +210,7 @@ std::vector<PixelFormat> SimpleConverter::formats(PixelFormat input)\n \t * enumerate the conversion capabilities on its output (V4L2 capture).\n \t */\n \tV4L2DeviceFormat v4l2Format;\n-\tv4l2Format.fourcc = V4L2PixelFormat::fromPixelFormat(input);\n+\tv4l2Format.fourcc = V4L2PixelFormat::fromPixelFormat(input)[0];\n \tv4l2Format.size = { 1, 1 };\n \n \tint ret = m2m_->output()->setFormat(&v4l2Format);\n@@ -281,7 +281,7 @@ SimpleConverter::strideAndFrameSize(const PixelFormat &pixelFormat,\n \t\t\t\t const Size &size)\n {\n \tV4L2DeviceFormat format;\n-\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(pixelFormat);\n+\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(pixelFormat)[0];\n \tformat.size = size;\n \n \tint ret = m2m_->capture()->tryFormat(&format);\ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex bc0cb1a00c2a..33a7b4e57deb 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -918,7 +918,7 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()\n \t\t\t\treturn Invalid;\n \t\t} else {\n \t\t\tV4L2DeviceFormat format;\n-\t\t\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(cfg.pixelFormat);\n+\t\t\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(cfg.pixelFormat)[0];\n \t\t\tformat.size = cfg.size;\n \n \t\t\tint ret = data_->video_->tryFormat(&format);\n@@ -1028,7 +1028,7 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n \t\treturn ret;\n \n \t/* Configure the video node. */\n-\tV4L2PixelFormat videoFormat = V4L2PixelFormat::fromPixelFormat(pipeConfig->captureFormat);\n+\tV4L2PixelFormat videoFormat = V4L2PixelFormat::fromPixelFormat(pipeConfig->captureFormat)[0];\n \n \tV4L2DeviceFormat captureFormat;\n \tcaptureFormat.fourcc = videoFormat;\ndiff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\nindex 53b2f23ab029..338aff02aff0 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -149,7 +149,7 @@ CameraConfiguration::Status UVCCameraConfiguration::validate()\n \tcfg.bufferCount = 4;\n \n \tV4L2DeviceFormat format;\n-\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(cfg.pixelFormat);\n+\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(cfg.pixelFormat)[0];\n \tformat.size = cfg.size;\n \n \tint ret = data_->video_->tryFormat(&format);\n@@ -205,7 +205,7 @@ int PipelineHandlerUVC::configure(Camera *camera, CameraConfiguration *config)\n \tint ret;\n \n \tV4L2DeviceFormat format;\n-\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(cfg.pixelFormat);\n+\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(cfg.pixelFormat)[0];\n \tformat.size = cfg.size;\n \n \tret = data->video_->setFormat(&format);\n@@ -213,7 +213,7 @@ int PipelineHandlerUVC::configure(Camera *camera, CameraConfiguration *config)\n \t\treturn ret;\n \n \tif (format.size != cfg.size ||\n-\t format.fourcc != V4L2PixelFormat::fromPixelFormat(cfg.pixelFormat))\n+\t format.fourcc != V4L2PixelFormat::fromPixelFormat(cfg.pixelFormat)[0])\n \t\treturn -EINVAL;\n \n \tcfg.setStream(&data->stream_);\ndiff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\nindex 3379ac5cd47d..b88b30fff108 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -171,7 +171,7 @@ CameraConfiguration::Status VimcCameraConfiguration::validate()\n \tcfg.bufferCount = 4;\n \n \tV4L2DeviceFormat format;\n-\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(cfg.pixelFormat);\n+\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(cfg.pixelFormat)[0];\n \tformat.size = cfg.size;\n \n \tint ret = data_->video_->tryFormat(&format);\n@@ -275,7 +275,7 @@ int PipelineHandlerVimc::configure(Camera *camera, CameraConfiguration *config)\n \t\treturn ret;\n \n \tV4L2DeviceFormat format;\n-\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(cfg.pixelFormat);\n+\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(cfg.pixelFormat)[0];\n \tformat.size = cfg.size;\n \n \tret = data->video_->setFormat(&format);\n@@ -283,7 +283,7 @@ int PipelineHandlerVimc::configure(Camera *camera, CameraConfiguration *config)\n \t\treturn ret;\n \n \tif (format.size != cfg.size ||\n-\t format.fourcc != V4L2PixelFormat::fromPixelFormat(cfg.pixelFormat))\n+\t format.fourcc != V4L2PixelFormat::fromPixelFormat(cfg.pixelFormat)[0])\n \t\treturn -EINVAL;\n \n \t/*\n@@ -598,7 +598,7 @@ int VimcCameraData::allocateMockIPABuffers()\n \tconstexpr unsigned int kBufCount = 2;\n \n \tV4L2DeviceFormat format;\n-\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(formats::BGR888);\n+\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(formats::BGR888)[0];\n \tformat.size = Size (160, 120);\n \n \tint ret = video_->setFormat(&format);\ndiff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp\nindex cf6c1858bd1a..7ab63f092a28 100644\n--- a/src/libcamera/v4l2_pixelformat.cpp\n+++ b/src/libcamera/v4l2_pixelformat.cpp\n@@ -302,26 +302,26 @@ PixelFormat V4L2PixelFormat::toPixelFormat() const\n }\n \n /**\n- * \\brief Convert \\a pixelFormat to its corresponding V4L2PixelFormat\n+ * \\brief Convert \\a pixelFormat to a list of 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+ * Multiple V4L2 formats may exist for one PixelFormat. This function returns\n+ * the list of V4L2 formats and distinguish if the format describes contiguous\n+ * or non-contiguous planes as V4L2 defines separate 4CCs for the two variants.\n+ * This function uses the \\a multiplanar argument, defaulted to false,\n+ * to select formats with non-contiguous or contiguous 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+std::vector<V4L2PixelFormat> V4L2PixelFormat::fromPixelFormat(const PixelFormat &pixelFormat,\n+\t\t\t\t\t\t\t bool multiplanar)\n {\n \tconst PixelFormatInfo &info = PixelFormatInfo::info(pixelFormat);\n \tif (!info.isValid())\n-\t\treturn V4L2PixelFormat();\n+\t\treturn {};\n \n-\treturn multiplanar ? info.v4l2Formats.multi[0] : info.v4l2Formats.single[0];\n+\treturn multiplanar ? info.v4l2Formats.multi : info.v4l2Formats.single;\n }\n \n /**\ndiff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp\nindex 26a227da6db2..55ff62cdb430 100644\n--- a/src/v4l2/v4l2_camera_proxy.cpp\n+++ b/src/v4l2/v4l2_camera_proxy.cpp\n@@ -182,7 +182,7 @@ void V4L2CameraProxy::setFmtFromConfig(const StreamConfiguration &streamConfig)\n \n \tv4l2PixFormat_.width = size.width;\n \tv4l2PixFormat_.height = size.height;\n-\tv4l2PixFormat_.pixelformat = V4L2PixelFormat::fromPixelFormat(streamConfig.pixelFormat);\n+\tv4l2PixFormat_.pixelformat = V4L2PixelFormat::fromPixelFormat(streamConfig.pixelFormat)[0];\n \tv4l2PixFormat_.field = V4L2_FIELD_NONE;\n \tv4l2PixFormat_.bytesperline = streamConfig.stride;\n \tv4l2PixFormat_.sizeimage = streamConfig.frameSize;\n@@ -290,7 +290,7 @@ int V4L2CameraProxy::vidioc_enum_fmt(V4L2CameraFile *file, struct v4l2_fmtdesc *\n \t\treturn -EINVAL;\n \n \tPixelFormat format = streamConfig_.formats().pixelformats()[arg->index];\n-\tV4L2PixelFormat v4l2Format = V4L2PixelFormat::fromPixelFormat(format);\n+\tV4L2PixelFormat v4l2Format = V4L2PixelFormat::fromPixelFormat(format)[0];\n \n \targ->flags = format == formats::MJPEG ? V4L2_FMT_FLAG_COMPRESSED : 0;\n \tutils::strlcpy(reinterpret_cast<char *>(arg->description),\n@@ -333,7 +333,7 @@ int V4L2CameraProxy::tryFormat(struct v4l2_format *arg)\n \n \targ->fmt.pix.width = config.size.width;\n \targ->fmt.pix.height = config.size.height;\n-\targ->fmt.pix.pixelformat = V4L2PixelFormat::fromPixelFormat(config.pixelFormat);\n+\targ->fmt.pix.pixelformat = V4L2PixelFormat::fromPixelFormat(config.pixelFormat)[0];\n \targ->fmt.pix.field = V4L2_FIELD_NONE;\n \targ->fmt.pix.bytesperline = config.stride;\n \targ->fmt.pix.sizeimage = config.frameSize;\ndiff --git a/test/libtest/buffer_source.cpp b/test/libtest/buffer_source.cpp\nindex 1b261697279a..84f1169c9f5f 100644\n--- a/test/libtest/buffer_source.cpp\n+++ b/test/libtest/buffer_source.cpp\n@@ -72,7 +72,7 @@ int BufferSource::allocate(const StreamConfiguration &config)\n \t}\n \n \tformat.size = config.size;\n-\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(config.pixelFormat);\n+\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(config.pixelFormat)[0];\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", "3/7" ] }