{"id":14509,"url":"https://patchwork.libcamera.org/api/1.1/patches/14509/?format=json","web_url":"https://patchwork.libcamera.org/patch/14509/","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":"<20211110072207.3273703-2-hiroh@chromium.org>","date":"2021-11-10T07:22:05","name":"[libcamera-devel,v6,2/4] libcamera: camera_sensor: Reference test pattern modes by enum type","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"ded355e1f0fefcab4b34d29a0dd5a57d54f4cc5a","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/1.1/people/63/?format=json","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/14509/mbox/","series":[{"id":2701,"url":"https://patchwork.libcamera.org/api/1.1/series/2701/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2701","date":"2021-11-10T07:22:04","name":"[libcamera-devel,v6,1/4] lc-compliance: Build with gtest in subprojects","version":6,"mbox":"https://patchwork.libcamera.org/series/2701/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14509/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14509/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 2E530BF415\n\tfor ;\n\tWed, 10 Nov 2021 07:22:19 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DC42C6032C;\n\tWed, 10 Nov 2021 08:22:18 +0100 (CET)","from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com\n\t[IPv6:2607:f8b0:4864:20::102a])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F395A60345\n\tfor ;\n\tWed, 10 Nov 2021 08:22:16 +0100 (CET)","by mail-pj1-x102a.google.com with SMTP id\n\tj5-20020a17090a318500b001a6c749e697so1240873pjb.1\n\tfor ;\n\tTue, 09 Nov 2021 23:22:16 -0800 (PST)","from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:4a73:e1bd:9b3f:4903])\n\tby smtp.gmail.com with ESMTPSA id\n\tr1sm5073669pjm.23.2021.11.09.23.22.13\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 09 Nov 2021 23:22:14 -0800 (PST)"],"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=\"QqNbtIhL\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=8zv8+6CeG3JlrqiA2HdTIX0u11iqVcSsHDAfnyGUIBU=;\n\tb=QqNbtIhLMCFSqJfbUqGzVlayg1iEoG93xqYWmHqXRsDBk+9NJqL3Mg8y2Fy+MBUczF\n\tN/uuc8KfjdvsDILLUX0ts/H823l4KFFd2NNnAigmCWRfR1G4eAvCAdsyXVFQDD47geVr\n\ttR5GIDueDJ5JZH1mg8b7W7YzjlrOVYPchOQnI=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=8zv8+6CeG3JlrqiA2HdTIX0u11iqVcSsHDAfnyGUIBU=;\n\tb=VvqvxEdSjkIzlEqFrPO/OQxZQOaoF5PH08ucJ43Fq4NmAV/g0Zpby7mAEooD4EF+J9\n\tByLtVeZmNxTZPUGWLCCbEVnmsefZST6NR9dyAEnI84GMfF0kUESU9GrgWaE5Uz47CEm9\n\tRZZfwkk4bOTM/Klu9r8XXGoqW5OowEBMJzW+jtkhumrN/GcIHe+BslVLn2g15vg3r5mU\n\t/W4SaXxwquKxLKEqYNYknV2D+6JEBItVKA54n30LV5257F/giftalP74AgoA861/bVtI\n\tdd4i5Fgx/0g/nGY7pD73to43OZkgbDGixQiWkapo0Hq8K29BbMSiXvmPZDAwf7d+gxox\n\t3b/Q==","X-Gm-Message-State":"AOAM5315aAG9H1lK+A5mlUeGjHeQZ62auYOzsHgCfwjSg4W+L2S30+j3\n\tv6hqaXL0reTq988k3zbH82DKo1N6A+WpOw==","X-Google-Smtp-Source":"ABdhPJy/oSy0At3+ablvesQW/C+L8puH/p4lVJ0kItpduEQHZT3bghLTLXw+tJ3GV4ftdZdzH6EaLQ==","X-Received":"by 2002:a17:90a:d192:: with SMTP id\n\tfu18mr14860682pjb.177.1636528935019; \n\tTue, 09 Nov 2021 23:22:15 -0800 (PST)","From":"Hirokazu Honda ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 10 Nov 2021 16:22:05 +0900","Message-Id":"<20211110072207.3273703-2-hiroh@chromium.org>","X-Mailer":"git-send-email 2.34.0.rc0.344.g81b53c2807-goog","In-Reply-To":"<20211110072207.3273703-1-hiroh@chromium.org>","References":"<20211110072207.3273703-1-hiroh@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v6 2/4] libcamera: camera_sensor:\n\tReference test pattern modes by enum type","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 CameraSensor stores TestPatternModes as an int32_t. This prevents\nthe compiler from verifying the usage against the defined enum types.\n\nFix references to the TestPatternMode to store the value as the\nTestPatternModeEnum type which is defined by the control generator.\n\nSigned-off-by: Hirokazu Honda \nReviewed-by: Jacopo Mondi \nReviewed-by: Kieran Bingham \n---\n include/libcamera/internal/camera_sensor.h | 10 +++++++---\n include/libcamera/internal/camera_sensor_properties.h | 3 ++-\n src/libcamera/camera_sensor.cpp | 4 ++--\n src/libcamera/pipeline/ipu3/ipu3.cpp | 7 ++++---\n 4 files changed, 15 insertions(+), 9 deletions(-)","diff":"diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\nindex d25a1165..edef2220 100644\n--- a/include/libcamera/internal/camera_sensor.h\n+++ b/include/libcamera/internal/camera_sensor.h\n@@ -14,8 +14,10 @@\n #include \n #include \n \n+#include \n #include \n #include \n+\n #include \n \n #include \"libcamera/internal/formats.h\"\n@@ -40,7 +42,8 @@ public:\n \tconst std::vector &mbusCodes() const { return mbusCodes_; }\n \tconst std::vector sizes(unsigned int mbusCode) const;\n \tSize resolution() const;\n-\tconst std::vector &testPatternModes() const\n+\tconst std::vector\n+\t\t&testPatternModes() const\n \t{\n \t\treturn testPatternModes_;\n \t}\n@@ -71,7 +74,8 @@ private:\n \tvoid initVimcDefaultProperties();\n \tvoid initStaticProperties();\n \tvoid initTestPatternModes(\n-\t\tconst std::map &testPatternModeMap);\n+\t\tconst std::map\n+\t\t\t&testPatternModeMap);\n \tint initProperties();\n \n \tconst MediaEntity *entity_;\n@@ -84,7 +88,7 @@ private:\n \tV4L2Subdevice::Formats formats_;\n \tstd::vector mbusCodes_;\n \tstd::vector sizes_;\n-\tstd::vector testPatternModes_;\n+\tstd::vector testPatternModes_;\n \n \tSize pixelArraySize_;\n \tRectangle activeArea_;\ndiff --git a/include/libcamera/internal/camera_sensor_properties.h b/include/libcamera/internal/camera_sensor_properties.h\nindex 67c77920..5c7e5e87 100644\n--- a/include/libcamera/internal/camera_sensor_properties.h\n+++ b/include/libcamera/internal/camera_sensor_properties.h\n@@ -10,6 +10,7 @@\n #include \n #include \n \n+#include \n #include \n \n namespace libcamera {\n@@ -18,7 +19,7 @@ struct CameraSensorProperties {\n \tstatic const CameraSensorProperties *get(const std::string &sensor);\n \n \tSize unitCellSize;\n-\tstd::map testPatternModes;\n+\tstd::map testPatternModes;\n };\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\nindex 9fdb8c09..f0aa9f24 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -311,7 +311,7 @@ void CameraSensor::initStaticProperties()\n }\n \n void CameraSensor::initTestPatternModes(\n-\tconst std::map &testPatternModes)\n+\tconst std::map &testPatternModes)\n {\n \tconst auto &v4l2TestPattern = controls().find(V4L2_CID_TEST_PATTERN);\n \tif (v4l2TestPattern == controls().end()) {\n@@ -327,7 +327,7 @@ void CameraSensor::initTestPatternModes(\n \t * control index is supported in the below for loop that creates the\n \t * list of supported test patterns.\n \t */\n-\tstd::map indexToTestPatternMode;\n+\tstd::map indexToTestPatternMode;\n \tfor (const auto &it : testPatternModes)\n \t\tindexToTestPatternMode[it.second] = it.first;\n \ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex eb714aa6..63cb7f11 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -981,13 +981,14 @@ int PipelineHandlerIPU3::updateControls(IPU3CameraData *data)\n \t\treturn ret;\n \n \tControlInfoMap::Map controls = IPU3Controls;\n-\tconst std::vector &testPatternModes = sensor->testPatternModes();\n+\tconst std::vector\n+\t\t&testPatternModes = sensor->testPatternModes();\n \tif (!testPatternModes.empty()) {\n \t\tstd::vector values;\n \t\tvalues.reserve(testPatternModes.size());\n \n-\t\tfor (int32_t pattern : testPatternModes)\n-\t\t\tvalues.emplace_back(pattern);\n+\t\tfor (auto pattern : testPatternModes)\n+\t\t\tvalues.emplace_back(static_cast(pattern));\n \n \t\tcontrols[&controls::draft::TestPatternMode] = ControlInfo(values);\n \t}\n","prefixes":["libcamera-devel","v6","2/4"]}