{"id":15039,"url":"https://patchwork.libcamera.org/api/1.1/patches/15039/?format=json","web_url":"https://patchwork.libcamera.org/patch/15039/","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":"<20211206054918.2467049-2-hiroh@chromium.org>","date":"2021-12-06T05:49:17","name":"[libcamera-devel,v10,2/3] libcamera: camera_sensor: Enable to set a test pattern mode","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"152663ec29a0cae50cbff7ef78a19eba00049d67","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/15039/mbox/","series":[{"id":2816,"url":"https://patchwork.libcamera.org/api/1.1/series/2816/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2816","date":"2021-12-06T05:49:16","name":"[libcamera-devel,v10,1/3] libcamera: camera_sensor: Reference test pattern modes by enum type","version":10,"mbox":"https://patchwork.libcamera.org/series/2816/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15039/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15039/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 1A6F6BDB13\n\tfor ;\n\tMon, 6 Dec 2021 05:49:31 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 845206087E;\n\tMon, 6 Dec 2021 06:49:30 +0100 (CET)","from mail-pg1-x531.google.com (mail-pg1-x531.google.com\n\t[IPv6:2607:f8b0:4864:20::531])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2A2F76059E\n\tfor ;\n\tMon, 6 Dec 2021 06:49:28 +0100 (CET)","by mail-pg1-x531.google.com with SMTP id 137so9451421pgg.3\n\tfor ;\n\tSun, 05 Dec 2021 21:49:28 -0800 (PST)","from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:749e:cfe6:fd85:77b7])\n\tby smtp.gmail.com with ESMTPSA id\n\ta1sm11492368pfv.99.2021.12.05.21.49.24\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSun, 05 Dec 2021 21:49:25 -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=\"VeXk6pXl\"; 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=Gn8suQVYM0/PytL1fNvYzUjpec+1U7zCRfoSEqoUqYE=;\n\tb=VeXk6pXl0JiCzQcYmgGmb3Xl9x+RSzK+/sMnkaC2hRPH/mV7jbYFzxOUQNu7Mmu1Jz\n\twBwEZwscPliSAEKUrplW2hWVswdsyi3p5mjXKW6Ekxo8xdobuKunSn5qG3rqdp243XoF\n\tIxnOQu1sH+Gn0o59AxAFsHXlj0tvFXS53SONw=","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=Gn8suQVYM0/PytL1fNvYzUjpec+1U7zCRfoSEqoUqYE=;\n\tb=HMkkBTji5pMcOxjyyEox/ozw8TbE5Re5Yj3KJBTrrFlxB+YlkgYumk7/FIwgoPc0Fg\n\tzGiZ/eQULhnUCgxN/f73TVpfUJia6R2lP6g4b1ylYwcWO0vIH75i12zaGZhb4PDDtSyK\n\tuPAK95ik1gB0KFL0Tmj/QsYRqTRflVSf9B/4hq2LQUmDZPh7n6R6gmwiZi0+Nd5CnqNT\n\tfhI0yP0cUq5SwKP6DcIpBBwJIkJp0plC/PyPNKyI2amKEjbKk1dyjV7MwTalEp4EP50Y\n\tFYt3sN5myeutt9Fw0O89DsdEuGhFFIEp4SVjCmLjorsZnYeF4WQcpsPH1eKQypjC0MvY\n\tpzWQ==","X-Gm-Message-State":"AOAM530nlHxkp8ovxkC8JsKZgsff9uwQ+g8ZAm8x+hAny3Z5DpV4NlaD\n\tKySLu/DuEbSFOVoPdHlLQx054MAr1hY//w==","X-Google-Smtp-Source":"ABdhPJxd/Zdjt2i9HKSy4ZpnvnCys5vcR4+XRsYtsamFEVARD3u1H5OcbYMZILUC1c8S+ghXS6htJw==","X-Received":"by 2002:a62:5142:0:b0:4a3:4d13:e7da with SMTP id\n\tf63-20020a625142000000b004a34d13e7damr35100667pfb.84.1638769766078; \n\tSun, 05 Dec 2021 21:49:26 -0800 (PST)","From":"Hirokazu Honda ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 6 Dec 2021 14:49:17 +0900","Message-Id":"<20211206054918.2467049-2-hiroh@chromium.org>","X-Mailer":"git-send-email 2.34.1.400.ga245620fadb-goog","In-Reply-To":"<20211206054918.2467049-1-hiroh@chromium.org>","References":"<20211206054918.2467049-1-hiroh@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v10 2/3] libcamera: camera_sensor: Enable\n\tto set a test pattern mode","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":"This adds a function to set a camera sensor driver a test pattern\nmode. CameraSensor initializes the test pattern mode by Off.\n\nSigned-off-by: Hirokazu Honda \nReviewed-by: Kieran Bingham \n---\n include/libcamera/internal/camera_sensor.h | 11 ++-\n src/libcamera/camera_sensor.cpp | 82 +++++++++++++++++++---\n 2 files changed, 80 insertions(+), 13 deletions(-)","diff":"diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\nindex 310571ca..3362eaff 100644\n--- a/include/libcamera/internal/camera_sensor.h\n+++ b/include/libcamera/internal/camera_sensor.h\n@@ -28,6 +28,8 @@ namespace libcamera {\n class BayerFormat;\n class MediaEntity;\n \n+struct CameraSensorProperties;\n+\n class CameraSensor : protected Loggable\n {\n public:\n@@ -47,6 +49,7 @@ public:\n \t{\n \t\treturn testPatternModes_;\n \t}\n+\tint setTestPatternMode(controls::draft::TestPatternModeEnum testPatternMode);\n \n \tV4L2SubdeviceFormat getFormat(const std::vector &mbusCodes,\n \t\t\t\t const Size &size) const;\n@@ -73,15 +76,16 @@ private:\n \tint validateSensorDriver();\n \tvoid initVimcDefaultProperties();\n \tvoid initStaticProperties();\n-\tvoid initTestPatternModes(\n-\t\tconst std::map\n-\t\t\t&testPatternModeMap);\n+\tvoid initTestPatternModes();\n \tint initProperties();\n+\tint initTestPatternMode(controls::draft::TestPatternModeEnum testPatternMode);\n \n \tconst MediaEntity *entity_;\n \tstd::unique_ptr subdev_;\n \tunsigned int pad_;\n \n+\tconst CameraSensorProperties *staticProps_;\n+\n \tstd::string model_;\n \tstd::string id_;\n \n@@ -89,6 +93,7 @@ private:\n \tstd::vector mbusCodes_;\n \tstd::vector sizes_;\n \tstd::vector testPatternModes_;\n+\tcontrols::draft::TestPatternModeEnum testPatternMode_;\n \n \tSize pixelArraySize_;\n \tRectangle activeArea_;\ndiff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\nindex f0aa9f24..8a79b970 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -54,8 +54,8 @@ LOG_DEFINE_CATEGORY(CameraSensor)\n * Once constructed the instance must be initialized with init().\n */\n CameraSensor::CameraSensor(const MediaEntity *entity)\n-\t: entity_(entity), pad_(UINT_MAX), bayerFormat_(nullptr),\n-\t properties_(properties::properties)\n+\t: entity_(entity), pad_(UINT_MAX), staticProps_(nullptr),\n+\t bayerFormat_(nullptr), properties_(properties::properties)\n {\n }\n \n@@ -161,7 +161,7 @@ int CameraSensor::init()\n \tif (ret)\n \t\treturn ret;\n \n-\treturn 0;\n+\treturn initTestPatternMode(controls::draft::TestPatternModeEnum::TestPatternModeOff);\n }\n \n int CameraSensor::validateSensorDriver()\n@@ -300,22 +300,33 @@ void CameraSensor::initVimcDefaultProperties()\n \n void CameraSensor::initStaticProperties()\n {\n-\tconst CameraSensorProperties *props = CameraSensorProperties::get(model_);\n-\tif (!props)\n+\tstaticProps_ = CameraSensorProperties::get(model_);\n+\tif (!staticProps_)\n \t\treturn;\n \n \t/* Register the properties retrieved from the sensor database. */\n-\tproperties_.set(properties::UnitCellSize, props->unitCellSize);\n+\tproperties_.set(properties::UnitCellSize, staticProps_->unitCellSize);\n \n-\tinitTestPatternModes(props->testPatternModes);\n+\tinitTestPatternModes();\n }\n \n-void CameraSensor::initTestPatternModes(\n-\tconst std::map &testPatternModes)\n+void CameraSensor::initTestPatternModes()\n {\n \tconst auto &v4l2TestPattern = controls().find(V4L2_CID_TEST_PATTERN);\n \tif (v4l2TestPattern == controls().end()) {\n-\t\tLOG(CameraSensor, Debug) << \"No static test pattern map for \\'\"\n+\t\tLOG(CameraSensor, Debug)\n+\t\t\t<< \"V4L2_CID_TEST_PATTERN is not supported\";\n+\t\treturn;\n+\t}\n+\n+\tASSERT(staticProps_);\n+\tconst auto &testPatternModes = staticProps_->testPatternModes;\n+\tif (testPatternModes.empty()) {\n+\t\t/*\n+\t\t * The camera sensor supports test patterns but we don't know\n+\t\t * how to map them so this should be fixed.\n+\t\t */\n+\t\tLOG(CameraSensor, Error) << \"No static test pattern map for \\'\"\n \t\t\t\t\t << model() << \"\\'\";\n \t\treturn;\n \t}\n@@ -531,6 +542,57 @@ Size CameraSensor::resolution() const\n * \\return The list of test pattern modes\n */\n \n+/**\n+ * \\brief Set the test pattern mode for the camera sensor if it is not the\n+ * currently set test pattern mode.\n+ * \\param[in] testPatternMode Test pattern mode control value to set the camera\n+ * sensor\n+ *\n+ * \\return 0 on success or a negative error code otherwise\n+ */\n+int CameraSensor::setTestPatternMode(controls::draft::TestPatternModeEnum testPatternMode)\n+{\n+\tif (testPatternMode_ == testPatternMode)\n+\t\treturn 0;\n+\n+\treturn initTestPatternMode(testPatternMode);\n+}\n+\n+/**\n+ * \\brief Set the test pattern mode for the camera sensor\n+ * \\param[in] testPatternMode Test pattern mode control value to set the camera\n+ * sensor\n+ *\n+ * \\return 0 on success or a negative error code otherwise\n+ */\n+int CameraSensor::initTestPatternMode(controls::draft::TestPatternModeEnum testPatternMode)\n+{\n+\tif (!staticProps_ || testPatternModes_.empty())\n+\t\treturn 0;\n+\n+\tauto it = std::find(testPatternModes_.begin(), testPatternModes_.end(),\n+\t\t\t testPatternMode);\n+\tif (it == testPatternModes_.end()) {\n+\t\tLOG(CameraSensor, Error) << \"Unsupported test pattern mode \"\n+\t\t\t\t\t << testPatternMode;\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tLOG(CameraSensor, Debug) << \"Apply test pattern mode: \" << testPatternMode;\n+\n+\tint32_t index = staticProps_->testPatternModes.at(testPatternMode);\n+\tControlList ctrls{ controls() };\n+\tctrls.set(V4L2_CID_TEST_PATTERN, index);\n+\n+\tint ret = setControls(&ctrls);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\ttestPatternMode_ = testPatternMode;\n+\n+\treturn 0;\n+}\n+\n /**\n * \\brief Retrieve the best sensor format for a desired output\n * \\param[in] mbusCodes The list of acceptable media bus codes\n","prefixes":["libcamera-devel","v10","2/3"]}