{"id":2217,"url":"https://patchwork.libcamera.org/api/1.1/patches/2217/?format=json","web_url":"https://patchwork.libcamera.org/patch/2217/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20191025032016.18904-1-laurent.pinchart@ideasonboard.com>","date":"2019-10-25T03:20:16","name":"[libcamera-devel] libcamera: pipeline: vimc: Support format enumeration","commit_ref":"429be98e4cbf4aae889675568abbd108cf7f4691","pull_url":null,"state":"accepted","archived":false,"hash":"8b8752dbc0c814613b979e960a8982ac462a5ab5","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2217/mbox/","series":[{"id":545,"url":"https://patchwork.libcamera.org/api/1.1/series/545/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=545","date":"2019-10-25T03:20:16","name":"[libcamera-devel] libcamera: pipeline: vimc: Support format enumeration","version":1,"mbox":"https://patchwork.libcamera.org/series/545/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2217/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2217/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AB6CD61374\n\tfor ;\n\tFri, 25 Oct 2019 05:20:27 +0200 (CEST)","from pendragon.ideasonboard.com (143.121.2.93.rev.sfr.net\n\t[93.2.121.143])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3D01233A\n\tfor ;\n\tFri, 25 Oct 2019 05:20:27 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1571973627;\n\tbh=AM8bjA52l47ee9vSJVP+8sooVCU3lBFZ+wWrDlKceME=;\n\th=From:To:Subject:Date:From;\n\tb=Cz07JIVBhDq5CKknsuwbi1rPo6vElv7sKkWQkdTkI8QN5/e8L6hax6sKQ4jskBXuY\n\tgNUglRgxF07XXjNvoz3F01EgeRlWQBotad8g5MsprgKxwMr3PDYmeD5jBnNGxLSPSn\n\tmIuBGoh27z/48RazhXosqq3KKz4xXPKzVmHK8JWk=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 25 Oct 2019 06:20:16 +0300","Message-Id":"<20191025032016.18904-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.23.0","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH] libcamera: pipeline: vimc: Support format\n\tenumeration","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Fri, 25 Oct 2019 03:20:27 -0000"},"content":"Fill the StreamConfiguration with all supported formats. The list of\nsupported formats is currently hardcoded based on the limits of the vimc\ndriver.\n\nSigned-off-by: Laurent Pinchart \n---\n src/libcamera/pipeline/vimc.cpp | 33 ++++++++++++++++++++++++---------\n 1 file changed, 24 insertions(+), 9 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\nindex dcdaef120ad1..c16ae4cb76b5 100644\n--- a/src/libcamera/pipeline/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc.cpp\n@@ -103,6 +103,16 @@ private:\n \t}\n };\n \n+namespace {\n+\n+constexpr std::array pixelformats{\n+\tV4L2_PIX_FMT_BGR24,\n+\tV4L2_PIX_FMT_RGB24,\n+\tV4L2_PIX_FMT_ARGB32,\n+};\n+\n+} /* namespace */\n+\n VimcCameraConfiguration::VimcCameraConfiguration()\n \t: CameraConfiguration()\n {\n@@ -110,12 +120,6 @@ VimcCameraConfiguration::VimcCameraConfiguration()\n \n CameraConfiguration::Status VimcCameraConfiguration::validate()\n {\n-\tstatic const std::array formats{\n-\t\tV4L2_PIX_FMT_BGR24,\n-\t\tV4L2_PIX_FMT_RGB24,\n-\t\tV4L2_PIX_FMT_ARGB32,\n-\t};\n-\n \tStatus status = Valid;\n \n \tif (config_.empty())\n@@ -130,8 +134,8 @@ CameraConfiguration::Status VimcCameraConfiguration::validate()\n \tStreamConfiguration &cfg = config_[0];\n \n \t/* Adjust the pixel format. */\n-\tif (std::find(formats.begin(), formats.end(), cfg.pixelFormat) ==\n-\t formats.end()) {\n+\tif (std::find(pixelformats.begin(), pixelformats.end(), cfg.pixelFormat) ==\n+\t pixelformats.end()) {\n \t\tLOG(VIMC, Debug) << \"Adjusting format to RGB24\";\n \t\tcfg.pixelFormat = V4L2_PIX_FMT_RGB24;\n \t\tstatus = Adjusted;\n@@ -170,7 +174,18 @@ CameraConfiguration *PipelineHandlerVimc::generateConfiguration(Camera *camera,\n \tif (roles.empty())\n \t\treturn config;\n \n-\tStreamConfiguration cfg{};\n+\tImageFormats formats;\n+\n+\tfor (unsigned int pixelformat : pixelformats) {\n+\t\t/* The scaler hardcodes a x3 scale-up ratio. */\n+\t\tstd::vector sizes{\n+\t\t\tSizeRange{ 48, 48, 4096, 2160 }\n+\t\t};\n+\t\tformats.addFormat(pixelformat, sizes);\n+\t}\n+\n+\tStreamConfiguration cfg(formats.data());\n+\n \tcfg.pixelFormat = V4L2_PIX_FMT_RGB24;\n \tcfg.size = { 1920, 1080 };\n \tcfg.bufferCount = 4;\n","prefixes":["libcamera-devel"]}