Patch Detail
Show a patch.
GET /api/patches/14506/?format=api
{ "id": 14506, "url": "https://patchwork.libcamera.org/api/patches/14506/?format=api", "web_url": "https://patchwork.libcamera.org/patch/14506/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20211110031651.2808099-2-hiroh@chromium.org>", "date": "2021-11-10T03:16:50", "name": "[libcamera-devel,v5,2/3] libcamera: camera_sensor: Enable to set a test pattern mode", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "5ff0d01c7a3962fa54bab1f8fc5581741684da0d", "submitter": { "id": 63, "url": "https://patchwork.libcamera.org/api/people/63/?format=api", "name": "Hirokazu Honda", "email": "hiroh@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/14506/mbox/", "series": [ { "id": 2700, "url": "https://patchwork.libcamera.org/api/series/2700/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2700", "date": "2021-11-10T03:16:49", "name": "[libcamera-devel,v5,1/3] libcamera: camera_sensor: Reference test pattern modes by enum type", "version": 5, "mbox": "https://patchwork.libcamera.org/series/2700/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/14506/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/14506/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 384CDBDB1C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 10 Nov 2021 03:17:03 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EB97F60362;\n\tWed, 10 Nov 2021 04:17:02 +0100 (CET)", "from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com\n\t[IPv6:2607:f8b0:4864:20::62b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F1B946032C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 10 Nov 2021 04:17:00 +0100 (CET)", "by mail-pl1-x62b.google.com with SMTP id v20so1819401plo.7\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 09 Nov 2021 19:17:00 -0800 (PST)", "from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:4a73:e1bd:9b3f:4903])\n\tby smtp.gmail.com with ESMTPSA id\n\tk3sm7550163pff.211.2021.11.09.19.16.57\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 09 Nov 2021 19:16:58 -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=\"Nms6knkc\"; 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=ctF0x2IRQJUstC5IPaYwhfO22QK23fcQHyF6A24usGk=;\n\tb=Nms6knkc+ewaCc46QX4WW54aLYEWbli8/vDlVSPJDV9qBObuGp/kYr4L+uVvabo+j4\n\tPW6zyOjgxvvPKbs/4ndseHY7yG/NdAMaPbT1I7g96y2fh/8+zVB5L8SISdfjzEZ7NBW/\n\t3QszcaXfZChQRCTGpgXP1PjZNGGWTeswhzeoM=", "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=ctF0x2IRQJUstC5IPaYwhfO22QK23fcQHyF6A24usGk=;\n\tb=0Sq9vgW4cht3GZnAsoiH2W5blktupLog+1C+AqJdxEMKq7Qf5HwKeg54TfJNOVRuzT\n\t3+XXKGWmm7IL45HpHwRqA3kbk6FLsGW4CVfXnh4XODP/9KJvcn+T61YlPIOt/nD8WXkd\n\ttTwbdYWxQhjugKW+aL9zof0GuZ1oyOyS3aDpUE1XL1MIVAVSL2SLwHwpZQGW8JEaMB0H\n\thH6qNyQ9zFg1BK5ydMThB8QC2voP8W9PdKRxha+g8fjKutLOvkPey++ZHUkqETZsadmd\n\twGGTqgbcYZyiGvegcyQPFbcGc2HFVLNxfrsAmfNmkjd6B7X23imiD1u/wa1yFk5zAJ0K\n\t9qQg==", "X-Gm-Message-State": "AOAM531uGM5EdUoBwXQJr8clOugpbq8v6HTkOQaWaeT2htULzb7SUftr\n\tQZPDtbmSQXcyn8b28kyQyloMk3iW82Y6CA==", "X-Google-Smtp-Source": "ABdhPJw2avVgqZHX7z6Z2R5O0uk/anWvdv/ysnjYocS8cBajZqWJ/XXpfxrTkIK3dYVzZT20MXVlrQ==", "X-Received": "by 2002:a17:90a:4e02:: with SMTP id\n\tn2mr12963784pjh.170.1636514219201; \n\tTue, 09 Nov 2021 19:16:59 -0800 (PST)", "From": "Hirokazu Honda <hiroh@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 10 Nov 2021 12:16:50 +0900", "Message-Id": "<20211110031651.2808099-2-hiroh@chromium.org>", "X-Mailer": "git-send-email 2.34.0.rc0.344.g81b53c2807-goog", "In-Reply-To": "<20211110031651.2808099-1-hiroh@chromium.org>", "References": "<20211110031651.2808099-1-hiroh@chromium.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v5 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": "<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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "This adds a function to set a camera sensor driver a test pattern\nmode.\n\nSigned-off-by: Hirokazu Honda <hiroh@chromium.org>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n include/libcamera/internal/camera_sensor.h | 8 +++\n src/libcamera/camera_sensor.cpp | 64 +++++++++++++++++++---\n src/libcamera/control_ids.yaml | 5 ++\n 3 files changed, 70 insertions(+), 7 deletions(-)", "diff": "diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\nindex edef2220..60ce0c45 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@@ -78,10 +81,14 @@ private:\n \t\t\t&testPatternModeMap);\n \tint initProperties();\n \n+\tint setTestPatternMode(controls::draft::TestPatternModeEnum testPatternMode);\n+\n \tconst MediaEntity *entity_;\n \tstd::unique_ptr<V4L2Subdevice> subdev_;\n \tunsigned int pad_;\n \n+\tconst CameraSensorProperties *staticProps_;\n+\n \tstd::string model_;\n \tstd::string id_;\n \n@@ -89,6 +96,7 @@ private:\n \tstd::vector<unsigned int> mbusCodes_;\n \tstd::vector<Size> sizes_;\n \tstd::vector<controls::draft::TestPatternModeEnum> 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..35925a95 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -17,6 +17,7 @@\n #include <string.h>\n \n #include <libcamera/property_ids.h>\n+#include <libcamera/request.h>\n \n #include <libcamera/base/utils.h>\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@@ -161,6 +163,10 @@ int CameraSensor::init()\n \tif (ret)\n \t\treturn ret;\n \n+\tret = setTestPatternMode(controls::draft::TestPatternModeOff);\n+\tif (ret)\n+\t\treturn ret;\n+\n \treturn 0;\n }\n \n@@ -300,14 +306,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 +321,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 +545,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", "v5", "2/3" ] }