{"id":14332,"url":"https://patchwork.libcamera.org/api/1.1/patches/14332/?format=json","web_url":"https://patchwork.libcamera.org/patch/14332/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20211026103914.31449-2-hiroh@chromium.org>","date":"2021-10-26T10:39:14","name":"[libcamera-devel,v2,2/2] libcamera: pipeline: ipu3: Apply the requested test pattern mode","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"4246d947adc0d0cbe9f124be9d1210f3632e465b","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/1.1/people/63/?format=json","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/14332/mbox/","series":[{"id":2657,"url":"https://patchwork.libcamera.org/api/1.1/series/2657/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2657","date":"2021-10-26T10:39:13","name":"[libcamera-devel,v2,1/2] libcamera: camera_sensor: Enable to set a test pattern mode","version":2,"mbox":"https://patchwork.libcamera.org/series/2657/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14332/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14332/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id D990DBF415\n\tfor ;\n\tTue, 26 Oct 2021 10:39:27 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9203F64877;\n\tTue, 26 Oct 2021 12:39:27 +0200 (CEST)","from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com\n\t[IPv6:2607:f8b0:4864:20::62e])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D75C060123\n\tfor ;\n\tTue, 26 Oct 2021 12:39:23 +0200 (CEST)","by mail-pl1-x62e.google.com with SMTP id i5so10019357pla.5\n\tfor ;\n\tTue, 26 Oct 2021 03:39:23 -0700 (PDT)","from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:d534:ad07:39b3:6828])\n\tby smtp.gmail.com with ESMTPSA id\n\tb18sm25683732pfl.24.2021.10.26.03.39.20\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 26 Oct 2021 03:39:21 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"DyKGdp0y\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=sn/P85sG2vAsIOKU//aGC58jCODDm1MBR6KhgoqZOgo=;\n\tb=DyKGdp0yK5X/5KyrwrZWyRtcvaPcEGfMEa3BoRFrlepcQjMF6fyjlNaUa/OO8bwDlQ\n\tOIP042C0rPVB7PIZ6J+ejg1vKI5nkgeliaosUvR6HJFvKqzCcZIXgIUIlFgd+GG9ZIg2\n\tJ5MGy+vR+RfcLfe4RFBVkekQfn1+aNsOlCwx0=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=sn/P85sG2vAsIOKU//aGC58jCODDm1MBR6KhgoqZOgo=;\n\tb=k/Zh80DmehUEyk/iR1cUkNZwJicIR/XCoZ1JLoqWZWnpoXtAAP7+CvmGWFXBG+Q/Yo\n\tyn9oqoHvi38reLd3GZwkZR9+v1LZCLqrEhGnY2lNrn917mRqTiRQI5+gRt9sZaiq8/w0\n\tYSC1lwp1npMuy0Uk0fbSSbX4i2lIPQ8DR9/816DlCxu1ZWYLRCjsXB/sqiRmuMJYf7gd\n\tuz7OMrSfBsHTY4bbZzFCNSQ7I1wkpESuonjtNZy4TpTjK3C/zrCbmAPt+36j3UvnzryB\n\tPkj0akkXTEI8EtlATMSb6Y7VgMQPflZZ2rFEzapu7Ftwpq30B1HR/XT9TMzzfcHS2GJx\n\twvMg==","X-Gm-Message-State":"AOAM532o7lCuPgZEGfYujU83NQQEI8gqXlt9ep4StRRPnDgYUtzzEmez\n\tu0J/TyHAIUJ5dsYM25CJUA13FudcOqlj6Q==","X-Google-Smtp-Source":"ABdhPJxoNgKolCRd32R7vEkhAoBMPmJIWZ7NRxDUb2hzsqyoM6WfhF0jo+FtBs0ueCX2POowRQ+gDQ==","X-Received":"by 2002:a17:90a:b105:: with SMTP id\n\tz5mr40864231pjq.64.1635244762164; \n\tTue, 26 Oct 2021 03:39:22 -0700 (PDT)","From":"Hirokazu Honda ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 26 Oct 2021 19:39:14 +0900","Message-Id":"<20211026103914.31449-2-hiroh@chromium.org>","X-Mailer":"git-send-email 2.33.0.1079.g6e70778dc9-goog","In-Reply-To":"<20211026103914.31449-1-hiroh@chromium.org>","References":"<20211026103914.31449-1-hiroh@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 2/2] libcamera: pipeline: ipu3: Apply\n\tthe requested test pattern mode","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"This enables ipu3 pipeline handler to apply the test pattern mode\nper frame.\n\nSigned-off-by: Hirokazu Honda \nReviewed-by: Jean-Michel Hautbois \n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 41 ++++++++++++++++++++++++++--\n 1 file changed, 39 insertions(+), 2 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex eb714aa6..e81ba63c 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -59,6 +59,7 @@ public:\n \tvoid statBufferReady(FrameBuffer *buffer);\n \tvoid queuePendingRequests();\n \tvoid cancelPendingRequests();\n+\tvoid frameStart(uint32_t sequence);\n \n \tCIO2Device cio2_;\n \tImgUDevice *imgu_;\n@@ -78,6 +79,7 @@ public:\n \tstd::unique_ptr ipa_;\n \n \tstd::queue pendingRequests_;\n+\tstd::queue processingRequests_;\n \n \tControlInfoMap ipaControls_;\n \n@@ -569,6 +571,8 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \tcio2->sensor()->sensorInfo(&sensorInfo);\n \tdata->cropRegion_ = sensorInfo.analogCrop;\n \n+\tcio2->sensor()->setTestPatternMode(controls::draft::TestPatternModeOff);\n+\n \t/*\n \t * Configure the H/V flip controls based on the combination of\n \t * the sensor and user transform.\n@@ -797,11 +801,13 @@ void PipelineHandlerIPU3::stop(Camera *camera)\n \tint ret = 0;\n \n \tdata->cancelPendingRequests();\n+\tdata->processingRequests_ = {};\n \n \tdata->ipa_->stop();\n \n \tret |= data->imgu_->stop();\n \tret |= data->cio2_.stop();\n+\n \tif (ret)\n \t\tLOG(IPU3, Warning) << \"Failed to stop camera \" << camera->id();\n \n@@ -852,6 +858,8 @@ void IPU3CameraData::queuePendingRequests()\n \n \t\tinfo->rawBuffer = rawBuffer;\n \n+\t\tprocessingRequests_.push(request);\n+\n \t\tipa::ipu3::IPU3Event ev;\n \t\tev.op = ipa::ipu3::EventProcessControls;\n \t\tev.frame = info->id;\n@@ -1130,8 +1138,8 @@ int PipelineHandlerIPU3::registerCameras()\n \t\tdata->delayedCtrls_ =\n \t\t\tstd::make_unique(cio2->sensor()->device(),\n \t\t\t\t\t\t\t params);\n-\t\tdata->cio2_.frameStart().connect(data->delayedCtrls_.get(),\n-\t\t\t\t\t\t &DelayedControls::applyControls);\n+\t\tdata->cio2_.frameStart().connect(data.get(),\n+\t\t\t\t\t\t &IPU3CameraData::frameStart);\n \n \t\t/* Convert the sensor rotation to a transformation */\n \t\tint32_t rotation = 0;\n@@ -1422,6 +1430,35 @@ void IPU3CameraData::statBufferReady(FrameBuffer *buffer)\n \tipa_->processEvent(ev);\n }\n \n+void IPU3CameraData::frameStart(uint32_t sequence)\n+{\n+\tif (!processingRequests_.empty()) {\n+\t\t/* Assumes applying the test pattern mode affects immediately. */\n+\t\tRequest *request = processingRequests_.front();\n+\t\tprocessingRequests_.pop();\n+\n+\t\tif (request->controls().contains(controls::draft::TestPatternMode)) {\n+\t\t\tconst int32_t testPatternMode = request->controls().get(\n+\t\t\t\tcontrols::draft::TestPatternMode);\n+\n+\t\t\tLOG(IPU3, Debug) << \"Apply test pattern mode: \"\n+\t\t\t\t\t << testPatternMode;\n+\n+\t\t\tint ret = cio2_.sensor()->setTestPatternMode(testPatternMode);\n+\t\t\tif (ret) {\n+\t\t\t\tLOG(IPU3, Error) << \"Failed to set test pattern mode: \"\n+\t\t\t\t\t\t << ret;\n+\t\t\t} else {\n+\t\t\t\trequest->metadata().set(controls::draft::TestPatternMode,\n+\t\t\t\t\t\t\ttestPatternMode);\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\t/* Controls that don't affect immediately are applied in delayedCtrls. */\n+\tdelayedCtrls_->applyControls(sequence);\n+}\n+\n REGISTER_PIPELINE_HANDLER(PipelineHandlerIPU3)\n \n } /* namespace libcamera */\n","prefixes":["libcamera-devel","v2","2/2"]}