{"id":12732,"url":"https://patchwork.libcamera.org/api/patches/12732/?format=json","web_url":"https://patchwork.libcamera.org/patch/12732/","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":"<20210628172755.3201441-1-hiroh@chromium.org>","date":"2021-06-28T17:27:54","name":"[libcamera-devel,v2,1/2] libcamera: camera_sensor: Reverse the key and value of test pattern mode map","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"70286f7fe0018eac5a50096c08ee16a8f0c92bc2","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/people/63/?format=json","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12732/mbox/","series":[{"id":2188,"url":"https://patchwork.libcamera.org/api/series/2188/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2188","date":"2021-06-28T17:27:54","name":"[libcamera-devel,v2,1/2] libcamera: camera_sensor: Reverse the key and value of test pattern mode map","version":2,"mbox":"https://patchwork.libcamera.org/series/2188/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12732/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12732/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 08A4AC3220\n\tfor ;\n\tMon, 28 Jun 2021 17:28:07 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BBCA0684D6;\n\tMon, 28 Jun 2021 19:28:05 +0200 (CEST)","from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com\n\t[IPv6:2607:f8b0:4864:20::102e])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 09D236028C\n\tfor ;\n\tMon, 28 Jun 2021 19:28:04 +0200 (CEST)","by mail-pj1-x102e.google.com with SMTP id\n\tp4-20020a17090a9304b029016f3020d867so508734pjo.3\n\tfor ;\n\tMon, 28 Jun 2021 10:28:03 -0700 (PDT)","from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:a147:1cb:e226:4ed9])\n\tby smtp.gmail.com with ESMTPSA id\n\td1sm4682358pju.16.2021.06.28.10.28.00\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 28 Jun 2021 10:28:01 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"KV63tbcT\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; h=from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=1oIGze6zan6MqI7rIizV5leq038W9m+8OGcqWq3kOx4=;\n\tb=KV63tbcTcL64yNYim6+wzWiSOs1c/xike2o4nI7MOmByoZWsqQhxLAQ0Qoa3s5PxAC\n\tJCCioUTw/R0RH3LnHH9JvpBDpZaxhAvjP2A7WR88ojV5M6wE/SsfkEPy321k6OQd2svh\n\t+xr0NzUi2EpK6Y3I6dg7ZNyTKQFe2dddfXmp0=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=1oIGze6zan6MqI7rIizV5leq038W9m+8OGcqWq3kOx4=;\n\tb=njqwq48Vy2yxJR20B7y03mR+0Y3JW6/lAmz5IDkKncNDbyKn5j/n/ztuxNY0yPEAUr\n\tKK82WdFSX/SPrfnN6D3u4o09N1bKicZ+4WXG3VcOwD3lBAeYKZbJ9Ok6Tr0yn/2clag7\n\tdkWExPsiqccib3vo9NTE3jIUL4nZc0cRYHVmoK5QXJs4n+6IDfMu+Ze5k19LcAEva1HM\n\tAA3fvi98aanIdOWk8hzkY8TtLjMNtX0qCwk9lwC8IzxGRlUwdaTKydu/UAOVrtA7nhye\n\t0rMuMCUPlpCKWKwx1Fl3aZ2Wsy5WFsfH4ISl1Pl9fvA2Z+e82RcjOokz+D4FlH+Ejfzh\n\t6yZQ==","X-Gm-Message-State":"AOAM532o596e3A5gmzD05zfJjOcbGI6UR/EJ/somuT4X6/rYmqPF5OfL\n\tItZQFhhCesIXSPVGU1uCvDWJAgI1dKnEzA==","X-Google-Smtp-Source":"ABdhPJxVJzqq0LgQkVqNtmma4jruDU6ASirv69SayFZmUnwIFztKx5v4FGB41Z7XKBrhAbQ+QcE+ng==","X-Received":"by 2002:a17:90a:3d47:: with SMTP id\n\to7mr39259093pjf.68.1624901282260; \n\tMon, 28 Jun 2021 10:28:02 -0700 (PDT)","From":"Hirokazu Honda ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 29 Jun 2021 02:27:54 +0900","Message-Id":"<20210628172755.3201441-1-hiroh@chromium.org>","X-Mailer":"git-send-email 2.32.0.93.g670b81a890-goog","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 1/2] libcamera: camera_sensor: Reverse\n\tthe key and value of test pattern mode map","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The key and value of the test pattern mode are originally the index of\nv4l2 control and the corresponding test pattern mode control value.\nThis key and value are useful in the initialization for reporting\navailable test pattern modes. However, the map of the reversed key and\nvalue is much more useful in applying a requested test pattern mode.\nReverses the key and value of the map as the initialization is one\ntime but the test pattern mode request will be multiple times.\n\nSigned-off-by: Hirokazu Honda \nReviewed-by: Jacopo Mondi \nReviewed-by: Laurent Pinchart \n---\n src/libcamera/camera_sensor.cpp | 15 ++++++++++--\n src/libcamera/camera_sensor_properties.cpp | 28 +++++++++++-----------\n 2 files changed, 27 insertions(+), 16 deletions(-)","diff":"diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\nindex 94dcf4f9..ee53adf3 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -320,11 +320,22 @@ void CameraSensor::initTestPatternModes(\n \t\treturn;\n \t}\n \n+ /*\n+ * Create a map that associates the V4L2 control index to the test\n+\t * pattern mode by reversing the testPatternModes map provided by the\n+\t * camera sensor properties. This makes it easier to verify if the\n+\t * control index is supported in the below for loop that creates the\n+\t * list of supported test patterns.\n+ */\n+\tstd::map indexToTestPatternMode;\n+\tfor (const auto& it : testPatternModes)\n+\t\tindexToTestPatternMode[it.second] = it.first;\n+\n \tfor (const ControlValue &value : v4l2TestPattern->second.values()) {\n \t\tconst int32_t index = value.get();\n \n-\t\tconst auto it = testPatternModes.find(index);\n-\t\tif (it == testPatternModes.end()) {\n+\t\tconst auto it = indexToTestPatternMode.find(index);\n+\t\tif (it == indexToTestPatternMode.end()) {\n \t\t\tLOG(CameraSensor, Debug)\n \t\t\t\t<< \"Test pattern mode \" << index << \" ignored\";\n \t\t\tcontinue;\ndiff --git a/src/libcamera/camera_sensor_properties.cpp b/src/libcamera/camera_sensor_properties.cpp\nindex 7d8ba9e9..a4b6565c 100644\n--- a/src/libcamera/camera_sensor_properties.cpp\n+++ b/src/libcamera/camera_sensor_properties.cpp\n@@ -38,9 +38,9 @@ LOG_DEFINE_CATEGORY(CameraSensorProperties)\n * \\brief The physical size of a pixel, including pixel edges, in nanometers.\n *\n * \\var CameraSensorProperties::testPatternModes\n- * \\brief Map that associates the indexes of the sensor test pattern modes as\n- * returned by V4L2_CID_TEST_PATTERN with the corresponding TestPattern\n- * control value\n+ * \\brief Map that associates the TestPattern control value with the indexes of\n+ * the corresponding sensor test pattern modes as returned by\n+ * V4L2_CID_TEST_PATTERN.\n */\n \n /**\n@@ -55,11 +55,11 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen\n \t\t{ \"imx219\", {\n \t\t\t.unitCellSize = { 1120, 1120 },\n \t\t\t.testPatternModes = {\n-\t\t\t\t{ 0, controls::draft::TestPatternModeOff },\n-\t\t\t\t{ 1, controls::draft::TestPatternModeColorBars },\n-\t\t\t\t{ 2, controls::draft::TestPatternModeSolidColor },\n-\t\t\t\t{ 3, controls::draft::TestPatternModeColorBarsFadeToGray },\n-\t\t\t\t{ 4, controls::draft::TestPatternModePn9 },\n+\t\t\t\t{ controls::draft::TestPatternModeOff, 0 },\n+\t\t\t\t{ controls::draft::TestPatternModeColorBars, 1 },\n+\t\t\t\t{ controls::draft::TestPatternModeSolidColor, 2 },\n+\t\t\t\t{ controls::draft::TestPatternModeColorBarsFadeToGray, 3 },\n+\t\t\t\t{ controls::draft::TestPatternModePn9, 4 },\n \t\t\t},\n \t\t} },\n \t\t{ \"imx258\", {\n@@ -75,15 +75,15 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen\n \t\t{ \"ov5670\", {\n \t\t\t.unitCellSize = { 1120, 1120 },\n \t\t\t.testPatternModes = {\n-\t\t\t\t{ 0, controls::draft::TestPatternModeOff },\n-\t\t\t\t{ 1, controls::draft::TestPatternModeColorBars },\n+\t\t\t\t{ controls::draft::TestPatternModeOff, 0 },\n+\t\t\t\t{ controls::draft::TestPatternModeColorBars, 1 },\n \t\t\t},\n \t\t} },\n \t\t{ \"ov13858\", {\n \t\t\t.unitCellSize = { 1120, 1120 },\n \t\t\t.testPatternModes = {\n-\t\t\t\t{ 0, controls::draft::TestPatternModeOff },\n-\t\t\t\t{ 1, controls::draft::TestPatternModeColorBars },\n+\t\t\t\t{ controls::draft::TestPatternModeOff, 0 },\n+\t\t\t\t{ controls::draft::TestPatternModeColorBars, 1 },\n \t\t\t},\n \t\t} },\n \t\t{ \"ov5647\", {\n@@ -93,8 +93,8 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen\n \t\t{ \"ov5693\", {\n \t\t\t.unitCellSize = { 1400, 1400 },\n \t\t\t.testPatternModes = {\n-\t\t\t\t{ 0, controls::draft::TestPatternModeOff },\n-\t\t\t\t{ 2, controls::draft::TestPatternModeColorBars },\n+\t\t\t\t{ controls::draft::TestPatternModeOff, 0 },\n+\t\t\t\t{ controls::draft::TestPatternModeColorBars, 2 },\n \t\t\t\t/*\n \t\t\t\t * No corresponding test pattern mode for\n \t\t\t\t * 1: \"Random data\" and 3: \"Colour Bars with\n","prefixes":["libcamera-devel","v2","1/2"]}