{"id":12733,"url":"https://patchwork.libcamera.org/api/1.1/patches/12733/?format=json","web_url":"https://patchwork.libcamera.org/patch/12733/","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":"<20210628172755.3201441-2-hiroh@chromium.org>","date":"2021-06-28T17:27:55","name":"[libcamera-devel,v2,2/2] libcamera: camera_sensor: Enable to set a test pattern mode","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"b64344f26764a2f550e8a58ef521ba106a409623","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/12733/mbox/","series":[{"id":2188,"url":"https://patchwork.libcamera.org/api/1.1/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/12733/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12733/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 350D4C3220\n\tfor ;\n\tMon, 28 Jun 2021 17:28:09 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E972C684D8;\n\tMon, 28 Jun 2021 19:28:08 +0200 (CEST)","from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com\n\t[IPv6:2607:f8b0:4864:20::1034])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AF6EA684D4\n\tfor ;\n\tMon, 28 Jun 2021 19:28:05 +0200 (CEST)","by mail-pj1-x1034.google.com with SMTP id\n\tx21-20020a17090aa395b029016e25313bfcso510772pjp.2\n\tfor ;\n\tMon, 28 Jun 2021 10:28:05 -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.02\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 28 Jun 2021 10:28:03 -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=\"aUtZLc7S\"; 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=ar9/+S5S66A5XGDuDYAJXnxakDrp0s2FQsZbl04X+dk=;\n\tb=aUtZLc7S7RiO4l79oIc9iORY2sLyMSYppe89jgnnGVOEsMScQ+pAsrOX2UiTYzhLHX\n\tAD3uuWVrTd1b1M3VFiI/SdGvKnn6+LTIbD/W6BnVx5LTftK/puPxeqF91IwEAjjiFZaG\n\tRQVFdBNVqaFLeo5l3X86FwF1c1Ib1rIPPekqc=","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:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=ar9/+S5S66A5XGDuDYAJXnxakDrp0s2FQsZbl04X+dk=;\n\tb=Nx2yldOw6Pl30zt4L3yUzDvP7wwEtqyghHfHuNDpUVbNqasK4jXEWuZKaEhI2fFo1+\n\trqpo6DGVCtjpNrSl0VAg/T96aSiUOmaoLEkNMxg1oFMkdUYoou+FqrDmjFHOWD8j23Kx\n\tcDsbvf97nAOU8fN/S1rl/IzGLONfBBsQGpP6q1O3B9m78452YyDw00OpZgGO+ydMGAOJ\n\tkULMtzJHfOlS7+h+VUpbQ23c/1IN8THXtinYdJSQDgOM6Xwqf7URhiCRrO4KRYrfNNqc\n\tUmTy9a2MEk23cAT/FjCRBjt3X0ZKW3L8lYvn35S9f4nH7uglQMBS5GRmQYX/45XzkiFB\n\t9/Sg==","X-Gm-Message-State":"AOAM532eR3KZ8NcdKFe5Me85+JaVSwcm5oPRDn47+MWWAMFNC4lmmI5b\n\tINfLJ7U8K0fIQjrgcMLRjLVlhb29gUfZ9w==","X-Google-Smtp-Source":"ABdhPJxZC0AR61RlscaJFHE1hT9J3oT3iNghdNKjgzlKIC8cNrl6Q7xvajo28HyuHJu5IOsKYR6YNg==","X-Received":"by 2002:a17:90a:17ad:: with SMTP id\n\tq42mr39528265pja.181.1624901284034; \n\tMon, 28 Jun 2021 10:28:04 -0700 (PDT)","From":"Hirokazu Honda ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 29 Jun 2021 02:27:55 +0900","Message-Id":"<20210628172755.3201441-2-hiroh@chromium.org>","X-Mailer":"git-send-email 2.32.0.93.g670b81a890-goog","In-Reply-To":"<20210628172755.3201441-1-hiroh@chromium.org>","References":"<20210628172755.3201441-1-hiroh@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 2/2] 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":"Provides a function to set the camera sensor a test pattern mode.\n\nSigned-off-by: Hirokazu Honda \n---\n include/libcamera/internal/camera_sensor.h | 5 +++\n src/libcamera/camera_sensor.cpp | 46 +++++++++++++++++++---\n 2 files changed, 45 insertions(+), 6 deletions(-)","diff":"diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\nindex db12b07e..0c3222ac 100644\n--- a/include/libcamera/internal/camera_sensor.h\n+++ b/include/libcamera/internal/camera_sensor.h\n@@ -24,6 +24,7 @@\n namespace libcamera {\n \n class BayerFormat;\n+struct CameraSensorProperties;\n class MediaEntity;\n \n class CameraSensor : protected Loggable\n@@ -44,6 +45,7 @@ public:\n \t{\n \t\treturn testPatternModes_;\n \t}\n+\tint setTestPatternMode(int32_t testPatternMode);\n \n \tV4L2SubdeviceFormat getFormat(const std::vector &mbusCodes,\n \t\t\t\t const Size &size) const;\n@@ -78,6 +80,8 @@ private:\n \tstd::unique_ptr subdev_;\n \tunsigned int pad_;\n \n+\tconst CameraSensorProperties *props_;\n+\n \tstd::string model_;\n \tstd::string id_;\n \n@@ -85,6 +89,7 @@ private:\n \tstd::vector mbusCodes_;\n \tstd::vector sizes_;\n \tstd::vector testPatternModes_;\n+\tint32_t testPatternMode_;\n \n \tSize pixelArraySize_;\n \tRectangle activeArea_;\ndiff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\nindex ee53adf3..a9cc95c7 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), testPatternMode_(-1),\n+\t bayerFormat_(nullptr), properties_(properties::properties)\n {\n }\n \n@@ -300,14 +300,14 @@ void CameraSensor::initVimcDefaultProperties()\n \n void CameraSensor::initStaticProperties()\n {\n-\tconst CameraSensorProperties *props = CameraSensorProperties::get(model_);\n-\tif (!props)\n+\tprops_ = CameraSensorProperties::get(model_);\n+\tif (!props_)\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, props_->unitCellSize);\n \n-\tinitTestPatternModes(props->testPatternModes);\n+\tinitTestPatternModes(props_->testPatternModes);\n }\n \n void CameraSensor::initTestPatternModes(\n@@ -515,6 +515,40 @@ Size CameraSensor::resolution() const\n * \\return The list of test pattern modes\n */\n \n+/**\n+ * \\brief Set the camera sensor a specified controls::TestPatternMode\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(int32_t testPatternMode)\n+{\n+\tif (testPatternMode_ == testPatternMode)\n+\t\treturn 0;\n+\n+\tif (!props_)\n+\t\treturn -EINVAL;\n+\n+\tauto it = props_->testPatternModes.find(testPatternMode);\n+\tif (it == props_->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+\tControlList ctrls{ controls() };\n+\tctrls.set(V4L2_CID_TEST_PATTERN, it->second);\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","v2","2/2"]}