{"id":17760,"url":"https://patchwork.libcamera.org/api/1.1/patches/17760/?format=json","web_url":"https://patchwork.libcamera.org/patch/17760/","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":"<20221109112753.2313327-1-paul.elder@ideasonboard.com>","date":"2022-11-09T11:27:53","name":"[libcamera-devel,v2] rkisp1: Add support for sensor test pattern control","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"0c3dcb8451f71caf2680dc3a86e3b20c0c4df26e","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/17760/mbox/","series":[{"id":3599,"url":"https://patchwork.libcamera.org/api/1.1/series/3599/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3599","date":"2022-11-09T11:27:53","name":"[libcamera-devel,v2] rkisp1: Add support for sensor test pattern control","version":2,"mbox":"https://patchwork.libcamera.org/series/3599/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/17760/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/17760/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 A2094BD16B\n\tfor ;\n\tWed, 9 Nov 2022 11:28:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2A9B663083;\n\tWed, 9 Nov 2022 12:28:06 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 96BA16305E\n\tfor ;\n\tWed, 9 Nov 2022 12:28:05 +0100 (CET)","from pyrite.rasen.tech (h175-177-042-159.catv02.itscom.jp\n\t[175.177.42.159])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id F2AED896;\n\tWed, 9 Nov 2022 12:28:03 +0100 (CET)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1667993286;\n\tbh=bCCfZHvk169uDJKP97d/XzvqdnKalmVVamMOMJm/ae4=;\n\th=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:\n\tList-Help:List-Subscribe:From:Reply-To:From;\n\tb=gNRj4ykJJ8f/kK69H7uzdOzJkCy865GXSgpsAFpjEf31Zm/5HCrutXY205Pmv3CiX\n\tWSiMpJGXihlil4hQZSDtOLOpQMy64+OOe0lbPRX9i6uD1MY5xaUObuI+vQ9uHgf+zD\n\tDcjI0G9XqlwyWTAJloUBTN5p1UTj2P6aFzDjtCUdaSdhJQkEI3xiJdsjZISmi1ow0S\n\t1eiyM5+RPX2L2XV4i8xQ8orE/xaMecM3SXkOKeatgG2FAgBsY68pqAmnVyCY89lp+j\n\t/6x3w2LOBU31xfv8TM/HXXBChBPZcCPpzqx/MzivS19+z9X1AaoVqnGkbykxSP1BJL\n\tyukljGiW8iBcA==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1667993285;\n\tbh=bCCfZHvk169uDJKP97d/XzvqdnKalmVVamMOMJm/ae4=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=d7AnKp3iFaBPUBpZl7qm63n7ZH7qWClnB6sUoBQNDdCXeX3kWadhDzaIOI1HoaaOX\n\tZi4wgbAHTd94MwcyFCIg+IN+T7UEERMC3nIUmDFTgDeFRcCtlDjWtnPFJstqHaSUWT\n\tfZr1/fYqnr3RsDH7Us0h9WA75RMtm6Ex2OAAcmVU="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"d7AnKp3i\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 9 Nov 2022 20:27:53 +0900","Message-Id":"<20221109112753.2313327-1-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.35.1","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2] rkisp1: Add support for sensor test\n\tpattern control","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","From":"Paul Elder via libcamera-devel ","Reply-To":"Paul Elder ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add support for the TestPatternMode control.\n\nSigned-off-by: Paul Elder \n\n---\nChanges in v2:\n- move the control initialization to the pipeline handler\n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 58 +++++++++++++++++++++++-\n 1 file changed, 57 insertions(+), 1 deletion(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 455ee2a0..26d8439d 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -93,6 +93,9 @@ public:\n \tPipelineHandlerRkISP1 *pipe();\n \tint loadIPA(unsigned int hwRevision);\n \n+\tvoid initSensorTestPattern();\n+\tint setSensorTestPattern(const ControlList *controls);\n+\n \tStream mainPathStream_;\n \tStream selfPathStream_;\n \tstd::unique_ptr sensor_;\n@@ -104,6 +107,8 @@ public:\n \tRkISP1MainPath *mainPath_;\n \tRkISP1SelfPath *selfPath_;\n \n+\tcontrols::draft::TestPatternModeEnum testPatternMode_;\n+\n \tstd::unique_ptr ipa_;\n \n private:\n@@ -357,6 +362,47 @@ int RkISP1CameraData::loadIPA(unsigned int hwRevision)\n \treturn 0;\n }\n \n+void RkISP1CameraData::initSensorTestPattern()\n+{\n+\tconst ControlInfoMap &sensorControls = sensor_->controls();\n+\n+\tControlInfoMap::Map ctrlMap = {};\n+\tfor (const auto &ipaControl : controlInfo_)\n+\t\tctrlMap[ipaControl.first] = ipaControl.second;\n+\n+\tauto tpgInfo = sensorControls.find(V4L2_CID_TEST_PATTERN);\n+\tif (tpgInfo != sensorControls.end()) {\n+\t\tctrlMap.emplace(&controls::draft::TestPatternMode,\n+\t\t\t\tControlInfo(tpgInfo->second.values()));\n+\t}\n+\n+\tcontrolInfo_ = ControlInfoMap(std::move(ctrlMap), controls::controls);\n+}\n+\n+int RkISP1CameraData::setSensorTestPattern(const ControlList *controls)\n+{\n+\tif (!controls)\n+\t\treturn 0;\n+\n+\tconst auto &testPattern = controls->get(controls::draft::TestPatternMode);\n+\n+\tif (!testPattern)\n+\t\treturn 0;\n+\n+\tif (testPattern && *testPattern == testPatternMode_)\n+\t\treturn 0;\n+\n+\ttestPatternMode_ = static_cast(*testPattern);\n+\n+\tint ret = sensor_->setTestPatternMode(testPatternMode_);\n+\tif (ret && !sensor_->testPatternModes().empty())\n+\t\treturn ret;\n+\n+\tLOG(RkISP1, Debug) << \"Set test pattern to \" << static_cast(testPatternMode_);\n+\n+\treturn 0;\n+}\n+\n void RkISP1CameraData::paramFilled(unsigned int frame)\n {\n \tPipelineHandlerRkISP1 *pipe = RkISP1CameraData::pipe();\n@@ -820,11 +866,15 @@ int PipelineHandlerRkISP1::freeBuffers(Camera *camera)\n \treturn 0;\n }\n \n-int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] const ControlList *controls)\n+int PipelineHandlerRkISP1::start(Camera *camera, const ControlList *controls)\n {\n \tRkISP1CameraData *data = cameraData(camera);\n \tint ret;\n \n+\tret = data->setSensorTestPattern(controls);\n+\tif (ret)\n+\t\treturn ret;\n+\n \t/* Allocate buffers for internal pipeline usage. */\n \tret = allocateBuffers(camera);\n \tif (ret)\n@@ -923,6 +973,10 @@ int PipelineHandlerRkISP1::queueRequestDevice(Camera *camera, Request *request)\n {\n \tRkISP1CameraData *data = cameraData(camera);\n \n+\tint ret = data->setSensorTestPattern(&request->controls());\n+\tif (ret)\n+\t\treturn ret;\n+\n \tRkISP1FrameInfo *info = data->frameInfo_.create(data, request);\n \tif (!info)\n \t\treturn -ENOENT;\n@@ -1027,6 +1081,8 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)\n \tif (ret)\n \t\treturn ret;\n \n+\tdata->initSensorTestPattern();\n+\n \tstd::set streams{\n \t\t&data->mainPathStream_,\n \t\t&data->selfPathStream_,\n","prefixes":["libcamera-devel","v2"]}