[{"id":4668,"web_url":"https://patchwork.libcamera.org/comment/4668/","msgid":"<43d76850-ca9f-dc5d-6872-ab31d2947c83@ideasonboard.com>","date":"2020-04-30T09:53:40","subject":"Re: [libcamera-devel] [PATCH v2 4/6] libcamera: formats: Expose\n\tPixelFormatInfo as an internal API","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 30/04/2020 04:07, Laurent Pinchart wrote:\n> To prepare for storing more information about pixel formats in\n> PixelFormatInfo, move the class to formats.cpp and document it. The\n> pixel formats database is moved to the same file, and a new static\n> function is added to PixelFormatInfo to retrieve a PixelFormatInfo for a\n> PixelFormat.\n\nPerfect, you addressed my comments before you read them.\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n\nComment lower, Are multiplanar formats broken/unsupported?\n\n\n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> ---\n>  src/libcamera/formats.cpp          | 126 +++++++++++++++++++++++++++++\n>  src/libcamera/include/formats.h    |  15 ++++\n>  src/libcamera/v4l2_pixelformat.cpp |  75 +----------------\n>  3 files changed, 144 insertions(+), 72 deletions(-)\n> \n> diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\n> index 5f6552a4e06c..4a351020b0d9 100644\n> --- a/src/libcamera/formats.cpp\n> +++ b/src/libcamera/formats.cpp\n> @@ -9,6 +9,8 @@\n>  \n>  #include <errno.h>\n>  \n> +#include \"log.h\"\n> +\n>  /**\n>   * \\file formats.h\n>   * \\brief Types and helper methods to handle libcamera image formats\n> @@ -16,6 +18,8 @@\n>  \n>  namespace libcamera {\n>  \n> +LOG_DEFINE_CATEGORY(Formats)\n> +\n>  /**\n>   * \\class ImageFormats\n>   * \\brief Describe V4L2Device and V4L2SubDevice image formats\n> @@ -104,4 +108,126 @@ const std::map<unsigned int, std::vector<SizeRange>> &ImageFormats::data() const\n>  \treturn data_;\n>  }\n>  \n> +/**\n> + * \\class PixelFormatInfo\n> + * \\brief Information about pixel formats\n> + *\n> + * The PixelFormatInfo class groups together information describing a pixel\n> + * format. It facilitates handling of pixel formats by providing data commonly\n> + * used in pipeline handlers.\n> + *\n> + * \\var PixelFormatInfo::format\n> + * \\brief The PixelFormat described by this instance\n> + *\n> + * \\var PixelFormatInfo::v4l2Format\n> + * \\brief The V4L2 pixel format corresponding to the PixelFormat\n> + */\n> +\n> +namespace {\n> +\n> +const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n> +\t/* RGB formats. */\n> +\t{ PixelFormat(DRM_FORMAT_BGR888), {\n> +\t\t.format = PixelFormat(DRM_FORMAT_BGR888),\n> +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_RGB24),\n> +\t} },\n> +\t{ PixelFormat(DRM_FORMAT_RGB888), {\n> +\t\t.format = PixelFormat(DRM_FORMAT_RGB888),\n> +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_BGR24),\n> +\t} },\n> +\t{ PixelFormat(DRM_FORMAT_ABGR8888), {\n> +\t\t.format = PixelFormat(DRM_FORMAT_ABGR8888),\n> +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_RGBA32),\n> +\t} },\n> +\t{ PixelFormat(DRM_FORMAT_ARGB8888), {\n> +\t\t.format = PixelFormat(DRM_FORMAT_ARGB8888),\n> +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_ABGR32),\n> +\t} },\n> +\t{ PixelFormat(DRM_FORMAT_BGRA8888), {\n> +\t\t.format = PixelFormat(DRM_FORMAT_BGRA8888),\n> +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_ARGB32),\n> +\t} },\n> +\t{ PixelFormat(DRM_FORMAT_RGBA8888), {\n> +\t\t.format = PixelFormat(DRM_FORMAT_RGBA8888),\n> +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_BGRA32),\n> +\t} },\n> +\n> +\t/* YUV packed formats. */\n> +\t{ PixelFormat(DRM_FORMAT_YUYV), {\n> +\t\t.format = PixelFormat(DRM_FORMAT_YUYV),\n> +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_YUYV),\n> +\t} },\n> +\t{ PixelFormat(DRM_FORMAT_YVYU), {\n> +\t\t.format = PixelFormat(DRM_FORMAT_YVYU),\n> +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_YVYU),\n> +\t} },\n> +\t{ PixelFormat(DRM_FORMAT_UYVY), {\n> +\t\t.format = PixelFormat(DRM_FORMAT_UYVY),\n> +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_UYVY),\n> +\t} },\n> +\t{ PixelFormat(DRM_FORMAT_VYUY), {\n> +\t\t.format = PixelFormat(DRM_FORMAT_VYUY),\n> +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_VYUY),\n> +\t} },\n> +\n> +\t/* YUV planar formats. */\n> +\t{ PixelFormat(DRM_FORMAT_NV16), {\n> +\t\t.format = PixelFormat(DRM_FORMAT_NV16),\n> +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_NV16),\n> +\t} },\n> +\t{ PixelFormat(DRM_FORMAT_NV61), {\n> +\t\t.format = PixelFormat(DRM_FORMAT_NV61),\n> +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_NV61),\n> +\t} },\n> +\t{ PixelFormat(DRM_FORMAT_NV12), {\n> +\t\t.format = PixelFormat(DRM_FORMAT_NV12),\n> +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_NV12),\n> +\t} },\n> +\t{ PixelFormat(DRM_FORMAT_NV21), {\n> +\t\t.format = PixelFormat(DRM_FORMAT_NV21),\n> +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_NV21),\n> +\t} },\n> +\n> +\t/* Greyscale formats. */\n> +\t{ PixelFormat(DRM_FORMAT_R8), {\n> +\t\t.format = PixelFormat(DRM_FORMAT_R8),\n> +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_GREY),\n> +\t} },\n> +\n> +\t/* Compressed formats. */\n> +\t{ PixelFormat(DRM_FORMAT_MJPEG), {\n> +\t\t.format = PixelFormat(DRM_FORMAT_MJPEG),\n> +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_MJPEG),\n> +\t} },\n> +};\n> +\n> +} /* namespace */\n> +\n> +/**\n> + * \\fn bool PixelFormatInfo::isValid() const\n> + * \\brief Check if the pixel format info is valid\n> + * \\return True if the pixel format info is valid, false otherwise\n> + */\n> +\n> +/**\n> + * \\brief Retrieve information about a pixel format\n> + * \\param[in] format The pixel format\n> + * \\return The PixelFormatInfo describing the \\a format if known, or an invalid\n> + * PixelFormatInfo otherwise\n> + */\n> +const PixelFormatInfo &PixelFormatInfo::info(const PixelFormat &format)\n> +{\n> +\tstatic const PixelFormatInfo invalid{};\n> +\n> +\tconst auto iter = pixelFormatInfo.find(format);\n> +\tif (iter == pixelFormatInfo.end()) {\n> +\t\tLOG(Formats, Warning)\n> +\t\t\t<< \"Unsupported pixel format \"\n> +\t\t\t<< format.toString();\n> +\t\treturn invalid;\n> +\t}\n> +\n> +\treturn iter->second;\n> +}\n> +\n>  } /* namespace libcamera */\n> diff --git a/src/libcamera/include/formats.h b/src/libcamera/include/formats.h\n> index f43bc8c004f6..560df07c4451 100644\n> --- a/src/libcamera/include/formats.h\n> +++ b/src/libcamera/include/formats.h\n> @@ -12,6 +12,9 @@\n>  #include <vector>\n>  \n>  #include <libcamera/geometry.h>\n> +#include <libcamera/pixelformats.h>\n> +\n> +#include \"v4l2_pixelformat.h\"\n>  \n>  namespace libcamera {\n>  \n> @@ -29,6 +32,18 @@ private:\n>  \tstd::map<unsigned int, std::vector<SizeRange>> data_;\n>  };\n>  \n> +class PixelFormatInfo\n> +{\n> +public:\n> +\tbool isValid() const { return format.isValid(); }\n> +\n> +\tstatic const PixelFormatInfo &info(const PixelFormat &format);\n> +\n> +\t/* \\todo Add support for non-contiguous memory planes */\n> +\tPixelFormat format;\n> +\tV4L2PixelFormat v4l2Format;\n> +};\n> +\n>  } /* namespace libcamera */\n>  \n>  #endif /* __LIBCAMERA_FORMATS_H__ */\n> diff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp\n> index e1c96b9862c3..580c0fc9d983 100644\n> --- a/src/libcamera/v4l2_pixelformat.cpp\n> +++ b/src/libcamera/v4l2_pixelformat.cpp\n> @@ -16,6 +16,7 @@\n>  \n>  #include <libcamera/pixelformats.h>\n>  \n> +#include \"formats.h\"\n>  #include \"log.h\"\n>  \n>  /**\n> @@ -43,71 +44,6 @@ LOG_DECLARE_CATEGORY(V4L2)\n>  \n>  namespace {\n>  \n> -struct PixelFormatInfo {\n> -\t/* \\todo Add support for non-contiguous memory planes */\n> -\tV4L2PixelFormat v4l2Format;\n> -};\n> -\n> -const std::map<PixelFormat, PixelFormatInfo> pf2vpf{\n> -\t/* RGB formats. */\n> -\t{ PixelFormat(DRM_FORMAT_BGR888), {\n> -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_RGB24),\n> -\t} },\n> -\t{ PixelFormat(DRM_FORMAT_RGB888), {\n> -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_BGR24),\n> -\t} },\n> -\t{ PixelFormat(DRM_FORMAT_ABGR8888), {\n> -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_RGBA32),\n> -\t} },\n> -\t{ PixelFormat(DRM_FORMAT_ARGB8888), {\n> -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_ABGR32),\n> -\t} },\n> -\t{ PixelFormat(DRM_FORMAT_BGRA8888), {\n> -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_ARGB32),\n> -\t} },\n> -\t{ PixelFormat(DRM_FORMAT_RGBA8888), {\n> -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_BGRA32),\n> -\t} },\n> -\n> -\t/* YUV packed formats. */\n> -\t{ PixelFormat(DRM_FORMAT_YUYV), {\n> -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_YUYV),\n> -\t} },\n> -\t{ PixelFormat(DRM_FORMAT_YVYU), {\n> -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_YVYU),\n> -\t} },\n> -\t{ PixelFormat(DRM_FORMAT_UYVY), {\n> -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_UYVY),\n> -\t} },\n> -\t{ PixelFormat(DRM_FORMAT_VYUY), {\n> -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_VYUY),\n> -\t} },\n> -\n> -\t/* YUV planar formats. */\n> -\t{ PixelFormat(DRM_FORMAT_NV16), {\n> -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_NV16),\n> -\t} },\n> -\t{ PixelFormat(DRM_FORMAT_NV61), {\n> -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_NV61),\n> -\t} },\n> -\t{ PixelFormat(DRM_FORMAT_NV12), {\n> -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_NV12),\n> -\t} },\n> -\t{ PixelFormat(DRM_FORMAT_NV21), {\n> -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_NV21),\n> -\t} },\n> -\n> -\t/* Greyscale formats. */\n> -\t{ PixelFormat(DRM_FORMAT_R8), {\n> -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_GREY),\n> -\t} },\n> -\n> -\t/* Compressed formats. */\n> -\t{ PixelFormat(DRM_FORMAT_MJPEG), {\n> -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_MJPEG),\n> -\t} },\n> -};\n> -\n>  const std::map<V4L2PixelFormat, PixelFormat> vpf2pf{\n>  \t/* RGB formats. */\n>  \t{ V4L2PixelFormat(V4L2_PIX_FMT_RGB24), PixelFormat(DRM_FORMAT_BGR888) },\n> @@ -233,15 +169,10 @@ PixelFormat V4L2PixelFormat::toPixelFormat() const\n>  V4L2PixelFormat V4L2PixelFormat::fromPixelFormat(const PixelFormat &pixelFormat,\n>  \t\t\t\t\t\t bool multiplanar)\n>  {\n> -\tconst auto iter = pf2vpf.find(pixelFormat);\n> -\tif (iter == pf2vpf.end()) {\n> -\t\tLOG(V4L2, Warning)\n> -\t\t\t<< \"Unsupported pixel format \"\n> -\t\t\t<< pixelFormat.toString();\n> +\tconst PixelFormatInfo &info = PixelFormatInfo::info(pixelFormat);\n> +\tif (!info.isValid())\n>  \t\treturn V4L2PixelFormat();\n> -\t}\n>  \n> -\tconst PixelFormatInfo &info = iter->second;\n\nIsn't this failing to take bool multiplanar into consideration?\n\n>  \treturn info.v4l2Format;\n>  }\n>  \n>","headers":{"Return-Path":"<kieran.bingham@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 95987603F3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 30 Apr 2020 11:53:44 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 183E9503;\n\tThu, 30 Apr 2020 11:53:44 +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=\"prsOo4uE\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1588240424;\n\tbh=ioMm4OMDMWFRsqzoqhBhnXOg6kxZZ8gKBYnJ0WnHYk8=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=prsOo4uE95VDICKgxOh6W0ltRbnexwN/8nKjGZ5h9YzWAi+sAceUuKax+XqSLlyJO\n\tot4t0TQMtUJPoadmd46fi0jPZ8vO0Os1hhw6R4sfJhIn/xN68eDq6CvIeZej5QOTCn\n\tuIl3F7QTXw1BrxIxWHR6FV+1xrbDuRDgI3/LOqZg=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200430030723.8908-1-laurent.pinchart@ideasonboard.com>\n\t<20200430030723.8908-5-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<43d76850-ca9f-dc5d-6872-ab31d2947c83@ideasonboard.com>","Date":"Thu, 30 Apr 2020 10:53:40 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.7.0","MIME-Version":"1.0","In-Reply-To":"<20200430030723.8908-5-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH v2 4/6] libcamera: formats: Expose\n\tPixelFormatInfo as an internal API","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 09:53:44 -0000"}},{"id":4671,"web_url":"https://patchwork.libcamera.org/comment/4671/","msgid":"<20200430115940.GE5856@pendragon.ideasonboard.com>","date":"2020-04-30T11:59:40","subject":"Re: [libcamera-devel] [PATCH v2 4/6] libcamera: formats: Expose\n\tPixelFormatInfo as an internal API","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nOn Thu, Apr 30, 2020 at 10:53:40AM +0100, Kieran Bingham wrote:\n> On 30/04/2020 04:07, Laurent Pinchart wrote:\n> > To prepare for storing more information about pixel formats in\n> > PixelFormatInfo, move the class to formats.cpp and document it. The\n> > pixel formats database is moved to the same file, and a new static\n> > function is added to PixelFormatInfo to retrieve a PixelFormatInfo for a\n> > PixelFormat.\n> \n> Perfect, you addressed my comments before you read them.\n> \n> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> \n> Comment lower, Are multiplanar formats broken/unsupported?\n> \n> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> > ---\n> >  src/libcamera/formats.cpp          | 126 +++++++++++++++++++++++++++++\n> >  src/libcamera/include/formats.h    |  15 ++++\n> >  src/libcamera/v4l2_pixelformat.cpp |  75 +----------------\n> >  3 files changed, 144 insertions(+), 72 deletions(-)\n> > \n> > diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\n> > index 5f6552a4e06c..4a351020b0d9 100644\n> > --- a/src/libcamera/formats.cpp\n> > +++ b/src/libcamera/formats.cpp\n> > @@ -9,6 +9,8 @@\n> >  \n> >  #include <errno.h>\n> >  \n> > +#include \"log.h\"\n> > +\n> >  /**\n> >   * \\file formats.h\n> >   * \\brief Types and helper methods to handle libcamera image formats\n> > @@ -16,6 +18,8 @@\n> >  \n> >  namespace libcamera {\n> >  \n> > +LOG_DEFINE_CATEGORY(Formats)\n> > +\n> >  /**\n> >   * \\class ImageFormats\n> >   * \\brief Describe V4L2Device and V4L2SubDevice image formats\n> > @@ -104,4 +108,126 @@ const std::map<unsigned int, std::vector<SizeRange>> &ImageFormats::data() const\n> >  \treturn data_;\n> >  }\n> >  \n> > +/**\n> > + * \\class PixelFormatInfo\n> > + * \\brief Information about pixel formats\n> > + *\n> > + * The PixelFormatInfo class groups together information describing a pixel\n> > + * format. It facilitates handling of pixel formats by providing data commonly\n> > + * used in pipeline handlers.\n> > + *\n> > + * \\var PixelFormatInfo::format\n> > + * \\brief The PixelFormat described by this instance\n> > + *\n> > + * \\var PixelFormatInfo::v4l2Format\n> > + * \\brief The V4L2 pixel format corresponding to the PixelFormat\n> > + */\n> > +\n> > +namespace {\n> > +\n> > +const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n> > +\t/* RGB formats. */\n> > +\t{ PixelFormat(DRM_FORMAT_BGR888), {\n> > +\t\t.format = PixelFormat(DRM_FORMAT_BGR888),\n> > +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_RGB24),\n> > +\t} },\n> > +\t{ PixelFormat(DRM_FORMAT_RGB888), {\n> > +\t\t.format = PixelFormat(DRM_FORMAT_RGB888),\n> > +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_BGR24),\n> > +\t} },\n> > +\t{ PixelFormat(DRM_FORMAT_ABGR8888), {\n> > +\t\t.format = PixelFormat(DRM_FORMAT_ABGR8888),\n> > +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_RGBA32),\n> > +\t} },\n> > +\t{ PixelFormat(DRM_FORMAT_ARGB8888), {\n> > +\t\t.format = PixelFormat(DRM_FORMAT_ARGB8888),\n> > +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_ABGR32),\n> > +\t} },\n> > +\t{ PixelFormat(DRM_FORMAT_BGRA8888), {\n> > +\t\t.format = PixelFormat(DRM_FORMAT_BGRA8888),\n> > +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_ARGB32),\n> > +\t} },\n> > +\t{ PixelFormat(DRM_FORMAT_RGBA8888), {\n> > +\t\t.format = PixelFormat(DRM_FORMAT_RGBA8888),\n> > +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_BGRA32),\n> > +\t} },\n> > +\n> > +\t/* YUV packed formats. */\n> > +\t{ PixelFormat(DRM_FORMAT_YUYV), {\n> > +\t\t.format = PixelFormat(DRM_FORMAT_YUYV),\n> > +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_YUYV),\n> > +\t} },\n> > +\t{ PixelFormat(DRM_FORMAT_YVYU), {\n> > +\t\t.format = PixelFormat(DRM_FORMAT_YVYU),\n> > +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_YVYU),\n> > +\t} },\n> > +\t{ PixelFormat(DRM_FORMAT_UYVY), {\n> > +\t\t.format = PixelFormat(DRM_FORMAT_UYVY),\n> > +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_UYVY),\n> > +\t} },\n> > +\t{ PixelFormat(DRM_FORMAT_VYUY), {\n> > +\t\t.format = PixelFormat(DRM_FORMAT_VYUY),\n> > +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_VYUY),\n> > +\t} },\n> > +\n> > +\t/* YUV planar formats. */\n> > +\t{ PixelFormat(DRM_FORMAT_NV16), {\n> > +\t\t.format = PixelFormat(DRM_FORMAT_NV16),\n> > +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_NV16),\n> > +\t} },\n> > +\t{ PixelFormat(DRM_FORMAT_NV61), {\n> > +\t\t.format = PixelFormat(DRM_FORMAT_NV61),\n> > +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_NV61),\n> > +\t} },\n> > +\t{ PixelFormat(DRM_FORMAT_NV12), {\n> > +\t\t.format = PixelFormat(DRM_FORMAT_NV12),\n> > +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_NV12),\n> > +\t} },\n> > +\t{ PixelFormat(DRM_FORMAT_NV21), {\n> > +\t\t.format = PixelFormat(DRM_FORMAT_NV21),\n> > +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_NV21),\n> > +\t} },\n> > +\n> > +\t/* Greyscale formats. */\n> > +\t{ PixelFormat(DRM_FORMAT_R8), {\n> > +\t\t.format = PixelFormat(DRM_FORMAT_R8),\n> > +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_GREY),\n> > +\t} },\n> > +\n> > +\t/* Compressed formats. */\n> > +\t{ PixelFormat(DRM_FORMAT_MJPEG), {\n> > +\t\t.format = PixelFormat(DRM_FORMAT_MJPEG),\n> > +\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_MJPEG),\n> > +\t} },\n> > +};\n> > +\n> > +} /* namespace */\n> > +\n> > +/**\n> > + * \\fn bool PixelFormatInfo::isValid() const\n> > + * \\brief Check if the pixel format info is valid\n> > + * \\return True if the pixel format info is valid, false otherwise\n> > + */\n> > +\n> > +/**\n> > + * \\brief Retrieve information about a pixel format\n> > + * \\param[in] format The pixel format\n> > + * \\return The PixelFormatInfo describing the \\a format if known, or an invalid\n> > + * PixelFormatInfo otherwise\n> > + */\n> > +const PixelFormatInfo &PixelFormatInfo::info(const PixelFormat &format)\n> > +{\n> > +\tstatic const PixelFormatInfo invalid{};\n> > +\n> > +\tconst auto iter = pixelFormatInfo.find(format);\n> > +\tif (iter == pixelFormatInfo.end()) {\n> > +\t\tLOG(Formats, Warning)\n> > +\t\t\t<< \"Unsupported pixel format \"\n> > +\t\t\t<< format.toString();\n> > +\t\treturn invalid;\n> > +\t}\n> > +\n> > +\treturn iter->second;\n> > +}\n> > +\n> >  } /* namespace libcamera */\n> > diff --git a/src/libcamera/include/formats.h b/src/libcamera/include/formats.h\n> > index f43bc8c004f6..560df07c4451 100644\n> > --- a/src/libcamera/include/formats.h\n> > +++ b/src/libcamera/include/formats.h\n> > @@ -12,6 +12,9 @@\n> >  #include <vector>\n> >  \n> >  #include <libcamera/geometry.h>\n> > +#include <libcamera/pixelformats.h>\n> > +\n> > +#include \"v4l2_pixelformat.h\"\n> >  \n> >  namespace libcamera {\n> >  \n> > @@ -29,6 +32,18 @@ private:\n> >  \tstd::map<unsigned int, std::vector<SizeRange>> data_;\n> >  };\n> >  \n> > +class PixelFormatInfo\n> > +{\n> > +public:\n> > +\tbool isValid() const { return format.isValid(); }\n> > +\n> > +\tstatic const PixelFormatInfo &info(const PixelFormat &format);\n> > +\n> > +\t/* \\todo Add support for non-contiguous memory planes */\n> > +\tPixelFormat format;\n> > +\tV4L2PixelFormat v4l2Format;\n> > +};\n> > +\n> >  } /* namespace libcamera */\n> >  \n> >  #endif /* __LIBCAMERA_FORMATS_H__ */\n> > diff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp\n> > index e1c96b9862c3..580c0fc9d983 100644\n> > --- a/src/libcamera/v4l2_pixelformat.cpp\n> > +++ b/src/libcamera/v4l2_pixelformat.cpp\n> > @@ -16,6 +16,7 @@\n> >  \n> >  #include <libcamera/pixelformats.h>\n> >  \n> > +#include \"formats.h\"\n> >  #include \"log.h\"\n> >  \n> >  /**\n> > @@ -43,71 +44,6 @@ LOG_DECLARE_CATEGORY(V4L2)\n> >  \n> >  namespace {\n> >  \n> > -struct PixelFormatInfo {\n> > -\t/* \\todo Add support for non-contiguous memory planes */\n> > -\tV4L2PixelFormat v4l2Format;\n> > -};\n> > -\n> > -const std::map<PixelFormat, PixelFormatInfo> pf2vpf{\n> > -\t/* RGB formats. */\n> > -\t{ PixelFormat(DRM_FORMAT_BGR888), {\n> > -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_RGB24),\n> > -\t} },\n> > -\t{ PixelFormat(DRM_FORMAT_RGB888), {\n> > -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_BGR24),\n> > -\t} },\n> > -\t{ PixelFormat(DRM_FORMAT_ABGR8888), {\n> > -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_RGBA32),\n> > -\t} },\n> > -\t{ PixelFormat(DRM_FORMAT_ARGB8888), {\n> > -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_ABGR32),\n> > -\t} },\n> > -\t{ PixelFormat(DRM_FORMAT_BGRA8888), {\n> > -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_ARGB32),\n> > -\t} },\n> > -\t{ PixelFormat(DRM_FORMAT_RGBA8888), {\n> > -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_BGRA32),\n> > -\t} },\n> > -\n> > -\t/* YUV packed formats. */\n> > -\t{ PixelFormat(DRM_FORMAT_YUYV), {\n> > -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_YUYV),\n> > -\t} },\n> > -\t{ PixelFormat(DRM_FORMAT_YVYU), {\n> > -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_YVYU),\n> > -\t} },\n> > -\t{ PixelFormat(DRM_FORMAT_UYVY), {\n> > -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_UYVY),\n> > -\t} },\n> > -\t{ PixelFormat(DRM_FORMAT_VYUY), {\n> > -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_VYUY),\n> > -\t} },\n> > -\n> > -\t/* YUV planar formats. */\n> > -\t{ PixelFormat(DRM_FORMAT_NV16), {\n> > -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_NV16),\n> > -\t} },\n> > -\t{ PixelFormat(DRM_FORMAT_NV61), {\n> > -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_NV61),\n> > -\t} },\n> > -\t{ PixelFormat(DRM_FORMAT_NV12), {\n> > -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_NV12),\n> > -\t} },\n> > -\t{ PixelFormat(DRM_FORMAT_NV21), {\n> > -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_NV21),\n> > -\t} },\n> > -\n> > -\t/* Greyscale formats. */\n> > -\t{ PixelFormat(DRM_FORMAT_R8), {\n> > -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_GREY),\n> > -\t} },\n> > -\n> > -\t/* Compressed formats. */\n> > -\t{ PixelFormat(DRM_FORMAT_MJPEG), {\n> > -\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_MJPEG),\n> > -\t} },\n> > -};\n> > -\n> >  const std::map<V4L2PixelFormat, PixelFormat> vpf2pf{\n> >  \t/* RGB formats. */\n> >  \t{ V4L2PixelFormat(V4L2_PIX_FMT_RGB24), PixelFormat(DRM_FORMAT_BGR888) },\n> > @@ -233,15 +169,10 @@ PixelFormat V4L2PixelFormat::toPixelFormat() const\n> >  V4L2PixelFormat V4L2PixelFormat::fromPixelFormat(const PixelFormat &pixelFormat,\n> >  \t\t\t\t\t\t bool multiplanar)\n> >  {\n> > -\tconst auto iter = pf2vpf.find(pixelFormat);\n> > -\tif (iter == pf2vpf.end()) {\n> > -\t\tLOG(V4L2, Warning)\n> > -\t\t\t<< \"Unsupported pixel format \"\n> > -\t\t\t<< pixelFormat.toString();\n> > +\tconst PixelFormatInfo &info = PixelFormatInfo::info(pixelFormat);\n> > +\tif (!info.isValid())\n> >  \t\treturn V4L2PixelFormat();\n> > -\t}\n> >  \n> > -\tconst PixelFormatInfo &info = iter->second;\n> \n> Isn't this failing to take bool multiplanar into consideration?\n\nIt does, because we don't support it yet :-) That's the case today\nalready, so it's not a regression. The todo is moved to PixelFormatInfo\nto track this.\n\n> >  \treturn info.v4l2Format;\n> >  }\n> >","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 5E7EE613F3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 30 Apr 2020 13:59:42 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id CAD65321;\n\tThu, 30 Apr 2020 13:59:41 +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=\"O9SimvpP\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1588247982;\n\tbh=9rjGCZPDYSOrtNiAw0RZ3pr33O0x6KAy8LMZn8mB4/Q=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=O9SimvpPSJpO8AvRsQ67dm/M/0zZkjvCebzfp2Vg37LJx0BXZyhKj17VELc/9Cwjn\n\tpQsyRoxzSA8OJsnfxCfY2VD+4pJRkdv9UqrO0m2RYJeF5wwn5sAV98uue703ti6CT1\n\tpV2pqjDmLdar8FsFBzSdoW8wF9IDQSnkETR7IAxQ=","Date":"Thu, 30 Apr 2020 14:59:40 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200430115940.GE5856@pendragon.ideasonboard.com>","References":"<20200430030723.8908-1-laurent.pinchart@ideasonboard.com>\n\t<20200430030723.8908-5-laurent.pinchart@ideasonboard.com>\n\t<43d76850-ca9f-dc5d-6872-ab31d2947c83@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<43d76850-ca9f-dc5d-6872-ab31d2947c83@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 4/6] libcamera: formats: Expose\n\tPixelFormatInfo as an internal API","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 11:59:42 -0000"}}]