{"id":2518,"url":"https://patchwork.libcamera.org/api/patches/2518/?format=json","web_url":"https://patchwork.libcamera.org/patch/2518/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200106161417.19150-5-laurent.pinchart@ideasonboard.com>","date":"2020-01-06T16:14:17","name":"[libcamera-devel,4/4] v4l2: camera_proxy: Create format info array","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"a9d57f60d374ab94eb74dd937c468e46da342d00","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2518/mbox/","series":[{"id":604,"url":"https://patchwork.libcamera.org/api/series/604/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=604","date":"2020-01-06T16:14:13","name":"v4l2: Miscellaneous improvements","version":1,"mbox":"https://patchwork.libcamera.org/series/604/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2518/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2518/checks/","tags":{},"headers":{"Return-Path":"<laurent.pinchart@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 6212A60463\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon,  6 Jan 2020 17:14:32 +0100 (CET)","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 F3DC252F;\n\tMon,  6 Jan 2020 17:14:31 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1578327272;\n\tbh=GuyLiI0Bdoy/6G7Asr8JP9/Nb+Pf5u1HOl6PW4PJQLc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=D94CvEoyp6GTuHo/MD9ymYXyDRwfgL+UdOX7QXshepfBZHo8wnswpHuxFbIXfbshF\n\te2xS61/cxwzawVvtuOR4oYh3rkGkx/oDkBRdQ4Akg9/Ol+ohAUDWjvx8irFvOMwDSF\n\tduq8MSzWBx584o0oi90ajSdinMqrHbW+wcujouXY=","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"libcamera-devel@lists.libcamera.org","Date":"Mon,  6 Jan 2020 18:14:17 +0200","Message-Id":"<20200106161417.19150-5-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20200106161417.19150-1-laurent.pinchart@ideasonboard.com>","References":"<20200106161417.19150-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 4/4] v4l2: camera_proxy: Create format\n\tinfo array","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, 06 Jan 2020 16:14:32 -0000"},"content":"Create a PixelFormatInfo structure to store information about a format,\nand add a global array of format info for all the formats currently\nsupported. Move the format helpers to use the information from the\narray.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/v4l2/v4l2_camera_proxy.cpp | 180 +++++++++++++--------------------\n 1 file changed, 70 insertions(+), 110 deletions(-)","diff":"diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp\nindex 6a222d702e13..b8c1a53af1c2 100644\n--- a/src/v4l2/v4l2_camera_proxy.cpp\n+++ b/src/v4l2/v4l2_camera_proxy.cpp\n@@ -509,134 +509,94 @@ int V4L2CameraProxy::ioctl(unsigned long request, void *arg)\n \treturn ret;\n }\n \n+struct PixelFormatPlaneInfo {\n+\tunsigned int bitsPerPixel;\n+\tunsigned int hSubSampling;\n+\tunsigned int vSubSampling;\n+};\n+\n+struct PixelFormatInfo {\n+\tPixelFormat format;\n+\tuint32_t v4l2Format;\n+\tunsigned int numPlanes;\n+\tstd::array<PixelFormatPlaneInfo, 3> planes;\n+};\n+\n+namespace {\n+\n+constexpr std::array<PixelFormatInfo, 13> pixelFormatInfo = {{\n+\t/* RGB formats. */\n+\t{ DRM_FORMAT_RGB888,\tV4L2_PIX_FMT_BGR24,\t1, {{ { 24, 1, 1 }, {  0, 0, 0 }, {  0, 0, 0 } }} },\n+\t{ DRM_FORMAT_BGR888,\tV4L2_PIX_FMT_RGB24,\t1, {{ { 24, 1, 1 }, {  0, 0, 0 }, {  0, 0, 0 } }} },\n+\t{ DRM_FORMAT_BGRA8888,\tV4L2_PIX_FMT_ARGB32,\t1, {{ { 32, 1, 1 }, {  0, 0, 0 }, {  0, 0, 0 } }} },\n+\t/* YUV packed formats. */\n+\t{ DRM_FORMAT_UYVY,\tV4L2_PIX_FMT_UYVY,\t1, {{ { 16, 1, 1 }, {  0, 0, 0 }, {  0, 0, 0 } }} },\n+\t{ DRM_FORMAT_VYUY,\tV4L2_PIX_FMT_VYUY,\t1, {{ { 16, 1, 1 }, {  0, 0, 0 }, {  0, 0, 0 } }} },\n+\t{ DRM_FORMAT_YUYV,\tV4L2_PIX_FMT_YUYV,\t1, {{ { 16, 1, 1 }, {  0, 0, 0 }, {  0, 0, 0 } }} },\n+\t{ DRM_FORMAT_YVYU,\tV4L2_PIX_FMT_YVYU,\t1, {{ { 16, 1, 1 }, {  0, 0, 0 }, {  0, 0, 0 } }} },\n+\t/* YUY planar formats. */\n+\t{ DRM_FORMAT_NV12,\tV4L2_PIX_FMT_NV12,\t2, {{ {  8, 1, 1 }, { 16, 2, 2 }, {  0, 0, 0 } }} },\n+\t{ DRM_FORMAT_NV21,\tV4L2_PIX_FMT_NV21,\t2, {{ {  8, 1, 1 }, { 16, 2, 2 }, {  0, 0, 0 } }} },\n+\t{ DRM_FORMAT_NV16,\tV4L2_PIX_FMT_NV16,\t2, {{ {  8, 1, 1 }, { 16, 2, 1 }, {  0, 0, 0 } }} },\n+\t{ DRM_FORMAT_NV61,\tV4L2_PIX_FMT_NV61,\t2, {{ {  8, 1, 1 }, { 16, 2, 1 }, {  0, 0, 0 } }} },\n+\t{ DRM_FORMAT_NV24,\tV4L2_PIX_FMT_NV24,\t2, {{ {  8, 1, 1 }, { 16, 2, 1 }, {  0, 0, 0 } }} },\n+\t{ DRM_FORMAT_NV42,\tV4L2_PIX_FMT_NV42,\t2, {{ {  8, 1, 1 }, { 16, 1, 1 }, {  0, 0, 0 } }} },\n+}};\n+\n+} /* namespace */\n+\n /* \\todo make libcamera export these */\n unsigned int V4L2CameraProxy::bplMultiplier(uint32_t format)\n {\n-\tswitch (format) {\n-\tcase V4L2_PIX_FMT_NV12:\n-\tcase V4L2_PIX_FMT_NV21:\n-\tcase V4L2_PIX_FMT_NV16:\n-\tcase V4L2_PIX_FMT_NV61:\n-\tcase V4L2_PIX_FMT_NV24:\n-\tcase V4L2_PIX_FMT_NV42:\n-\t\treturn 1;\n-\tcase V4L2_PIX_FMT_BGR24:\n-\tcase V4L2_PIX_FMT_RGB24:\n-\t\treturn 3;\n-\tcase V4L2_PIX_FMT_ARGB32:\n-\t\treturn 4;\n-\tcase V4L2_PIX_FMT_VYUY:\n-\tcase V4L2_PIX_FMT_YVYU:\n-\tcase V4L2_PIX_FMT_UYVY:\n-\tcase V4L2_PIX_FMT_YUYV:\n-\t\treturn 2;\n-\tdefault:\n+\tauto info = std::find_if(pixelFormatInfo.begin(), pixelFormatInfo.end(),\n+\t\t\t\t [format](const PixelFormatInfo &info) {\n+\t\t\t\t\t return info.v4l2Format == format;\n+\t\t\t\t });\n+\tif (info == pixelFormatInfo.end())\n \t\treturn 0;\n-\t};\n+\n+\treturn info->planes[0].bitsPerPixel / 8;\n }\n \n unsigned int V4L2CameraProxy::imageSize(uint32_t format, unsigned int width,\n \t\t\t\t\tunsigned int height)\n {\n-\tswitch (format) {\n-\tcase V4L2_PIX_FMT_NV12:\n-\tcase V4L2_PIX_FMT_NV21:\n-\t\treturn width * height * 3 / 2;\n-\tcase V4L2_PIX_FMT_NV16:\n-\tcase V4L2_PIX_FMT_NV61:\n-\t\treturn width * height * 2;\n-\tcase V4L2_PIX_FMT_NV24:\n-\tcase V4L2_PIX_FMT_NV42:\n-\t\treturn width * height * 3;\n-\tcase V4L2_PIX_FMT_BGR24:\n-\tcase V4L2_PIX_FMT_RGB24:\n-\t\treturn width * height * 3;\n-\tcase V4L2_PIX_FMT_ARGB32:\n-\t\treturn width * height * 4;\n-\tcase V4L2_PIX_FMT_VYUY:\n-\tcase V4L2_PIX_FMT_YVYU:\n-\tcase V4L2_PIX_FMT_UYVY:\n-\tcase V4L2_PIX_FMT_YUYV:\n-\t\treturn width * height * 2;\n-\tdefault:\n+\tauto info = std::find_if(pixelFormatInfo.begin(), pixelFormatInfo.end(),\n+\t\t\t\t [format](const PixelFormatInfo &info) {\n+\t\t\t\t\t return info.v4l2Format == format;\n+\t\t\t\t });\n+\tif (info == pixelFormatInfo.end())\n \t\treturn 0;\n-\t};\n+\n+\tunsigned int multiplier = 0;\n+\tfor (unsigned int i = 0; i < info->numPlanes; ++i)\n+\t\tmultiplier += info->planes[i].bitsPerPixel\n+\t\t\t    / info->planes[i].hSubSampling\n+\t\t\t    / info->planes[i].vSubSampling;\n+\n+\treturn width * height * multiplier / 8;\n }\n \n PixelFormat V4L2CameraProxy::v4l2ToDrm(uint32_t format)\n {\n-\tswitch (format) {\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-\t\treturn DRM_FORMAT_NV16;\n-\tcase V4L2_PIX_FMT_NV61:\n-\t\treturn DRM_FORMAT_NV61;\n-\tcase V4L2_PIX_FMT_NV12:\n-\t\treturn DRM_FORMAT_NV12;\n-\tcase V4L2_PIX_FMT_NV21:\n-\t\treturn DRM_FORMAT_NV21;\n-\tcase V4L2_PIX_FMT_NV24:\n-\t\treturn DRM_FORMAT_NV24;\n-\tcase V4L2_PIX_FMT_NV42:\n-\t\treturn DRM_FORMAT_NV42;\n-\tdefault:\n+\tauto info = std::find_if(pixelFormatInfo.begin(), pixelFormatInfo.end(),\n+\t\t\t\t [format](const PixelFormatInfo &info) {\n+\t\t\t\t\t return info.v4l2Format == format;\n+\t\t\t\t });\n+\tif (info == pixelFormatInfo.end())\n \t\treturn format;\n-\t};\n+\n+\treturn info->format;\n }\n \n uint32_t V4L2CameraProxy::drmToV4L2(PixelFormat format)\n {\n-\tswitch (format) {\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/* YUY planar formats. */\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-\tcase DRM_FORMAT_NV24:\n-\t\treturn V4L2_PIX_FMT_NV24;\n-\tcase DRM_FORMAT_NV42:\n-\t\treturn V4L2_PIX_FMT_NV42;\n-\tdefault:\n+\tauto info = std::find_if(pixelFormatInfo.begin(), pixelFormatInfo.end(),\n+\t\t\t\t [format](const PixelFormatInfo &info) {\n+\t\t\t\t\t return info.format == format;\n+\t\t\t\t });\n+\tif (info == pixelFormatInfo.end())\n \t\treturn format;\n-\t}\n+\n+\treturn info->v4l2Format;\n }\n","prefixes":["libcamera-devel","4/4"]}