From patchwork Tue Oct 26 10:39:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 14331 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 B85B7BF415 for ; Tue, 26 Oct 2021 10:39:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 365E764877; Tue, 26 Oct 2021 12:39:24 +0200 (CEST) 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="QWdI4mv7"; dkim-atps=neutral Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A18BD60123 for ; Tue, 26 Oct 2021 12:39:22 +0200 (CEST) Received: by mail-pl1-x630.google.com with SMTP id s24so6028978plp.0 for ; Tue, 26 Oct 2021 03:39:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4MOKPE6Iq5ipEBl3urpGkTkVoCDVzQkbU/G4Vem61gI=; b=QWdI4mv7n8q+ZMDcS9PtCXhd8gI28xVyBXThZY4B/HrQWw++h+63Ga+ksuwQv+KqnY AAtoUMoIh1I8U9XZuAZzdRmSfIEoV/sTLGgAjNzuI150krWmr9X60bTmKSvHEjmMNgBp 3JWIUfhU8L79bd1CDEooSmJsEp5pXCcIxdbTQ= 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:mime-version :content-transfer-encoding; bh=4MOKPE6Iq5ipEBl3urpGkTkVoCDVzQkbU/G4Vem61gI=; b=MqMFptpKL+QrWfhDY/ta+2x5XCF5hpD7nndfQo/T+R4/uASp9tSCxE6KSFbz83fxXx ZlQZLeRlHJPoI2bUsQJqWosIVKf8nAM3i27QiVF/XLVHcfiynGLDQLalj6ZzjGX9gvn/ Qu5LQ+ISMVMayHNcGZriXmHW9gTxD5cA0DIWQptofHWFRaz4LhjhBmjHHiGYI1QnyPDs psrkMXI4pBGw+3mxdSWUiXxYf7T+zSamnRrNbHog5Z2DCc32bt4jXtYQZWyq6RgqZuHh p1zeAj98DChFYW63miG3Ln6WZO22k7hMet5H6FJsokv0G7moBue7vozdd6vVfxl0UZpe dLkg== X-Gm-Message-State: AOAM530kqUy+7Inx9GKjDhMnJC6KjsWtczK6gpH1sBzamlbh9j0NwCWU 84lB/YhEfFM8oWHOIfAMqpqydQY5aRRAAA== X-Google-Smtp-Source: ABdhPJxJgXJ3kxeK5ce/I5CSyDnUr94rNttYm48BHqctY7QHe0HmTuRILt902yH9fhGDR2X9v7oKaQ== X-Received: by 2002:a17:902:758b:b0:13f:974a:959f with SMTP id j11-20020a170902758b00b0013f974a959fmr21330320pll.40.1635244760412; Tue, 26 Oct 2021 03:39:20 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:d534:ad07:39b3:6828]) by smtp.gmail.com with ESMTPSA id b18sm25683732pfl.24.2021.10.26.03.39.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 03:39:19 -0700 (PDT) From: Hirokazu Honda 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 Subject: [libcamera-devel] [PATCH v2 1/2] 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. Signed-off-by: Hirokazu Honda Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- include/libcamera/internal/camera_sensor.h | 6 +++ src/libcamera/camera_sensor.cpp | 50 +++++++++++++++++++--- 2 files changed, 50 insertions(+), 6 deletions(-) diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h index d25a1165..d08cfec5 100644 --- a/include/libcamera/internal/camera_sensor.h +++ b/include/libcamera/internal/camera_sensor.h @@ -26,6 +26,8 @@ namespace libcamera { class BayerFormat; class MediaEntity; +struct CameraSensorProperties; + class CameraSensor : protected Loggable { public: @@ -44,6 +46,7 @@ public: { return testPatternModes_; } + int setTestPatternMode(int32_t testPatternMode); V4L2SubdeviceFormat getFormat(const std::vector &mbusCodes, const Size &size) const; @@ -78,6 +81,8 @@ private: std::unique_ptr subdev_; unsigned int pad_; + const CameraSensorProperties *props_; + std::string model_; std::string id_; @@ -85,6 +90,7 @@ private: std::vector mbusCodes_; std::vector sizes_; std::vector testPatternModes_; + int32_t testPatternMode_; Size pixelArraySize_; Rectangle activeArea_; diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp index 9fdb8c09..47bb13f9 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), testPatternMode_(-1), + bayerFormat_(nullptr), properties_(properties::properties) { } @@ -300,14 +300,16 @@ void CameraSensor::initVimcDefaultProperties() void CameraSensor::initStaticProperties() { - const CameraSensorProperties *props = CameraSensorProperties::get(model_); - if (!props) + props_ = CameraSensorProperties::get(model_); + if (!props_) { + LOG(CameraSensor, Debug) << "No properties for " << model_; return; + } /* Register the properties retrieved from the sensor database. */ - properties_.set(properties::UnitCellSize, props->unitCellSize); + properties_.set(properties::UnitCellSize, props_->unitCellSize); - initTestPatternModes(props->testPatternModes); + initTestPatternModes(props_->testPatternModes); } void CameraSensor::initTestPatternModes( @@ -531,6 +533,42 @@ Size CameraSensor::resolution() const * \return The list of test pattern modes */ +/** + * \brief Set the camera sensor a specified controls::TestPatternMode + * \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(int32_t testPatternMode) +{ + if (testPatternMode_ == testPatternMode) + return 0; + + if (!props_) { + LOG(CameraSensor, Error) << "No property is found"; + return -EINVAL; + } + + auto it = props_->testPatternModes.find(testPatternMode); + if (it == props_->testPatternModes.end()) { + LOG(CameraSensor, Error) << "Unsupported test pattern mode: " + << testPatternMode; + return -EINVAL; + } + + ControlList ctrls{ controls() }; + ctrls.set(V4L2_CID_TEST_PATTERN, it->second); + + 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