[{"id":2981,"web_url":"https://patchwork.libcamera.org/comment/2981/","msgid":"<d576ba6e-4194-e2af-7f0c-facf355f58fe@ideasonboard.com>","date":"2019-10-28T11:53:08","subject":"Re: [libcamera-devel] [PATCH v2 6/7] libcamera: v4l2_videodevice:\n\tAdd PixelFormat conversion","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn 28/10/2019 11:02, Laurent Pinchart wrote:\n> From: Jacopo Mondi <jacopo@jmondi.org>\n> \n> In preparation for switching PixelFormat to DRM pixel formats, add\n> helper methods to the V4L2VideoDevice class to translate between DRM\n> pixel formats and V4L2 pixel formats.\n> \n> More work is needed to properly suppor the V4L2 multi-planar (NV[0-9]*M)\n\ns/suppor/support/\n\n> formats.\n> \n> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n\n> ---\n>  src/libcamera/include/v4l2_videodevice.h |   5 +\n>  src/libcamera/v4l2_videodevice.cpp       | 141 +++++++++++++++++++++++\n>  2 files changed, 146 insertions(+)\n> \n> diff --git a/src/libcamera/include/v4l2_videodevice.h b/src/libcamera/include/v4l2_videodevice.h\n> index 4b8cf9394eb9..fdf11b3a6ec9 100644\n> --- a/src/libcamera/include/v4l2_videodevice.h\n> +++ b/src/libcamera/include/v4l2_videodevice.h\n> @@ -13,6 +13,7 @@\n>  #include <linux/videodev2.h>\n>  \n>  #include <libcamera/geometry.h>\n> +#include <libcamera/pixelformats.h>\n\nHrm, seeing this makes me think the include file should be\n\"libcamera/pixelformat.h\"\n\n>  #include <libcamera/signal.h>\n\nBecause we don't call this libcamera/signals.h :D\n\n>  \n>  #include \"formats.h\"\n> @@ -155,6 +156,10 @@ public:\n>  \tstatic V4L2VideoDevice *fromEntityName(const MediaDevice *media,\n>  \t\t\t\t\t       const std::string &entity);\n>  \n> +\tstatic PixelFormat toPixelFormat(uint32_t v4l2Fourcc);\n> +\tuint32_t toV4L2Fourcc(PixelFormat pixelFormat);\n> +\tstatic uint32_t toV4L2Fourcc(PixelFormat pixelFormat, bool multiplanar);\n> +\n>  protected:\n>  \tstd::string logPrefix() const;\n>  \n> diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp\n> index 208ab54199b1..3f2dc2799796 100644\n> --- a/src/libcamera/v4l2_videodevice.cpp\n> +++ b/src/libcamera/v4l2_videodevice.cpp\n> @@ -17,6 +17,8 @@\n>  #include <unistd.h>\n>  #include <vector>\n>  \n> +#include <linux/drm_fourcc.h>\n> +\n>  #include <libcamera/buffer.h>\n>  #include <libcamera/event_notifier.h>\n>  \n> @@ -1234,6 +1236,145 @@ 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(uint32_t v4l2Fourcc)\n> +{\n> +\tswitch (v4l2Fourcc) {\n> +\t/* RGB formats. */\n> +\tcase V4L2_PIX_FMT_RGB24:\n> +\t\treturn DRM_FORMAT_BGR888;\n> +\tcase V4L2_PIX_FMT_BGR24:\n> +\t\treturn DRM_FORMAT_RGB888;\n> +\tcase V4L2_PIX_FMT_ARGB32:\n> +\t\treturn DRM_FORMAT_BGRA8888;\n> +\n> +\t/* YUV packed formats. */\n> +\tcase V4L2_PIX_FMT_YUYV:\n> +\t\treturn DRM_FORMAT_YUYV;\n> +\tcase V4L2_PIX_FMT_YVYU:\n> +\t\treturn DRM_FORMAT_YVYU;\n> +\tcase V4L2_PIX_FMT_UYVY:\n> +\t\treturn DRM_FORMAT_UYVY;\n> +\tcase V4L2_PIX_FMT_VYUY:\n> +\t\treturn DRM_FORMAT_VYUY;\n> +\n> +\t/* YUY planar formats. */\n> +\tcase V4L2_PIX_FMT_NV16:\n> +\tcase V4L2_PIX_FMT_NV16M:\n> +\t\treturn DRM_FORMAT_NV16;\n> +\tcase V4L2_PIX_FMT_NV61:\n> +\tcase V4L2_PIX_FMT_NV61M:\n> +\t\treturn DRM_FORMAT_NV61;\n> +\tcase V4L2_PIX_FMT_NV12:\n> +\tcase V4L2_PIX_FMT_NV12M:\n> +\t\treturn DRM_FORMAT_NV12;\n> +\tcase V4L2_PIX_FMT_NV21:\n> +\tcase V4L2_PIX_FMT_NV21M:\n> +\t\treturn DRM_FORMAT_NV21;\n> +\n> +\t/* Compressed formats. */\n> +\tcase V4L2_PIX_FMT_MJPEG:\n> +\t\treturn DRM_FORMAT_MJPEG;\n> +\n> +\t/* V4L2 formats not yet supported by DRM. */\n> +\tcase V4L2_PIX_FMT_GREY:\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\tLogError).stream()\n> +\t\t\t<< \"Unsupported V4L2 pixel format \"\n> +\t\t\t<< utils::hex(v4l2Fourcc);\n> +\t\treturn 0;\n> +\t}\n> +}\n\nI wonder if these would be more manageable as a table of entries in a\nmap, with a lookup - but I bet there's not much performance benefits\neither way, and it's only ever going to be a (relatively) small table.\n\nPerhaps a future optimisation maybe ...\n\n\n> +\n> +/**\n> + * \\brief Convert \\a PixelFormat to its corresponding V4L2 FourCC\n> + * \\param[in] pixelFormat The PixelFormat to convert\n> + *\n> + * For multiplanar formats, the V4L2 format variant (contiguous or\n> + * non-contiguous planes) is selected automatically based on the capabilities\n> + * of the video device. If the video device supports the V4L2 multiplanar API,\n> + * non-contiguous formats are preferred.\n\nI think that's fine for now.\n\nWe might have issues later if a device uses planar formats even though\nit supports MPLANE, but I can't think of a reason why that would happen\nat the moment, so lets go with this.\n\n\n> + *\n> + * \\return The V4L2_PIX_FMT_* pixel format code corresponding to \\a pixelFormat\n> + */\n> +uint32_t V4L2VideoDevice::toV4L2Fourcc(PixelFormat pixelFormat)\n> +{\n> +\treturn V4L2VideoDevice::toV4L2Fourcc(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> +uint32_t V4L2VideoDevice::toV4L2Fourcc(PixelFormat pixelFormat, bool multiplanar)\n> +{\n> +\tswitch (pixelFormat) {\n> +\t/* RGB formats. */\n> +\tcase DRM_FORMAT_BGR888:\n> +\t\treturn V4L2_PIX_FMT_RGB24;\n> +\tcase DRM_FORMAT_RGB888:\n> +\t\treturn V4L2_PIX_FMT_BGR24;\n> +\tcase DRM_FORMAT_BGRA8888:\n> +\t\treturn V4L2_PIX_FMT_ARGB32;\n> +\n> +\t/* YUV packed formats. */\n> +\tcase DRM_FORMAT_YUYV:\n> +\t\treturn V4L2_PIX_FMT_YUYV;\n> +\tcase DRM_FORMAT_YVYU:\n> +\t\treturn V4L2_PIX_FMT_YVYU;\n> +\tcase DRM_FORMAT_UYVY:\n> +\t\treturn V4L2_PIX_FMT_UYVY;\n> +\tcase DRM_FORMAT_VYUY:\n> +\t\treturn 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 V4L2_PIX_FMT_NV16;\n> +\tcase DRM_FORMAT_NV61:\n> +\t\treturn V4L2_PIX_FMT_NV61;\n> +\tcase DRM_FORMAT_NV12:\n> +\t\treturn V4L2_PIX_FMT_NV12;\n> +\tcase DRM_FORMAT_NV21:\n> +\t\treturn V4L2_PIX_FMT_NV21;\n> +\n> +\t/* Compressed formats. */\n> +\tcase DRM_FORMAT_MJPEG:\n> +\t\treturn 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)(), LogError).stream()\n> +\t\t<< \"Unsupported V4L2 pixel format \"\n> +\t\t<< utils::hex(pixelFormat);\n> +\treturn 0;\n> +}\n> +\n>  /**\n>   * \\class V4L2M2MDevice\n>   * \\brief Memory-to-Memory video device\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 1578E6017F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 28 Oct 2019 12:53:12 +0100 (CET)","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 66E8E325;\n\tMon, 28 Oct 2019 12:53:11 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1572263591;\n\tbh=6V29Dw9cBwqGFenM0ue4BS/pjKck5V6yINJ1yZLcKwQ=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=VHnf2WOEJnCOhtZ7iBfzWQHQ2ApINhOyGuS0/+fFokhLhgcn2m74c7bfqHheK80wj\n\tVpk7Mb9hys0LaPaysmSeehgjXp1blGmQ0VrQrsz/P7278aKmF0LCSoqQ+8h2yel6hz\n\tZN2ZzJ5UarHdJcik4lXFM4DkNffHBbNGBCNrlrSQ=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","References":"<20191028110208.15751-1-laurent.pinchart@ideasonboard.com>\n\t<20191028110208.15751-7-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<d576ba6e-4194-e2af-7f0c-facf355f58fe@ideasonboard.com>","Date":"Mon, 28 Oct 2019 11:53:08 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.8.0","MIME-Version":"1.0","In-Reply-To":"<20191028110208.15751-7-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 6/7] libcamera: v4l2_videodevice:\n\tAdd PixelFormat 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":"Mon, 28 Oct 2019 11:53:12 -0000"}}]