From patchwork Wed Nov 10 03:16:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 14507 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 B3E8EC324E for ; Wed, 10 Nov 2021 03:17:05 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 55AD760345; Wed, 10 Nov 2021 04:17:05 +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="KSidUDw6"; dkim-atps=neutral Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E3E0C60345 for ; Wed, 10 Nov 2021 04:17:02 +0100 (CET) Received: by mail-pg1-x52c.google.com with SMTP id r28so983009pga.0 for ; Tue, 09 Nov 2021 19:17:02 -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=oy7jE/IlKj7PzVfnuxUOddepDqkTfQ/0J9TOVft3tQU=; b=KSidUDw6jmNxrw0miur1Y8OUeFCD5oqxEy9iZKxywPselfeUpGHf8GvI9GKLsao8Vr 2hy74yG/DadA6K4HdLASKYW7G8y56PFai7rA51mdq2xPmqx6stxfygjxhbQdCtOexZDl Bs0gZ3jgMH8lVZSLa0Incpp6ssv/fA0O4uT6E= 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=oy7jE/IlKj7PzVfnuxUOddepDqkTfQ/0J9TOVft3tQU=; b=mLJmzTa38TwcWlqgWqnWbzNfygUWrmBDaZmpN9SuevciRhdxavN1mCvk3k4oEepr3N OTwgefpQ8OgVVKHzDyDJCJtk/VkZJgPkZezsNM3pvUcVjFMSuKr2audrKqy591nlRzH8 T9d9LLpPOrgNze2eDFq4OSoE4rXWlSAmKzbwmVoxL6h8zNmi7niX2Y0DPXcwdvI4miFz EV2XYsnVU5TNC6BgcGCcfeTjJnnnBDyst987N59XeZx0zOh4bJkyz3dLdfxzynbXlurI gB0JUvpCk+VIViS8uJOEY7u2DuXBqRYNZpWs/EX3YxNqwKGvpEM/bsltYaJDn2LL/4C6 RMtQ== X-Gm-Message-State: AOAM531U8Irwk7edIQBzxhHO7XCUtVRBhftzkaUI8P+Zq9J125GCsSE7 g/oYGt2PKN8+tml3nELZC5PmkSKVKTHR0w== X-Google-Smtp-Source: ABdhPJyVDBj+dqrZMIliAYti0rgV90U53hnDNi+fWklUyqHckCznCfzDUG0DMX8OG08xkxa5bcyxrg== X-Received: by 2002:a63:8b41:: with SMTP id j62mr9782680pge.420.1636514221037; Tue, 09 Nov 2021 19:17:01 -0800 (PST) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:4a73:e1bd:9b3f:4903]) by smtp.gmail.com with ESMTPSA id k3sm7550163pff.211.2021.11.09.19.16.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Nov 2021 19:17:00 -0800 (PST) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Wed, 10 Nov 2021 12:16:51 +0900 Message-Id: <20211110031651.2808099-3-hiroh@chromium.org> X-Mailer: git-send-email 2.34.0.rc0.344.g81b53c2807-goog In-Reply-To: <20211110031651.2808099-1-hiroh@chromium.org> References: <20211110031651.2808099-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v5 3/3] libcamera: pipeline: ipu3: Apply the requested 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 enables ipu3 pipeline handler to apply the test pattern mode per frame. Signed-off-by: Hirokazu Honda Reviewed-by: Jean-Michel Hautbois --- include/libcamera/internal/camera_sensor.h | 1 + src/libcamera/camera_sensor.cpp | 34 ++++++++++++++++++++++ src/libcamera/pipeline/ipu3/ipu3.cpp | 29 ++++++++++++++++-- 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h index 60ce0c45..ed782476 100644 --- a/include/libcamera/internal/camera_sensor.h +++ b/include/libcamera/internal/camera_sensor.h @@ -58,6 +58,7 @@ public: const ControlInfoMap &controls() const; ControlList getControls(const std::vector &ids); int setControls(ControlList *ctrls); + int applyRequestControls(Request *request); V4L2Subdevice *device() { return subdev_.get(); } diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp index 35925a95..db13d9ea 100644 --- a/src/libcamera/camera_sensor.cpp +++ b/src/libcamera/camera_sensor.cpp @@ -755,6 +755,40 @@ int CameraSensor::setControls(ControlList *ctrls) return subdev_->setControls(ctrls); } +/** + * \brief Apply controls associated with Request + * \param[in] request Request that may contain contorls to be applied + * + * Some controls have to be applied for a capture associated with Request. + * This picks up such controls and set the driver them. + * + * \return 0 on success or an error code otherwise + */ +int32_t CameraSensor::applyRequestControls(Request *request) +{ + /* Assumes applying the test pattern mode affects immediately. */ + if (request->controls().contains(controls::draft::TestPatternMode)) { + const int32_t testPatternMode = request->controls().get( + controls::draft::TestPatternMode); + + LOG(CameraSensor, Debug) << "Apply test pattern mode: " + << testPatternMode; + + int ret = setTestPatternMode( + static_cast(testPatternMode)); + if (ret) { + LOG(CameraSensor, Error) + << "Failed to set test pattern mode: " << ret; + return ret; + } + + request->metadata().set(controls::draft::TestPatternMode, + testPatternMode); + } + + return 0; +} + /** * \fn CameraSensor::device() * \brief Retrieve the camera sensor device diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 63cb7f11..dd662ff1 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -59,6 +59,7 @@ public: void statBufferReady(FrameBuffer *buffer); void queuePendingRequests(); void cancelPendingRequests(); + void frameStart(uint32_t sequence); CIO2Device cio2_; ImgUDevice *imgu_; @@ -77,7 +78,10 @@ public: std::unique_ptr ipa_; + /* Requests before queueing cio2 device. */ std::queue pendingRequests_; + /* Requests queued in cio2 device and before passing imgu device. */ + std::queue processingRequests_; ControlInfoMap ipaControls_; @@ -802,6 +806,7 @@ void PipelineHandlerIPU3::stop(Camera *camera) ret |= data->imgu_->stop(); ret |= data->cio2_.stop(); + if (ret) LOG(IPU3, Warning) << "Failed to stop camera " << camera->id(); @@ -822,6 +827,8 @@ void IPU3CameraData::cancelPendingRequests() pipe()->completeRequest(request); pendingRequests_.pop(); } + + data->processingRequests_ = {}; } void IPU3CameraData::queuePendingRequests() @@ -852,6 +859,8 @@ void IPU3CameraData::queuePendingRequests() info->rawBuffer = rawBuffer; + processingRequests_.push(request); + ipa::ipu3::IPU3Event ev; ev.op = ipa::ipu3::EventProcessControls; ev.frame = info->id; @@ -1131,8 +1140,8 @@ int PipelineHandlerIPU3::registerCameras() data->delayedCtrls_ = std::make_unique(cio2->sensor()->device(), params); - data->cio2_.frameStart().connect(data->delayedCtrls_.get(), - &DelayedControls::applyControls); + data->cio2_.frameStart().connect(data.get(), + &IPU3CameraData::frameStart); /* Convert the sensor rotation to a transformation */ int32_t rotation = 0; @@ -1423,6 +1432,22 @@ void IPU3CameraData::statBufferReady(FrameBuffer *buffer) ipa_->processEvent(ev); } +void IPU3CameraData::frameStart(uint32_t sequence) +{ + if (!processingRequests_.empty()) { + /* Handle controls which are to be set ready for the next frame to start. */ + Request *request = processingRequests_.front(); + processingRequests_.pop(); + + int ret = cio2_.sensor()->applyRequestControls(request); + if (ret) + LOG(IPU3, Error) << "Failed applying controls: " << ret; + } + + /* Controls that don't affect immediately are applied in delayedCtrls. */ + delayedCtrls_->applyControls(sequence); +} + REGISTER_PIPELINE_HANDLER(PipelineHandlerIPU3) } /* namespace libcamera */