Patch Detail
Show a patch.
GET /api/1.1/patches/17621/?format=api
{ "id": 17621, "url": "https://patchwork.libcamera.org/api/1.1/patches/17621/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17621/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20221018083438.2937184-1-paul.elder@ideasonboard.com>", "date": "2022-10-18T08:34:38", "name": "[libcamera-devel] rkisp1: Add support for sensor test pattern control", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "42f3e3e3174b347652312cc11adb977a879175d1", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/1.1/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17621/mbox/", "series": [ { "id": 3562, "url": "https://patchwork.libcamera.org/api/1.1/series/3562/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3562", "date": "2022-10-18T08:34:38", "name": "[libcamera-devel] rkisp1: Add support for sensor test pattern control", "version": 1, "mbox": "https://patchwork.libcamera.org/series/3562/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17621/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17621/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 D9739BD16B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 18 Oct 2022 08:34:50 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F015A62E13;\n\tTue, 18 Oct 2022 10:34:49 +0200 (CEST)", "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 1210C62DD1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 18 Oct 2022 10:34:48 +0200 (CEST)", "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 A00558CC;\n\tTue, 18 Oct 2022 10:34:46 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1666082090;\n\tbh=I95aLvl80NyxGP+T7jTfuDLd8aFZ4NvMzalyqWnFeY8=;\n\th=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:\n\tList-Help:List-Subscribe:From:Reply-To:From;\n\tb=DF2z8Ohrk3kyFhI2UTkFX3vVLBW6Jq7WOwH2ecIZdtmWAH+EMlXXA/49yAIgzR3k4\n\taGkCAlkhcQSHZj9VG6Nmo6WTS7RqCRqVZwspeHmLBWQpOVEvkjlSNHBk81JbfSLXqO\n\tYa6qy+/z+9GiOWKr4MmwZkOtKSHyAtteflDpbzUTNgoFfiFfmCDukAq9IyiikY3rn1\n\tZwRrHrQv1FeX8/ilzQCTNjy2GTcnbzD5Wv9XpAviGjVsPsT1mMiEtAfRxBfON5TxTX\n\tlsL+SAUS+I6F/w7tMHPJorSGvO7BQZoyXASZa/386Oe5Rx0I3i/lyF/MrSjx4VzhI4\n\tHluhYg+nyt8nA==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1666082087;\n\tbh=I95aLvl80NyxGP+T7jTfuDLd8aFZ4NvMzalyqWnFeY8=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=pWS+8L506kAZHYTm5xNnCaqNTIfCbegpLST07xE8uJBb+GakKKWMERdXSILcUP+U5\n\tXfnmpmtGvGAjK13ebulGx3lJn3Iv6jT+K5EygMJP5POcNbU99lmp0h7MOK7YtnWOdF\n\tuwp5PijpFCAM3dzx9C/S8yCaYU4lDxZkSNrn8W9g=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"pWS+8L50\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 18 Oct 2022 17:34:38 +0900", "Message-Id": "<20221018083438.2937184-1-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.30.2", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH] 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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Paul Elder via libcamera-devel <libcamera-devel@lists.libcamera.org>", "Reply-To": "Paul Elder <paul.elder@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Add support for the TestPatternMode control.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n---\n src/ipa/rkisp1/rkisp1.cpp | 7 +++++\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 38 +++++++++++++++++++++++-\n 2 files changed, 44 insertions(+), 1 deletion(-)", "diff": "diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 3f5c1a58..1aac8884 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -183,6 +183,13 @@ int IPARkISP1::init(const IPASettings &settings, unsigned int hwRevision,\n \n \t/* Return the controls handled by the IPA. */\n \tControlInfoMap::Map ctrlMap = rkisp1Controls;\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 \t*ipaControls = ControlInfoMap(std::move(ctrlMap), controls::controls);\n \n \treturn 0;\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 455ee2a0..42803266 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -93,6 +93,8 @@ public:\n \tPipelineHandlerRkISP1 *pipe();\n \tint loadIPA(unsigned int hwRevision);\n \n+\tint setSensorTestPattern(const ControlList *controls);\n+\n \tStream mainPathStream_;\n \tStream selfPathStream_;\n \tstd::unique_ptr<CameraSensor> sensor_;\n@@ -104,6 +106,8 @@ public:\n \tRkISP1MainPath *mainPath_;\n \tRkISP1SelfPath *selfPath_;\n \n+\tcontrols::draft::TestPatternModeEnum testPatternMode_;\n+\n \tstd::unique_ptr<ipa::rkisp1::IPAProxyRkISP1> ipa_;\n \n private:\n@@ -357,6 +361,30 @@ int RkISP1CameraData::loadIPA(unsigned int hwRevision)\n \treturn 0;\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<controls::draft::TestPatternModeEnum>(*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<int>(testPatternMode_);\n+\n+\treturn 0;\n+}\n+\n void RkISP1CameraData::paramFilled(unsigned int frame)\n {\n \tPipelineHandlerRkISP1 *pipe = RkISP1CameraData::pipe();\n@@ -820,11 +848,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 +955,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", "prefixes": [ "libcamera-devel" ] }