{"id":14729,"url":"https://patchwork.libcamera.org/api/patches/14729/?format=json","web_url":"https://patchwork.libcamera.org/patch/14729/","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":"<20211123190812.69805-3-hiroh@chromium.org>","date":"2021-11-23T19:08:11","name":"[libcamera-devel,v7,2/3] libcamera: camera_sensor: Enable to set a test pattern mode","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"d0a2db7f234d08d79123b2056820fdae5ad66099","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/14729/mbox/","series":[{"id":2748,"url":"https://patchwork.libcamera.org/api/series/2748/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2748","date":"2021-11-23T19:08:09","name":"Enable to apply test pattern mode in IPU3","version":7,"mbox":"https://patchwork.libcamera.org/series/2748/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14729/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14729/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 7AFC2C324F\n\tfor ;\n\tTue, 23 Nov 2021 19:08:26 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3329360394;\n\tTue, 23 Nov 2021 20:08:26 +0100 (CET)","from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com\n\t[IPv6:2607:f8b0:4864:20::52b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E1A3B60394\n\tfor ;\n\tTue, 23 Nov 2021 20:08:24 +0100 (CET)","by mail-pg1-x52b.google.com with SMTP id f65so24311pgc.0\n\tfor ;\n\tTue, 23 Nov 2021 11:08:24 -0800 (PST)","from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:cc8f:f5a6:5a9f:7275])\n\tby smtp.gmail.com with ESMTPSA id\n\tt4sm14550916pfq.163.2021.11.23.11.08.21\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 23 Nov 2021 11:08:22 -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=\"HmclwGJc\"; 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=vn/9bqGZ6VDlOVOvMtRWyeDLjxJmAjik0KpfoKdAx+0=;\n\tb=HmclwGJcmv712h1c3jaeJ70/U9b567+OKqbZ9AtrN1V3P/hKeclK6kr3fySKR3O4y2\n\tOdFinW3zSTypDLZR0gHASetceJyFLZ5DMsMgCy0SBwhOXPzt+J+BSIgI8fFpqrndhSip\n\tuYL+/55x03WLe8iS2GuUc3B1c1HWMlJjWVVng=","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=vn/9bqGZ6VDlOVOvMtRWyeDLjxJmAjik0KpfoKdAx+0=;\n\tb=o/9+gphLMEVVg3OjsksvcHWBb3sMkICQkNNFrL+TlH++0LoG8iiRObHqtrTwIDVlP6\n\t2Vn+OeaHyH4/PQ+ckxwdilKf0h+QV2gZmdlOQs1PQ+CFo9BfB6GqrxSZ2E7DqDBYE3PC\n\t4zG9VX8IaBlxIrOKjmQmj13BWqw2JgzaDdnElUpUll14CMTK63ZdCo1yj71Ud7hH++W0\n\tK3Q4HVmdVHgnvX+Pdl0LySLvJogvEOS0osCrO8EbaZLLFLFvMOzc5HHLOjmiyQ+49v0l\n\tg0twnPEJvK6BmhUmUFMJ0uIEvzhDasqUejE3ByJAwDK8ClhGybt247o+nenqtsZ+E2o/\n\tAAEg==","X-Gm-Message-State":"AOAM530ZR+dG9T0yZMV1R0agse6wpUD/NwbZ9OW3wIdfyRRC4wGV8pZT\n\t+QDr0ZmtdH9VyJkef3lPIKUd8b+a2uMcKQ==","X-Google-Smtp-Source":"ABdhPJz/h1KZs2I2uEIbOyDcdHsP57ztqFfzQSwS+pTHxjYECFE3hq/shf15N8MRuYv6g8RnWernMw==","X-Received":"by 2002:aa7:950f:0:b0:4a2:54da:3a73 with SMTP id\n\tb15-20020aa7950f000000b004a254da3a73mr7360830pfp.18.1637694502858; \n\tTue, 23 Nov 2021 11:08:22 -0800 (PST)","From":"Hirokazu Honda ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 24 Nov 2021 04:08:11 +0900","Message-Id":"<20211123190812.69805-3-hiroh@chromium.org>","X-Mailer":"git-send-email 2.34.0.rc2.393.gf8c9666880-goog","In-Reply-To":"<20211123190812.69805-1-hiroh@chromium.org>","References":"<20211123190812.69805-1-hiroh@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v7 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.\n\nSigned-off-by: Hirokazu Honda \nReviewed-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \n---\n include/libcamera/internal/camera_sensor.h | 7 +++\n src/libcamera/camera_sensor.cpp | 60 +++++++++++++++++++---\n src/libcamera/control_ids.yaml | 5 ++\n 3 files changed, 65 insertions(+), 7 deletions(-)","diff":"diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\nindex edef2220..f355f323 100644\n--- a/include/libcamera/internal/camera_sensor.h\n+++ b/include/libcamera/internal/camera_sensor.h\n@@ -27,6 +27,9 @@ namespace libcamera {\n \n class BayerFormat;\n class MediaEntity;\n+class Request;\n+\n+struct CameraSensorProperties;\n \n class CameraSensor : protected Loggable\n {\n@@ -47,6 +50,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@@ -82,6 +86,8 @@ private:\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 +95,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..e1293980 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -17,6 +17,7 @@\n #include \n \n #include \n+#include \n \n #include \n \n@@ -54,8 +55,9 @@ 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 testPatternMode_(controls::draft::TestPatternModeUnset),\n+\t bayerFormat_(nullptr), properties_(properties::properties)\n {\n }\n \n@@ -300,14 +302,14 @@ 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(staticProps_->testPatternModes);\n }\n \n void CameraSensor::initTestPatternModes(\n@@ -315,7 +317,15 @@ 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+\tif (testPatternModes.empty()) {\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\tLOG(CameraSensor, Error) << \"No static test pattern map for \\'\"\n \t\t\t\t\t << model() << \"\\'\";\n \t\treturn;\n \t}\n@@ -531,6 +541,42 @@ 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\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+\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+\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\ndiff --git a/src/libcamera/control_ids.yaml b/src/libcamera/control_ids.yaml\nindex 9d4638ae..083bac7b 100644\n--- a/src/libcamera/control_ids.yaml\n+++ b/src/libcamera/control_ids.yaml\n@@ -639,6 +639,11 @@ controls:\n Control to select the test pattern mode. Currently identical to\n ANDROID_SENSOR_TEST_PATTERN_MODE.\n enum:\n+ - name: TestPatternModeUnset\n+ value: -1\n+ description: |\n+ No test pattern is set. Returned frames by the camera device are\n+ undefined.\n - name: TestPatternModeOff\n value: 0\n description: |\n","prefixes":["libcamera-devel","v7","2/3"]}