From patchwork Tue Nov 2 02:55:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 14448 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 1AE91C324E for ; Tue, 2 Nov 2021 02:55:34 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 294C360159; Tue, 2 Nov 2021 03:55:33 +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="Q5AJ93KS"; dkim-atps=neutral Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0C2C860128 for ; Tue, 2 Nov 2021 03:55:32 +0100 (CET) Received: by mail-pf1-x436.google.com with SMTP id g11so6808868pfv.7 for ; Mon, 01 Nov 2021 19:55:31 -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=AyPVF5b+teiJdYnh1nhGdlslz3kzCEfGpuvgiTubbJ8=; b=Q5AJ93KSRO5jm4jYjCfQcQdv6R91Pvv1lCZogXXdtNWh8xEIb1DWLrN0k7ZrIFClZ5 edJrWq0QYhmd3hcxa9HBq1qocWFqaO8hbk6ZFT0ZPG8ZZF9cROIW8SALH+CuQRSU2a9Z KORej+9YYyQXG12JZ1PcZwFrb7lcz9Mpj9gRk= 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=AyPVF5b+teiJdYnh1nhGdlslz3kzCEfGpuvgiTubbJ8=; b=vg7Vjd4aNVicekv59Q+EhYc2jUKZPTYCI6nIahNGKbmVJ3A6587d81lcF5RprYQpiL e0tdl995Ie/UR15N7lyH2qhQgPXGw9qNj4mN4R1F/aGCEbD+8ZjPkHzTgV8GMtrf8aKQ +2Q1VmmU/hFxmFkMAZk2OVU11XD+UOlrC1l9ifvyuQRv+/JJNupgJKCcywWZWtz0fK8X i0/q8tDAm0jKfBarvrLFesruKZXZpXtM/LN1daLXjZ+HE8hshBBPfRU4vVa7sm6fcJ79 Njja/5kyfV+3dfjM/h8mjHPb1VNVItt2yoL2DZt73i5yNWVJcPjQ4SsGT9PLZaZoNsrp gygg== X-Gm-Message-State: AOAM532S9mb/aidocNB5aWWezUItKfT8npfb+bubNw1XUA+Q7/VoU/CT DwAvRKkOkl05tKDtf0pVwLyAFEKwRrV1pA== X-Google-Smtp-Source: ABdhPJxzvJscO+/wH0bAzp6Hd03+W0oZdIpy6yshMmma0VoLt/eO2ydvJIBzALnYb5gTjbFToVjO0A== X-Received: by 2002:aa7:8213:0:b0:47b:fc35:db26 with SMTP id k19-20020aa78213000000b0047bfc35db26mr33459092pfi.1.1635821730318; Mon, 01 Nov 2021 19:55:30 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:da96:7796:6eb0:5a01]) by smtp.gmail.com with ESMTPSA id n15sm3589677pfv.216.2021.11.01.19.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 19:55:29 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Tue, 2 Nov 2021 11:55:22 +0900 Message-Id: <20211102025522.735085-2-hiroh@chromium.org> X-Mailer: git-send-email 2.33.1.1089.g2158813163f-goog In-Reply-To: <20211102025522.735085-1-hiroh@chromium.org> References: <20211102025522.735085-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 2/2] 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 --- src/libcamera/pipeline/ipu3/ipu3.cpp | 41 ++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index eb714aa6..e81ba63c 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_; @@ -78,6 +79,7 @@ public: std::unique_ptr ipa_; std::queue pendingRequests_; + std::queue processingRequests_; ControlInfoMap ipaControls_; @@ -569,6 +571,8 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c) cio2->sensor()->sensorInfo(&sensorInfo); data->cropRegion_ = sensorInfo.analogCrop; + cio2->sensor()->setTestPatternMode(controls::draft::TestPatternModeOff); + /* * Configure the H/V flip controls based on the combination of * the sensor and user transform. @@ -797,11 +801,13 @@ void PipelineHandlerIPU3::stop(Camera *camera) int ret = 0; data->cancelPendingRequests(); + data->processingRequests_ = {}; data->ipa_->stop(); ret |= data->imgu_->stop(); ret |= data->cio2_.stop(); + if (ret) LOG(IPU3, Warning) << "Failed to stop camera " << camera->id(); @@ -852,6 +858,8 @@ void IPU3CameraData::queuePendingRequests() info->rawBuffer = rawBuffer; + processingRequests_.push(request); + ipa::ipu3::IPU3Event ev; ev.op = ipa::ipu3::EventProcessControls; ev.frame = info->id; @@ -1130,8 +1138,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; @@ -1422,6 +1430,35 @@ void IPU3CameraData::statBufferReady(FrameBuffer *buffer) ipa_->processEvent(ev); } +void IPU3CameraData::frameStart(uint32_t sequence) +{ + if (!processingRequests_.empty()) { + /* Assumes applying the test pattern mode affects immediately. */ + Request *request = processingRequests_.front(); + processingRequests_.pop(); + + if (request->controls().contains(controls::draft::TestPatternMode)) { + const int32_t testPatternMode = request->controls().get( + controls::draft::TestPatternMode); + + LOG(IPU3, Debug) << "Apply test pattern mode: " + << testPatternMode; + + int ret = cio2_.sensor()->setTestPatternMode(testPatternMode); + if (ret) { + LOG(IPU3, Error) << "Failed to set test pattern mode: " + << ret; + } else { + request->metadata().set(controls::draft::TestPatternMode, + testPatternMode); + } + } + } + + /* Controls that don't affect immediately are applied in delayedCtrls. */ + delayedCtrls_->applyControls(sequence); +} + REGISTER_PIPELINE_HANDLER(PipelineHandlerIPU3) } /* namespace libcamera */