From patchwork Mon Dec 6 05:49:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 15039 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 1A6F6BDB13 for ; Mon, 6 Dec 2021 05:49:31 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 845206087E; Mon, 6 Dec 2021 06:49:30 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="VeXk6pXl"; dkim-atps=neutral Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2A2F76059E for ; Mon, 6 Dec 2021 06:49:28 +0100 (CET) Received: by mail-pg1-x531.google.com with SMTP id 137so9451421pgg.3 for ; Sun, 05 Dec 2021 21:49:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Gn8suQVYM0/PytL1fNvYzUjpec+1U7zCRfoSEqoUqYE=; b=VeXk6pXl0JiCzQcYmgGmb3Xl9x+RSzK+/sMnkaC2hRPH/mV7jbYFzxOUQNu7Mmu1Jz wBwEZwscPliSAEKUrplW2hWVswdsyi3p5mjXKW6Ekxo8xdobuKunSn5qG3rqdp243XoF IxnOQu1sH+Gn0o59AxAFsHXlj0tvFXS53SONw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Gn8suQVYM0/PytL1fNvYzUjpec+1U7zCRfoSEqoUqYE=; b=HMkkBTji5pMcOxjyyEox/ozw8TbE5Re5Yj3KJBTrrFlxB+YlkgYumk7/FIwgoPc0Fg zGiZ/eQULhnUCgxN/f73TVpfUJia6R2lP6g4b1ylYwcWO0vIH75i12zaGZhb4PDDtSyK uPAK95ik1gB0KFL0Tmj/QsYRqTRflVSf9B/4hq2LQUmDZPh7n6R6gmwiZi0+Nd5CnqNT fhI0yP0cUq5SwKP6DcIpBBwJIkJp0plC/PyPNKyI2amKEjbKk1dyjV7MwTalEp4EP50Y FYt3sN5myeutt9Fw0O89DsdEuGhFFIEp4SVjCmLjorsZnYeF4WQcpsPH1eKQypjC0MvY pzWQ== X-Gm-Message-State: AOAM530nlHxkp8ovxkC8JsKZgsff9uwQ+g8ZAm8x+hAny3Z5DpV4NlaD KySLu/DuEbSFOVoPdHlLQx054MAr1hY//w== X-Google-Smtp-Source: ABdhPJxd/Zdjt2i9HKSy4ZpnvnCys5vcR4+XRsYtsamFEVARD3u1H5OcbYMZILUC1c8S+ghXS6htJw== X-Received: by 2002:a62:5142:0:b0:4a3:4d13:e7da with SMTP id f63-20020a625142000000b004a34d13e7damr35100667pfb.84.1638769766078; Sun, 05 Dec 2021 21:49:26 -0800 (PST) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:749e:cfe6:fd85:77b7]) by smtp.gmail.com with ESMTPSA id a1sm11492368pfv.99.2021.12.05.21.49.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Dec 2021 21:49:25 -0800 (PST) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Mon, 6 Dec 2021 14:49:17 +0900 Message-Id: <20211206054918.2467049-2-hiroh@chromium.org> X-Mailer: git-send-email 2.34.1.400.ga245620fadb-goog In-Reply-To: <20211206054918.2467049-1-hiroh@chromium.org> References: <20211206054918.2467049-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v10 2/3] libcamera: camera_sensor: Enable to set a test pattern mode X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" This adds a function to set a camera sensor driver a test pattern mode. CameraSensor initializes the test pattern mode by Off. Signed-off-by: Hirokazu Honda Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- include/libcamera/internal/camera_sensor.h | 11 ++- src/libcamera/camera_sensor.cpp | 82 +++++++++++++++++++--- 2 files changed, 80 insertions(+), 13 deletions(-) diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h index 310571ca..3362eaff 100644 --- a/include/libcamera/internal/camera_sensor.h +++ b/include/libcamera/internal/camera_sensor.h @@ -28,6 +28,8 @@ namespace libcamera { class BayerFormat; class MediaEntity; +struct CameraSensorProperties; + class CameraSensor : protected Loggable { public: @@ -47,6 +49,7 @@ public: { return testPatternModes_; } + int setTestPatternMode(controls::draft::TestPatternModeEnum testPatternMode); V4L2SubdeviceFormat getFormat(const std::vector &mbusCodes, const Size &size) const; @@ -73,15 +76,16 @@ private: int validateSensorDriver(); void initVimcDefaultProperties(); void initStaticProperties(); - void initTestPatternModes( - const std::map - &testPatternModeMap); + void initTestPatternModes(); int initProperties(); + int initTestPatternMode(controls::draft::TestPatternModeEnum testPatternMode); const MediaEntity *entity_; std::unique_ptr subdev_; unsigned int pad_; + const CameraSensorProperties *staticProps_; + std::string model_; std::string id_; @@ -89,6 +93,7 @@ private: std::vector mbusCodes_; std::vector sizes_; std::vector testPatternModes_; + controls::draft::TestPatternModeEnum testPatternMode_; Size pixelArraySize_; Rectangle activeArea_; diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp index f0aa9f24..8a79b970 100644 --- a/src/libcamera/camera_sensor.cpp +++ b/src/libcamera/camera_sensor.cpp @@ -54,8 +54,8 @@ LOG_DEFINE_CATEGORY(CameraSensor) * Once constructed the instance must be initialized with init(). */ CameraSensor::CameraSensor(const MediaEntity *entity) - : entity_(entity), pad_(UINT_MAX), bayerFormat_(nullptr), - properties_(properties::properties) + : entity_(entity), pad_(UINT_MAX), staticProps_(nullptr), + bayerFormat_(nullptr), properties_(properties::properties) { } @@ -161,7 +161,7 @@ int CameraSensor::init() if (ret) return ret; - return 0; + return initTestPatternMode(controls::draft::TestPatternModeEnum::TestPatternModeOff); } int CameraSensor::validateSensorDriver() @@ -300,22 +300,33 @@ void CameraSensor::initVimcDefaultProperties() void CameraSensor::initStaticProperties() { - const CameraSensorProperties *props = CameraSensorProperties::get(model_); - if (!props) + staticProps_ = CameraSensorProperties::get(model_); + if (!staticProps_) return; /* Register the properties retrieved from the sensor database. */ - properties_.set(properties::UnitCellSize, props->unitCellSize); + properties_.set(properties::UnitCellSize, staticProps_->unitCellSize); - initTestPatternModes(props->testPatternModes); + initTestPatternModes(); } -void CameraSensor::initTestPatternModes( - const std::map &testPatternModes) +void CameraSensor::initTestPatternModes() { const auto &v4l2TestPattern = controls().find(V4L2_CID_TEST_PATTERN); if (v4l2TestPattern == controls().end()) { - LOG(CameraSensor, Debug) << "No static test pattern map for \'" + LOG(CameraSensor, Debug) + << "V4L2_CID_TEST_PATTERN is not supported"; + return; + } + + ASSERT(staticProps_); + const auto &testPatternModes = staticProps_->testPatternModes; + if (testPatternModes.empty()) { + /* + * The camera sensor supports test patterns but we don't know + * how to map them so this should be fixed. + */ + LOG(CameraSensor, Error) << "No static test pattern map for \'" << model() << "\'"; return; } @@ -531,6 +542,57 @@ Size CameraSensor::resolution() const * \return The list of test pattern modes */ +/** + * \brief Set the test pattern mode for the camera sensor if it is not the + * currently set test pattern mode. + * \param[in] testPatternMode Test pattern mode control value to set the camera + * sensor + * + * \return 0 on success or a negative error code otherwise + */ +int CameraSensor::setTestPatternMode(controls::draft::TestPatternModeEnum testPatternMode) +{ + if (testPatternMode_ == testPatternMode) + return 0; + + return initTestPatternMode(testPatternMode); +} + +/** + * \brief Set the test pattern mode for the camera sensor + * \param[in] testPatternMode Test pattern mode control value to set the camera + * sensor + * + * \return 0 on success or a negative error code otherwise + */ +int CameraSensor::initTestPatternMode(controls::draft::TestPatternModeEnum testPatternMode) +{ + if (!staticProps_ || testPatternModes_.empty()) + return 0; + + auto it = std::find(testPatternModes_.begin(), testPatternModes_.end(), + testPatternMode); + if (it == testPatternModes_.end()) { + LOG(CameraSensor, Error) << "Unsupported test pattern mode " + << testPatternMode; + return -EINVAL; + } + + LOG(CameraSensor, Debug) << "Apply test pattern mode: " << testPatternMode; + + int32_t index = staticProps_->testPatternModes.at(testPatternMode); + ControlList ctrls{ controls() }; + ctrls.set(V4L2_CID_TEST_PATTERN, index); + + int ret = setControls(&ctrls); + if (ret) + return ret; + + testPatternMode_ = testPatternMode; + + return 0; +} + /** * \brief Retrieve the best sensor format for a desired output * \param[in] mbusCodes The list of acceptable media bus codes