{"id":2714,"url":"https://patchwork.libcamera.org/api/patches/2714/?format=json","web_url":"https://patchwork.libcamera.org/patch/2714/","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":"<20200120173816.31829-3-laurent.pinchart@ideasonboard.com>","date":"2020-01-20T17:38:15","name":"[libcamera-devel,2/3] libcamera: Use utils::make_array()","commit_ref":null,"pull_url":null,"state":"rfc","archived":false,"hash":"6556947632aa15d338b2e75ba7065d3d6c1a2c87","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":{"id":14,"url":"https://patchwork.libcamera.org/api/users/14/?format=json","username":"pinchartl","first_name":"Laurent","last_name":"Pinchart","email":"laurent.pinchart@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/2714/mbox/","series":[{"id":644,"url":"https://patchwork.libcamera.org/api/series/644/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=644","date":"2020-01-20T17:38:13","name":"Use std::array where applicable","version":1,"mbox":"https://patchwork.libcamera.org/series/644/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2714/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2714/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 71AAD6081F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 20 Jan 2020 18:38:21 +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 10A9AA62\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 20 Jan 2020 18:38:21 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1579541901;\n\tbh=QHcWgmH1eF1E9Lh3ogOsxezv1As9vkLrBYBDWKNCfIQ=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=AAD1omRS//KM3wvDeJAq2gUo4TkPmPrQVBXQ+6c8gJ+E7jIDOaF2S4jlRjt7ns6K3\n\tjb6O1y81AnKs40izADVUkR5aP9ypl8J2rn549gwmLsH4j6n3PPHab35bl78YCfcZbC\n\th9qlCspMWCUYD2GkOyPTt/VDBV5SG9j4jfLRVyiY=","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 20 Jan 2020 19:38:15 +0200","Message-Id":"<20200120173816.31829-3-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20200120173816.31829-1-laurent.pinchart@ideasonboard.com>","References":"<20200120173816.31829-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 2/3] libcamera: Use utils::make_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, 20 Jan 2020 17:38:21 -0000"},"content":"Replace manual static array initialization with utils::make_array() to\navoid manually specifying the number of elements.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp |  6 ++---\n src/libcamera/pipeline/vimc.cpp          |  6 ++---\n src/libcamera/stream.cpp                 |  6 ++---\n src/v4l2/v4l2_camera_proxy.cpp           | 30 ++++++++++++------------\n 4 files changed, 24 insertions(+), 24 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 0b3dd9759387..911f665720b3 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -433,16 +433,16 @@ RkISP1CameraConfiguration::RkISP1CameraConfiguration(Camera *camera,\n \n CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n {\n-\tstatic const std::array<unsigned int, 8> formats{\n+\tstatic const auto formats = utils::make_array<unsigned int>(\n \t\tDRM_FORMAT_YUYV,\n \t\tDRM_FORMAT_YVYU,\n \t\tDRM_FORMAT_VYUY,\n \t\tDRM_FORMAT_NV16,\n \t\tDRM_FORMAT_NV61,\n \t\tDRM_FORMAT_NV21,\n-\t\tDRM_FORMAT_NV12,\n+\t\tDRM_FORMAT_NV12\n \t\t/* \\todo Add support for 8-bit greyscale to DRM formats */\n-\t};\n+\t);\n \n \tconst CameraSensor *sensor = data_->sensor_;\n \tStatus status = Valid;\ndiff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\nindex b1054d307ea2..7df21f2b7a6f 100644\n--- a/src/libcamera/pipeline/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc.cpp\n@@ -106,11 +106,11 @@ private:\n \n namespace {\n \n-constexpr std::array<unsigned int, 3> pixelformats{\n+constexpr auto pixelformats = utils::make_array<unsigned int>(\n \tDRM_FORMAT_RGB888,\n \tDRM_FORMAT_BGR888,\n-\tDRM_FORMAT_BGRA8888,\n-};\n+\tDRM_FORMAT_BGRA8888\n+);\n \n } /* namespace */\n \ndiff --git a/src/libcamera/stream.cpp b/src/libcamera/stream.cpp\nindex 13789e9eb344..943f044b7b7a 100644\n--- a/src/libcamera/stream.cpp\n+++ b/src/libcamera/stream.cpp\n@@ -135,7 +135,7 @@ std::vector<Size> StreamFormats::sizes(PixelFormat pixelformat) const\n \t * from v4l2 documentation and source code as well as lists of\n \t * common frame sizes.\n \t */\n-\tstatic const std::array<Size, 53> rangeDiscreteSizes = {\n+\tstatic const auto rangeDiscreteSizes = utils::make_array<Size>(\n \t\tSize(160, 120),\n \t\tSize(240, 160),\n \t\tSize(320, 240),\n@@ -188,8 +188,8 @@ std::vector<Size> StreamFormats::sizes(PixelFormat pixelformat) const\n \t\tSize(4096, 2160),\n \t\tSize(5120, 2160),\n \t\tSize(5120, 2880),\n-\t\tSize(7680, 4320),\n-\t};\n+\t\tSize(7680, 4320)\n+\t);\n \tstd::vector<Size> sizes;\n \n \t/* Make sure pixel format exists. */\ndiff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp\nindex e58fd6a0d8b5..3b0a4bcb830f 100644\n--- a/src/v4l2/v4l2_camera_proxy.cpp\n+++ b/src/v4l2/v4l2_camera_proxy.cpp\n@@ -546,24 +546,24 @@ struct PixelFormatInfo {\n \n namespace {\n \n-constexpr std::array<PixelFormatInfo, 13> pixelFormatInfo = {{\n+constexpr auto pixelFormatInfo = utils::make_array<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+\tPixelFormatInfo{ DRM_FORMAT_RGB888,\tV4L2_PIX_FMT_BGR24,\t1, {{ { 24, 1, 1 }, {  0, 0, 0 }, {  0, 0, 0 } }} },\n+\tPixelFormatInfo{ DRM_FORMAT_BGR888,\tV4L2_PIX_FMT_RGB24,\t1, {{ { 24, 1, 1 }, {  0, 0, 0 }, {  0, 0, 0 } }} },\n+\tPixelFormatInfo{ 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+\tPixelFormatInfo{ DRM_FORMAT_UYVY,\tV4L2_PIX_FMT_UYVY,\t1, {{ { 16, 1, 1 }, {  0, 0, 0 }, {  0, 0, 0 } }} },\n+\tPixelFormatInfo{ DRM_FORMAT_VYUY,\tV4L2_PIX_FMT_VYUY,\t1, {{ { 16, 1, 1 }, {  0, 0, 0 }, {  0, 0, 0 } }} },\n+\tPixelFormatInfo{ DRM_FORMAT_YUYV,\tV4L2_PIX_FMT_YUYV,\t1, {{ { 16, 1, 1 }, {  0, 0, 0 }, {  0, 0, 0 } }} },\n+\tPixelFormatInfo{ 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+\tPixelFormatInfo{ DRM_FORMAT_NV12,\tV4L2_PIX_FMT_NV12,\t2, {{ {  8, 1, 1 }, { 16, 2, 2 }, {  0, 0, 0 } }} },\n+\tPixelFormatInfo{ DRM_FORMAT_NV21,\tV4L2_PIX_FMT_NV21,\t2, {{ {  8, 1, 1 }, { 16, 2, 2 }, {  0, 0, 0 } }} },\n+\tPixelFormatInfo{ DRM_FORMAT_NV16,\tV4L2_PIX_FMT_NV16,\t2, {{ {  8, 1, 1 }, { 16, 2, 1 }, {  0, 0, 0 } }} },\n+\tPixelFormatInfo{ DRM_FORMAT_NV61,\tV4L2_PIX_FMT_NV61,\t2, {{ {  8, 1, 1 }, { 16, 2, 1 }, {  0, 0, 0 } }} },\n+\tPixelFormatInfo{ DRM_FORMAT_NV24,\tV4L2_PIX_FMT_NV24,\t2, {{ {  8, 1, 1 }, { 16, 2, 1 }, {  0, 0, 0 } }} },\n+\tPixelFormatInfo{ DRM_FORMAT_NV42,\tV4L2_PIX_FMT_NV42,\t2, {{ {  8, 1, 1 }, { 16, 1, 1 }, {  0, 0, 0 } }} }\n+);\n \n } /* namespace */\n \n","prefixes":["libcamera-devel","2/3"]}