Patch Detail
Show a patch.
GET /api/1.1/patches/14834/?format=api
{ "id": 14834, "url": "https://patchwork.libcamera.org/api/1.1/patches/14834/?format=api", "web_url": "https://patchwork.libcamera.org/patch/14834/", "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": "<20211129083424.3136533-2-hiroh@chromium.org>", "date": "2021-11-29T08:34:23", "name": "[libcamera-devel,v9,2/3] libcamera: camera_sensor: Enable to set a test pattern mode", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "152663ec29a0cae50cbff7ef78a19eba00049d67", "submitter": { "id": 63, "url": "https://patchwork.libcamera.org/api/1.1/people/63/?format=api", "name": "Hirokazu Honda", "email": "hiroh@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/14834/mbox/", "series": [ { "id": 2769, "url": "https://patchwork.libcamera.org/api/1.1/series/2769/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2769", "date": "2021-11-29T08:34:22", "name": "[libcamera-devel,v9,1/3] libcamera: camera_sensor: Reference test pattern modes by enum type", "version": 9, "mbox": "https://patchwork.libcamera.org/series/2769/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/14834/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/14834/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 725D4BF415\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 29 Nov 2021 08:34:37 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2E2FD60591;\n\tMon, 29 Nov 2021 09:34:37 +0100 (CET)", "from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com\n\t[IPv6:2607:f8b0:4864:20::102b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AB85E6057B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 29 Nov 2021 09:34:34 +0100 (CET)", "by mail-pj1-x102b.google.com with SMTP id\n\to6-20020a17090a0a0600b001a64b9a11aeso13507415pjo.3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 29 Nov 2021 00:34:34 -0800 (PST)", "from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:f254:cda9:46e8:17b7])\n\tby smtp.gmail.com with ESMTPSA id\n\ty7sm11245948pge.44.2021.11.29.00.34.31\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 29 Nov 2021 00:34:32 -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=\"M1oj65CE\"; 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=XAfRIBSKo/Bk8R1ApMY0exYkZxGpkOH4t0UZkz0KP+c=;\n\tb=M1oj65CEOlSivSn5I4MxGoD+Vb6JJSPXx4jjwd5XUXWI15oi/GhE1+WooDkU1+dhN7\n\tnQIObBw7RtGJeYd6oKglrxnwf9WzPgcQSDaI+6cj8GSIn6sS0dfZ4Sa4sscPILoOGygt\n\tMXrIJH8nsMzMrVzRWmuWEeGwYKWIL2tkF3xLQ=", "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=XAfRIBSKo/Bk8R1ApMY0exYkZxGpkOH4t0UZkz0KP+c=;\n\tb=lkvCtZPlvdD8Dzc7UzfbmuiZbOt5MtBGlm5tFfbe+TaWOjz1uMSXoqHEpZdlhUbzwv\n\tdg/yW9JCDv7ZKPFD8wrXWVJIxwmOZdxBUL5p0w047NqDmSui8cPtWLkzOrBQYmgoHX3F\n\tf36oH5cIfHMiT0R9XQKVwen/bkaTlHAAGVa1Fmo5UFYGYIxlLrILBWmIMNimOkx/pEwx\n\t81J53EeEn/pwSf++8P2Kmq8kn0izMQNEa4/Si0G23IZ2xyJM+xIiLk00a/mHnzqi5FWc\n\to76InVfTnlFGaKdcsRtSISTxh1Zug/hh5sBXclk+3V6r8Olgsw8vYax6rualyK0UstNI\n\tKV2g==", "X-Gm-Message-State": "AOAM532d8My+ZoyMkg/LPyFgYBBESUL4fzJTGYH7ubKtcNrNCez3/n4N\n\tsh+XAIQ20ZB8tbRakwO9wxJuUwHZQS4Fpw==", "X-Google-Smtp-Source": "ABdhPJwyws4ogkQ9UyfDj4sPVv8lWj93rHn1lbhEudNrTbRdSFrE5A4Yy3MO5zLnFRVXixb2+VwoOg==", "X-Received": "by 2002:a17:90a:72c4:: with SMTP id\n\tl4mr36561670pjk.149.1638174872814; \n\tMon, 29 Nov 2021 00:34:32 -0800 (PST)", "From": "Hirokazu Honda <hiroh@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 29 Nov 2021 17:34:23 +0900", "Message-Id": "<20211129083424.3136533-2-hiroh@chromium.org>", "X-Mailer": "git-send-email 2.34.0.rc2.393.gf8c9666880-goog", "In-Reply-To": "<20211129083424.3136533-1-hiroh@chromium.org>", "References": "<20211129083424.3136533-1-hiroh@chromium.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v9 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. CameraSensor initializes the test pattern mode by Off.\n\nSigned-off-by: Hirokazu Honda <hiroh@chromium.org>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\n include/libcamera/internal/camera_sensor.h | 11 ++-\n src/libcamera/camera_sensor.cpp | 82 +++++++++++++++++++---\n 2 files changed, 80 insertions(+), 13 deletions(-)", "diff": "diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\nindex 310571ca..3362eaff 100644\n--- a/include/libcamera/internal/camera_sensor.h\n+++ b/include/libcamera/internal/camera_sensor.h\n@@ -28,6 +28,8 @@ namespace libcamera {\n class BayerFormat;\n class MediaEntity;\n \n+struct CameraSensorProperties;\n+\n class CameraSensor : protected Loggable\n {\n public:\n@@ -47,6 +49,7 @@ public:\n \t{\n \t\treturn testPatternModes_;\n \t}\n+\tint setTestPatternMode(controls::draft::TestPatternModeEnum testPatternMode);\n \n \tV4L2SubdeviceFormat getFormat(const std::vector<unsigned int> &mbusCodes,\n \t\t\t\t const Size &size) const;\n@@ -73,15 +76,16 @@ private:\n \tint validateSensorDriver();\n \tvoid initVimcDefaultProperties();\n \tvoid initStaticProperties();\n-\tvoid initTestPatternModes(\n-\t\tconst std::map<controls::draft::TestPatternModeEnum, int32_t>\n-\t\t\t&testPatternModeMap);\n+\tvoid initTestPatternModes();\n \tint initProperties();\n+\tint initTestPatternMode(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 +93,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..8a79b970 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), staticProps_(nullptr),\n+\t bayerFormat_(nullptr), properties_(properties::properties)\n {\n }\n \n@@ -161,7 +161,7 @@ int CameraSensor::init()\n \tif (ret)\n \t\treturn ret;\n \n-\treturn 0;\n+\treturn initTestPatternMode(controls::draft::TestPatternModeEnum::TestPatternModeOff);\n }\n \n int CameraSensor::validateSensorDriver()\n@@ -300,22 +300,33 @@ 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();\n }\n \n-void CameraSensor::initTestPatternModes(\n-\tconst std::map<controls::draft::TestPatternModeEnum, int32_t> &testPatternModes)\n+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+\tASSERT(staticProps_);\n+\tconst auto &testPatternModes = staticProps_->testPatternModes;\n+\tif (testPatternModes.empty()) {\n+\t\t/*\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\t */\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 +542,57 @@ 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 if it is not the\n+ * currently set test pattern mode.\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+\treturn initTestPatternMode(testPatternMode);\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::initTestPatternMode(controls::draft::TestPatternModeEnum testPatternMode)\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+\tLOG(CameraSensor, Debug) << \"Apply test pattern mode: \" << testPatternMode;\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\n", "prefixes": [ "libcamera-devel", "v9", "2/3" ] }