{"id":15040,"url":"https://patchwork.libcamera.org/api/1.1/patches/15040/?format=json","web_url":"https://patchwork.libcamera.org/patch/15040/","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":"<20211206054918.2467049-3-hiroh@chromium.org>","date":"2021-12-06T05:49:18","name":"[libcamera-devel,v10,3/3] libcamera: pipeline: ipu3: Apply a requested test pattern mode","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"a8ef1387671190721acb1aae7ee7f0f2aee4e55e","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/15040/mbox/","series":[{"id":2816,"url":"https://patchwork.libcamera.org/api/1.1/series/2816/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2816","date":"2021-12-06T05:49:16","name":"[libcamera-devel,v10,1/3] libcamera: camera_sensor: Reference test pattern modes by enum type","version":10,"mbox":"https://patchwork.libcamera.org/series/2816/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15040/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15040/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 76054BDB13\n\tfor ;\n\tMon, 6 Dec 2021 05:49:33 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1E3F760822;\n\tMon, 6 Dec 2021 06:49:33 +0100 (CET)","from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com\n\t[IPv6:2607:f8b0:4864:20::1036])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C94AB605C4\n\tfor ;\n\tMon, 6 Dec 2021 06:49:29 +0100 (CET)","by mail-pj1-x1036.google.com with SMTP id x7so6890026pjn.0\n\tfor ;\n\tSun, 05 Dec 2021 21:49:29 -0800 (PST)","from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:749e:cfe6:fd85:77b7])\n\tby smtp.gmail.com with ESMTPSA id\n\ta1sm11492368pfv.99.2021.12.05.21.49.26\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSun, 05 Dec 2021 21:49:27 -0800 (PST)"],"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=\"a5h5D9h+\"; 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=dHKC2RYHq2gqVWdlhIepmvHhZoUkoLTI/xkbg0KNkD0=;\n\tb=a5h5D9h+iLpXPpN318V6ecKKpbo6yP0zrFF9O3fEYmkk3MO1pp5c+KM40mrgbSOgv9\n\tTsSS4zAklCHU/4d13SKy3LAlSYBBChoCMzu5ztkbzUd8q/Q9RiCFWvXRYW+WQcTqYbci\n\tGPyS8gL17kgdvroMj8D77G5dgVlhzS9diq3Tw=","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=dHKC2RYHq2gqVWdlhIepmvHhZoUkoLTI/xkbg0KNkD0=;\n\tb=AUgnm4X8jeUB/wqf/GSAybpNDmULIavuR5WSUudcQ9qdxBg7WVQ3t3s0dMkU3bXb92\n\thArjco05N4Yau9Kqz0V/64WTZU9rag76IeFfPd3+qvJFGSnlsrfzGLeRS0wBk7McDMPP\n\tG7WQYZ2G90YFWUzcGAL5HaV+dJX3orgmsIGkAo9iIIgTMCg36fc171jvM2O+NYqBwI4k\n\tV85t9mRGZwTH51tzarFpzL5iIacsp5fJlFOIt8xsxsu+wGquGRDf2SssquhU7Qbgeb7l\n\tCUZBn7ZNaFa513nJQouIktQU8hsKQPX59IIKJFZxdl66WWKAuW171h0dTcWoScfTms48\n\tC4oA==","X-Gm-Message-State":"AOAM531nQMfe1hEv8FO17xkWA1sMc7cAbHN56DChMak3xQAsY8aJm5jP\n\tlt/GKTnvdXoam8fyDOlQbuPAnqzAxwAGKw==","X-Google-Smtp-Source":"ABdhPJz7Qvw3eVnGCsUlRwJurehoG4QyX5QpAiWeXBZksIGvl0YpwJERtPs6Vg6TxSa/xZf+e6NlOQ==","X-Received":"by 2002:a17:902:e5d0:b0:141:cdfe:97d7 with SMTP id\n\tu16-20020a170902e5d000b00141cdfe97d7mr40752563plf.65.1638769768062; \n\tSun, 05 Dec 2021 21:49:28 -0800 (PST)","From":"Hirokazu Honda ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 6 Dec 2021 14:49:18 +0900","Message-Id":"<20211206054918.2467049-3-hiroh@chromium.org>","X-Mailer":"git-send-email 2.34.1.400.ga245620fadb-goog","In-Reply-To":"<20211206054918.2467049-1-hiroh@chromium.org>","References":"<20211206054918.2467049-1-hiroh@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v10 3/3] libcamera: pipeline: ipu3: Apply\n\ta 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 introduces a way to set controls immediately for a capture\nin ipu3 pipeline handler. It enables to apply a test pattern mode\nper frame.\n\nSigned-off-by: Hirokazu Honda \nReviewed-by: Jacopo Mondi \nReviewed-by: Jean-Michel Hautbois \n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 59 +++++++++++++++++++++++++++-\n 1 file changed, 57 insertions(+), 2 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 25490dcf..ee1ad27e 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@@ -76,7 +77,10 @@ public:\n \n \tstd::unique_ptr ipa_;\n \n+\t/* Requests before queueing cio2 device. */\n \tstd::queue pendingRequests_;\n+\t/* Requests queued in cio2 device and before passing imgu device. */\n+\tstd::queue processingRequests_;\n \n \tControlInfoMap ipaControls_;\n \n@@ -564,6 +568,11 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \tif (ret)\n \t\treturn ret;\n \n+\tret = cio2->sensor()->setTestPatternMode(\n+\t\tcontrols::draft::TestPatternModeEnum::TestPatternModeOff);\n+\tif (ret)\n+\t\treturn ret;\n+\n \tIPACameraSensorInfo sensorInfo;\n \tcio2->sensor()->sensorInfo(&sensorInfo);\n \tdata->cropRegion_ = sensorInfo.analogCrop;\n@@ -811,6 +820,8 @@ void PipelineHandlerIPU3::stop(Camera *camera)\n \n void IPU3CameraData::cancelPendingRequests()\n {\n+\tprocessingRequests_ = {};\n+\n \twhile (!pendingRequests_.empty()) {\n \t\tRequest *request = pendingRequests_.front();\n \n@@ -853,6 +864,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@@ -1121,8 +1134,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@@ -1414,6 +1427,48 @@ void IPU3CameraData::statBufferReady(FrameBuffer *buffer)\n \tipa_->processEvent(ev);\n }\n \n+/*\n+ * \\brief Handle the start of frame exposure signal\n+ * \\param[in] sequence The sequence number of frame\n+ *\n+ * Inspect the list of pending requests waiting for a RAW frame to be\n+ * produced and apply controls for the 'next' one.\n+ *\n+ * Some controls need to be applied immediately, such as the\n+ * TestPatternMode one. Other controls are handled through the delayed\n+ * controls class.\n+ */\n+void IPU3CameraData::frameStart(uint32_t sequence)\n+{\n+\tdelayedCtrls_->applyControls(sequence);\n+\n+\tif (processingRequests_.empty())\n+\t\treturn;\n+\n+\t/* Handle controls which are to be set ready for the next frame to start. */\n+\tRequest *request = processingRequests_.front();\n+\tprocessingRequests_.pop();\n+\n+\t/* Takes effect applying the test pattern mode affects immediately. */\n+\tif (!request->controls().contains(controls::draft::TestPatternMode))\n+\t\treturn;\n+\n+\tconst int32_t testPatternMode = request->controls().get(\n+\t\tcontrols::draft::TestPatternMode);\n+\n+\tint ret = cio2_.sensor()->setTestPatternMode(\n+\t\tstatic_cast(\n+\t\t\ttestPatternMode));\n+\tif (ret) {\n+\t\tLOG(IPU3, Error) << \"Failed to set test pattern mode: \"\n+\t\t\t\t << ret;\n+\t\treturn;\n+\t}\n+\n+\trequest->metadata().set(controls::draft::TestPatternMode,\n+\t\t\t\ttestPatternMode);\n+}\n+\n REGISTER_PIPELINE_HANDLER(PipelineHandlerIPU3)\n \n } /* namespace libcamera */\n","prefixes":["libcamera-devel","v10","3/3"]}