Patch Detail
Show a patch.
GET /api/patches/14331/?format=api
{ "id": 14331, "url": "https://patchwork.libcamera.org/api/patches/14331/?format=api", "web_url": "https://patchwork.libcamera.org/patch/14331/", "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": "<20211026103914.31449-1-hiroh@chromium.org>", "date": "2021-10-26T10:39:13", "name": "[libcamera-devel,v2,1/2] libcamera: camera_sensor: Enable to set a test pattern mode", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "2f2f21ba21323ec14f2d1d6832be2027a67ab9bc", "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/14331/mbox/", "series": [ { "id": 2657, "url": "https://patchwork.libcamera.org/api/series/2657/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2657", "date": "2021-10-26T10:39:13", "name": "[libcamera-devel,v2,1/2] libcamera: camera_sensor: Enable to set a test pattern mode", "version": 2, "mbox": "https://patchwork.libcamera.org/series/2657/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/14331/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/14331/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 B85B7BF415\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 26 Oct 2021 10:39:24 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 365E764877;\n\tTue, 26 Oct 2021 12:39:24 +0200 (CEST)", "from mail-pl1-x630.google.com (mail-pl1-x630.google.com\n\t[IPv6:2607:f8b0:4864:20::630])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A18BD60123\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 26 Oct 2021 12:39:22 +0200 (CEST)", "by mail-pl1-x630.google.com with SMTP id s24so6028978plp.0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 26 Oct 2021 03:39:22 -0700 (PDT)", "from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:d534:ad07:39b3:6828])\n\tby smtp.gmail.com with ESMTPSA id\n\tb18sm25683732pfl.24.2021.10.26.03.39.18\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 26 Oct 2021 03:39:19 -0700 (PDT)" ], "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=\"QWdI4mv7\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; h=from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=4MOKPE6Iq5ipEBl3urpGkTkVoCDVzQkbU/G4Vem61gI=;\n\tb=QWdI4mv7n8q+ZMDcS9PtCXhd8gI28xVyBXThZY4B/HrQWw++h+63Ga+ksuwQv+KqnY\n\tAAtoUMoIh1I8U9XZuAZzdRmSfIEoV/sTLGgAjNzuI150krWmr9X60bTmKSvHEjmMNgBp\n\t3JWIUfhU8L79bd1CDEooSmJsEp5pXCcIxdbTQ=", "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:mime-version\n\t:content-transfer-encoding;\n\tbh=4MOKPE6Iq5ipEBl3urpGkTkVoCDVzQkbU/G4Vem61gI=;\n\tb=MqMFptpKL+QrWfhDY/ta+2x5XCF5hpD7nndfQo/T+R4/uASp9tSCxE6KSFbz83fxXx\n\tZlQZLeRlHJPoI2bUsQJqWosIVKf8nAM3i27QiVF/XLVHcfiynGLDQLalj6ZzjGX9gvn/\n\tQu5LQ+ISMVMayHNcGZriXmHW9gTxD5cA0DIWQptofHWFRaz4LhjhBmjHHiGYI1QnyPDs\n\tpsrkMXI4pBGw+3mxdSWUiXxYf7T+zSamnRrNbHog5Z2DCc32bt4jXtYQZWyq6RgqZuHh\n\tp1zeAj98DChFYW63miG3Ln6WZO22k7hMet5H6FJsokv0G7moBue7vozdd6vVfxl0UZpe\n\tdLkg==", "X-Gm-Message-State": "AOAM530kqUy+7Inx9GKjDhMnJC6KjsWtczK6gpH1sBzamlbh9j0NwCWU\n\t84lB/YhEfFM8oWHOIfAMqpqydQY5aRRAAA==", "X-Google-Smtp-Source": "ABdhPJxJgXJ3kxeK5ce/I5CSyDnUr94rNttYm48BHqctY7QHe0HmTuRILt902yH9fhGDR2X9v7oKaQ==", "X-Received": "by 2002:a17:902:758b:b0:13f:974a:959f with SMTP id\n\tj11-20020a170902758b00b0013f974a959fmr21330320pll.40.1635244760412; \n\tTue, 26 Oct 2021 03:39:20 -0700 (PDT)", "From": "Hirokazu Honda <hiroh@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 26 Oct 2021 19:39:13 +0900", "Message-Id": "<20211026103914.31449-1-hiroh@chromium.org>", "X-Mailer": "git-send-email 2.33.0.1079.g6e70778dc9-goog", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 1/2] 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>\n---\n include/libcamera/internal/camera_sensor.h | 6 +++\n src/libcamera/camera_sensor.cpp | 50 +++++++++++++++++++---\n 2 files changed, 50 insertions(+), 6 deletions(-)", "diff": "diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\nindex d25a1165..d08cfec5 100644\n--- a/include/libcamera/internal/camera_sensor.h\n+++ b/include/libcamera/internal/camera_sensor.h\n@@ -26,6 +26,8 @@ namespace libcamera {\n class BayerFormat;\n class MediaEntity;\n \n+struct CameraSensorProperties;\n+\n class CameraSensor : protected Loggable\n {\n public:\n@@ -44,6 +46,7 @@ public:\n \t{\n \t\treturn testPatternModes_;\n \t}\n+\tint setTestPatternMode(int32_t testPatternMode);\n \n \tV4L2SubdeviceFormat getFormat(const std::vector<unsigned int> &mbusCodes,\n \t\t\t\t const Size &size) const;\n@@ -78,6 +81,8 @@ private:\n \tstd::unique_ptr<V4L2Subdevice> subdev_;\n \tunsigned int pad_;\n \n+\tconst CameraSensorProperties *props_;\n+\n \tstd::string model_;\n \tstd::string id_;\n \n@@ -85,6 +90,7 @@ private:\n \tstd::vector<unsigned int> mbusCodes_;\n \tstd::vector<Size> sizes_;\n \tstd::vector<int32_t> testPatternModes_;\n+\tint32_t testPatternMode_;\n \n \tSize pixelArraySize_;\n \tRectangle activeArea_;\ndiff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\nindex 9fdb8c09..47bb13f9 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), testPatternMode_(-1),\n+\t bayerFormat_(nullptr), properties_(properties::properties)\n {\n }\n \n@@ -300,14 +300,16 @@ void CameraSensor::initVimcDefaultProperties()\n \n void CameraSensor::initStaticProperties()\n {\n-\tconst CameraSensorProperties *props = CameraSensorProperties::get(model_);\n-\tif (!props)\n+\tprops_ = CameraSensorProperties::get(model_);\n+\tif (!props_) {\n+\t\tLOG(CameraSensor, Debug) << \"No properties for \" << model_;\n \t\treturn;\n+\t}\n \n \t/* Register the properties retrieved from the sensor database. */\n-\tproperties_.set(properties::UnitCellSize, props->unitCellSize);\n+\tproperties_.set(properties::UnitCellSize, props_->unitCellSize);\n \n-\tinitTestPatternModes(props->testPatternModes);\n+\tinitTestPatternModes(props_->testPatternModes);\n }\n \n void CameraSensor::initTestPatternModes(\n@@ -531,6 +533,42 @@ Size CameraSensor::resolution() const\n * \\return The list of test pattern modes\n */\n \n+/**\n+ * \\brief Set the camera sensor a specified controls::TestPatternMode\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(int32_t testPatternMode)\n+{\n+\tif (testPatternMode_ == testPatternMode)\n+\t\treturn 0;\n+\n+\tif (!props_) {\n+\t\tLOG(CameraSensor, Error) << \"No property is found\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tauto it = props_->testPatternModes.find(testPatternMode);\n+\tif (it == props_->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+\tControlList ctrls{ controls() };\n+\tctrls.set(V4L2_CID_TEST_PATTERN, it->second);\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", "v2", "1/2" ] }