From patchwork Mon Jun 28 16:32:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 12730 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 74E7EC3220 for ; Mon, 28 Jun 2021 16:32:55 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id DB2A8684D6; Mon, 28 Jun 2021 18:32:54 +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="ACOlRrJf"; dkim-atps=neutral Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2375560508 for ; Mon, 28 Jun 2021 18:32:53 +0200 (CEST) Received: by mail-pj1-x1029.google.com with SMTP id kt19so2582356pjb.2 for ; Mon, 28 Jun 2021 09:32:53 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=w8tjquK+IcBSMPTy8zTwYyPWYtVo4Tqk+xeA6vSCsBM=; b=ACOlRrJfG+FqoBLb5YvR9IQRzb+NebHuDKpaviod0k9C1ZNSDGf2GObtmvKGnuXwVg Qc42xzA/7Y7pTIp6ZhLH0MuF9JtERkxsuheEaZh+52jSrQfyGUScZ+JEmt1EzQg6dMGA NFbEZGnXmR4F5o2sKaPbD/OoNtZWVGQ+2OzmU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=w8tjquK+IcBSMPTy8zTwYyPWYtVo4Tqk+xeA6vSCsBM=; b=kYkfQBxNBF9wEe3vUgRyxlbi5V9J1W5SHzrqUc50/tD+NnR7gWCMknAS2Lu5E3CYhs SL0LYtODkdiCfQPrAe7ZAFFLNrMwADdP/2tjOfZbo1oYePg3NIVEjRvSJJf52rIpQQjV 586lnRYFMMeqzSvUcO1NHrCdZwLOxm2GdjOhL6OTxBIypP1j5exXC7U5z2UorzCAuJPM XzDcv4pJAtsH6doT7m2AM5qTcx/YcUlONCaMWp1YyezMGQ2Kyg9QODiIOpGGKyy8ejHJ DxX8HjSKk+6kfn9u5zTyYGLcV4usPQcwqYpa644rp3WQX+brMi8j+PGoRaYIdcwXbA2Y ciBg== X-Gm-Message-State: AOAM5316CXwOYFcjDIEns08ih6u91Xm8H9MXKV7l1yPZFBcE3DtLpvni mJdqkCUtr7EVKwBaLKRcYp5107AGuT+y6A== X-Google-Smtp-Source: ABdhPJwohq1jfVlAV1EHbip3KsfUXjHZHE3yl1i03yM9E+cattKFPEwWCcCw1Zcqmf/WsB3EOcMbNg== X-Received: by 2002:a17:902:aa0a:b029:128:c224:4f0a with SMTP id be10-20020a170902aa0ab0290128c2244f0amr10741423plb.58.1624897971406; Mon, 28 Jun 2021 09:32:51 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:a147:1cb:e226:4ed9]) by smtp.gmail.com with ESMTPSA id gg5sm5134201pjb.42.2021.06.28.09.32.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 09:32:50 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Tue, 29 Jun 2021 01:32:37 +0900 Message-Id: <20210628163237.3194582-3-hiroh@chromium.org> X-Mailer: git-send-email 2.32.0.93.g670b81a890-goog In-Reply-To: <20210628163237.3194582-1-hiroh@chromium.org> References: <20210628163237.3194582-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/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" Provides a function to set the camera sensor a test pattern mode. Signed-off-by: Hirokazu Honda --- include/libcamera/internal/camera_sensor.h | 2 ++ src/libcamera/camera_sensor.cpp | 35 ++++++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h index db12b07e..4ecce6c9 100644 --- a/include/libcamera/internal/camera_sensor.h +++ b/include/libcamera/internal/camera_sensor.h @@ -44,6 +44,7 @@ public: { return testPatternModes_; } + int setTestPatternMode(int32_t testPatternMode); V4L2SubdeviceFormat getFormat(const std::vector &mbusCodes, const Size &size) const; @@ -85,6 +86,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 ee53adf3..be2d32e3 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) { } @@ -515,6 +515,37 @@ 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; + + const CameraSensorProperties *props = CameraSensorProperties::get(model_); + if (!props) + return -EINVAL; + + auto it = props->testPatternModes.find(testPatternMode); + ASSERT(it != props->testPatternModes.end()); + + 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