From patchwork Fri Nov 26 05:08:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 14793 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 981C7BDB13 for ; Fri, 26 Nov 2021 05:08:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4B493604F9; Fri, 26 Nov 2021 06:08:24 +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="RvavMBfF"; dkim-atps=neutral Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 8315C6011D for ; Fri, 26 Nov 2021 06:08:21 +0100 (CET) Received: by mail-pl1-x62d.google.com with SMTP id m24so5905862pls.10 for ; Thu, 25 Nov 2021 21:08:21 -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=BMR9GeCOSQN+ULweUyQmyaMYtRuhwZuDi/MCbB2HO6E=; b=RvavMBfFNrtiUY0AF7q1Plssa7a1DfYW5uZLrQm09jB52y9qupy/AH80WdVuOFfq5r oNUXTv/2nGzmi32ow3/pl0RY7JwOkZuPjtMqhvOfyFaDNkp/w1WLpVC0HgXJ2Fw1dfP2 5ytz5U1zHRjyB5mUyPPqufORKusR92j94h9TM= 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=BMR9GeCOSQN+ULweUyQmyaMYtRuhwZuDi/MCbB2HO6E=; b=qYDOpJE00E+L7Z21GgmAMl2gTwaLE4sDRjJwGvQXPqK7GZBVjfuL+9sH0tNF2wunDl IupH8hpM+6U9U1TNo7XyoRQCGFFSuI9oJY1K9l+vQFtMz4l4onSYJ0JiEXs0nlPokSCl cET+smc9pPCj98/KovdfBYBwVfyOFb6/9deTL+u5MknPht1uUPgfqONhTdTJ3Nuu7GqK fn8RLrUmQzEVTL3Sbxxe6yTyj32kP+q1b4GROJJQcSc2COkd7mrBV0wXeMNnhPafQXUV GcRqeWJMkl1GbJiRXo5BdeV0/2jo5JYcHa7DfCqyn5DsQggZK6bQAG6jLinKFZOK8wl9 C7nQ== X-Gm-Message-State: AOAM533HkL11IlMgn0+AxRdDRsGtefMVpal2i6f4nOnLFhIhG1Jav/5f 77eZmhO6sik2Jt28g5P32FdXxril2agt2w== X-Google-Smtp-Source: ABdhPJwNtyRH5v7heJedoJUBODONnd8MxJJJcCqEz78fja42RWehMrgO6W2qBYKMUIjqlAd0ffsEzg== X-Received: by 2002:a17:90a:be10:: with SMTP id a16mr12891471pjs.133.1637903299784; Thu, 25 Nov 2021 21:08:19 -0800 (PST) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:139c:952e:8861:d909]) by smtp.gmail.com with ESMTPSA id k6sm9280248pjt.14.2021.11.25.21.08.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 21:08:19 -0800 (PST) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Fri, 26 Nov 2021 14:08:09 +0900 Message-Id: <20211126050810.1871781-3-hiroh@chromium.org> X-Mailer: git-send-email 2.34.0.rc2.393.gf8c9666880-goog In-Reply-To: <20211126050810.1871781-1-hiroh@chromium.org> References: <20211126050810.1871781-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v8 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 --- include/libcamera/internal/camera_sensor.h | 6 ++ src/libcamera/camera_sensor.cpp | 75 ++++++++++++++++++++-- 2 files changed, 74 insertions(+), 7 deletions(-) diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h index edef2220..a110fd08 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; @@ -82,6 +85,8 @@ private: std::unique_ptr subdev_; unsigned int pad_; + const CameraSensorProperties *staticProps_; + std::string model_; std::string id_; @@ -89,6 +94,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..2c6312d4 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,6 +161,21 @@ int CameraSensor::init() if (ret) return ret; + auto initTestPatternMode = controls::draft::TestPatternModeEnum::TestPatternModeOff; + if (staticProps_) { + auto it = staticProps_->testPatternModes.find(initTestPatternMode); + if (it != staticProps_->testPatternModes.end()) { + ControlList ctrls{ controls() }; + ctrls.set(V4L2_CID_TEST_PATTERN, it->second); + + ret = setControls(&ctrls); + if (ret) + return ret; + + testPatternMode_ = initTestPatternMode; + } + } + return 0; } @@ -300,14 +315,14 @@ 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(staticProps_->testPatternModes); } void CameraSensor::initTestPatternModes( @@ -315,7 +330,17 @@ 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; + } + + 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 +556,42 @@ Size CameraSensor::resolution() const * \return The list of test pattern modes */ +/** + * \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::setTestPatternMode(controls::draft::TestPatternModeEnum testPatternMode) +{ + if (testPatternMode_ == testPatternMode) + return 0; + + 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; + } + + 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