Patch Detail
Show a patch.
GET /api/patches/16902/?format=api
{ "id": 16902, "url": "https://patchwork.libcamera.org/api/patches/16902/?format=api", "web_url": "https://patchwork.libcamera.org/patch/16902/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20220802102943.3221109-4-chenghaoyang@google.com>", "date": "2022-08-02T10:29:37", "name": "[libcamera-devel,v4,3/9] ipu3: Use imgu0 as default", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "4ceefbdaf32c1f9671a91a8b2d99907bc4a967ba", "submitter": { "id": 117, "url": "https://patchwork.libcamera.org/api/people/117/?format=api", "name": "Cheng-Hao Yang", "email": "chenghaoyang@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/16902/mbox/", "series": [ { "id": 3357, "url": "https://patchwork.libcamera.org/api/series/3357/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3357", "date": "2022-08-02T10:29:34", "name": "Use two imgus in ipu3 pipeline handler", "version": 4, "mbox": "https://patchwork.libcamera.org/series/3357/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/16902/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/16902/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 9F2DFC3275\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 2 Aug 2022 10:29:57 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 59D95603E7;\n\tTue, 2 Aug 2022 12:29:57 +0200 (CEST)", "from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com\n\t[IPv6:2607:f8b0:4864:20::1030])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7DB63603E7\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 2 Aug 2022 12:29:55 +0200 (CEST)", "by mail-pj1-x1030.google.com with SMTP id b10so13264813pjq.5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 02 Aug 2022 03:29:55 -0700 (PDT)", "from chenghaoyang-low.c.googlers.com.com\n\t(231.137.80.34.bc.googleusercontent.com. [34.80.137.231])\n\tby smtp.gmail.com with ESMTPSA id\n\tt15-20020a170902e84f00b0016db88f69a2sm1955128plg.141.2022.08.02.03.29.52\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 02 Aug 2022 03:29:52 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1659436197;\n\tbh=8owVkMvTwYV4t1VAR7564R18ozCoPyP6Nwle53sKb3E=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=WG0EISoi6COsJ6uKuBNJMVmuHwGyG4rTxKS/hg5sXlKsCYC3bew6JcQPUkkgOK6uf\n\tz+/lM81I4XhgDvR5u6v6DuQbL4q4PJ+a0+NsWsLV7XhyM7lHC33ccFt/gLgMEJO7cV\n\tnuZWF5EqGdaFWlFwcAHKrrHqhX6BvsMpi/aQuerMWFfMPbRfvfKIabQGfl2OXv46Y0\n\tzTcJ/xbzo5QIvPjklIXDBG5buXglppdMLdL+Se/gmEIRvY5YlURaIeknDgA3lNI24c\n\t5ils0Wbm1BgxzjYJLj3kEQfqsavqRmwamY4YQHpz9ie6cMtPmJF5ian2PaX/l7uibd\n\tbI59jtWwwxO1Q==", "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=4CKqAm0iSaW6Vegjv6AqPctRCQxnb1ayR2zOADFpnnM=;\n\tb=QuqWowKZX2UXkhUbQC2ftMvLLpqI1L+GQ0Zy66OmFfVX0pJCKvUJHewvf0Fb9g6GKD\n\tuqyqTmMCXeaND/DTaDXFxG3N86LuDr7LbfOb1NreXAz5C0gS102Hcu/HQD7pKQ215Njl\n\twXVAJCVUHA4nCb0uP+DURWaMwpgsZF+XmJ8Bo=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"QuqWowKZ\"; \n\tdkim-atps=neutral", "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=4CKqAm0iSaW6Vegjv6AqPctRCQxnb1ayR2zOADFpnnM=;\n\tb=oEZu+KeQfio6qHq/qB2qMmMXE+ymtfevxvKi1Nw9F/4xXKcU9UosEILyNzPG2G3A77\n\tnwaCnIobmlpT4GaNE4dFWd2d+C5k/eDRwtkmbaJ98wLFTTRzF1pf3hOlbSU4rIN8zS1n\n\t9v9F0rfniNp5lLsfd9x+AyuiEJvEVUIf8p7yqe2Jc2mSueeO1Sni8PJBRIzN4mfzGG1j\n\t61XKgoTltvtz3Rs8Bu60cFi2B4xfXcDpTF9ysMcUXqTQOq8h8yBpdrai+B0W2zA/WKtZ\n\tW5Id50/zmt7xCMQ6UTj2Raovv1N6cSMhDPOv/3c4y/dJ0hZQl5r5uy9lu/wW2bg0U6M4\n\tbHqg==", "X-Gm-Message-State": "ACgBeo0lgF4pelWCTAiTIJ5Enud8H9KWLcyeyXm3mNcoUhXIeCROHMsY\n\tkK26jtJRBW/5jUULJi6B2cTsNN03/hnp9A==", "X-Google-Smtp-Source": "AA6agR4gkBvVG4Vp6j4Z3BuGJeU6x8P/7W7iKPRSXDu/ZZdCOp3JLMW9JVaK5o+okfZKssK3uaiMUQ==", "X-Received": "by 2002:a17:90b:3711:b0:1f5:179c:ad64 with SMTP id\n\tmg17-20020a17090b371100b001f5179cad64mr5400547pjb.11.1659436193295; \n\tTue, 02 Aug 2022 03:29:53 -0700 (PDT)", "X-Google-Original-From": "Harvey Yang <chenghaoyang@google.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 2 Aug 2022 10:29:37 +0000", "Message-Id": "<20220802102943.3221109-4-chenghaoyang@google.com>", "X-Mailer": "git-send-email 2.37.1.455.g008518b4e5-goog", "In-Reply-To": "<20220802102943.3221109-1-chenghaoyang@google.com>", "References": "<20220802102943.3221109-1-chenghaoyang@google.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v4 3/9] ipu3: Use imgu0 as default", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Harvey Yang via libcamera-devel <libcamera-devel@lists.libcamera.org>", "Reply-To": "Harvey Yang <chenghaoyang@chromium.org>", "Cc": "Harvey Yang <chenghaoyang@chromium.org>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "From: Harvey Yang <chenghaoyang@chromium.org>\n\nWith only one camera being started, we can always use imgu0 to process\nframes (for video/preview). In the following patches, we'll use imgu1\nfor still capture if needed.\n\nSigned-off-by: Harvey Yang <chenghaoyang@chromium.org>\n---\n src/libcamera/pipeline/ipu3/imgu.cpp | 13 ++++\n src/libcamera/pipeline/ipu3/imgu.h | 2 +\n src/libcamera/pipeline/ipu3/ipu3.cpp | 96 ++++++++++++++--------------\n 3 files changed, 63 insertions(+), 48 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp\nindex e5bbc382..aa72b1ec 100644\n--- a/src/libcamera/pipeline/ipu3/imgu.cpp\n+++ b/src/libcamera/pipeline/ipu3/imgu.cpp\n@@ -765,4 +765,17 @@ int ImgUDevice::enableLinks(bool enable)\n \treturn linkSetup(name_, PAD_STAT, statName, 0, enable);\n }\n \n+/**\n+ * \\brief Disconnect bufferReady signals from |input_|, |param_|, |output_|,\n+ * |viewfinder_|, and |stat_|.\n+ */\n+void ImgUDevice::disconnectSignals()\n+{\n+\tinput_->bufferReady.disconnect();\n+\tparam_->bufferReady.disconnect();\n+\toutput_->bufferReady.disconnect();\n+\tviewfinder_->bufferReady.disconnect();\n+\tstat_->bufferReady.disconnect();\n+}\n+\n } /* namespace libcamera */\ndiff --git a/src/libcamera/pipeline/ipu3/imgu.h b/src/libcamera/pipeline/ipu3/imgu.h\nindex 0af4dd8a..aa88e36e 100644\n--- a/src/libcamera/pipeline/ipu3/imgu.h\n+++ b/src/libcamera/pipeline/ipu3/imgu.h\n@@ -92,6 +92,8 @@ public:\n \n \tint enableLinks(bool enable);\n \n+\tvoid disconnectSignals();\n+\n \tstd::unique_ptr<V4L2Subdevice> imgu_;\n \tstd::unique_ptr<V4L2VideoDevice> input_;\n \tstd::unique_ptr<V4L2VideoDevice> param_;\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 091a40e1..c3e90f22 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -64,7 +64,8 @@ public:\n \tvoid frameStart(uint32_t sequence);\n \n \tCIO2Device cio2_;\n-\tImgUDevice *imgu_;\n+\tImgUDevice *imgu0_;\n+\tImgUDevice *imgu1_;\n \n \tStream outStream_;\n \tStream vfStream_;\n@@ -406,7 +407,7 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \n \t/* Only compute the ImgU configuration if a YUV stream has been requested. */\n \tif (yuvCount) {\n-\t\tpipeConfig_ = data_->imgu_->calculatePipeConfig(&pipe);\n+\t\tpipeConfig_ = data_->imgu0_->calculatePipeConfig(&pipe);\n \t\tif (pipeConfig_.isNull()) {\n \t\t\tLOG(IPU3, Error) << \"Failed to calculate pipe configuration: \"\n \t\t\t\t\t << \"unsupported resolutions.\";\n@@ -518,16 +519,12 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \tStream *outStream = &data->outStream_;\n \tStream *vfStream = &data->vfStream_;\n \tCIO2Device *cio2 = &data->cio2_;\n-\tImgUDevice *imgu = data->imgu_;\n \tV4L2DeviceFormat outputFormat;\n \tint ret;\n \n \t/*\n-\t * FIXME: enabled links in one ImgU pipe interfere with capture\n-\t * operations on the other one. This can be easily triggered by\n-\t * capturing from one camera and then trying to capture from the other\n-\t * one right after, without disabling media links on the first used\n-\t * pipe.\n+\t * Enabled links in one ImgU pipe interfere with capture\n+\t * operations on the other one.\n \t *\n \t * The tricky part here is where to disable links on the ImgU instance\n \t * which is currently not in use:\n@@ -543,11 +540,11 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \t * configuring the device, to allow alternate the usage of the two\n \t * ImgU pipes.\n \t *\n-\t * As a consequence, a Camera using an ImgU shall be configured before\n-\t * any start()/stop() sequence. An application that wants to\n-\t * pre-configure all the camera and then start/stop them alternatively\n-\t * without going through any re-configuration (a sequence that is\n-\t * allowed by the Camera state machine) would now fail on the IPU3.\n+\t * Now that only one camera is allowed to be used at the same time, we\n+\t * don't need to handle the complicated interference between the two\n+\t * ImgU links. Therefore, an application still cannot pre-configure all\n+\t * the cameras and then start/stop them alternatively without going\n+\t * throught any re-configuration.\n \t */\n \tret = imguMediaDev_->disableLinks();\n \tif (ret)\n@@ -560,7 +557,7 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \t * stream which is for raw capture, in which case no buffers will\n \t * ever be queued to the ImgU.\n \t */\n-\tret = data->imgu_->enableLinks(true);\n+\tret = imgu0_.enableLinks(true);\n \tif (ret)\n \t\treturn ret;\n \n@@ -610,7 +607,7 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \tif (imguConfig.isNull())\n \t\treturn 0;\n \n-\tret = imgu->configure(imguConfig, &cio2Format);\n+\tret = imgu0_.configure(imguConfig, &cio2Format);\n \tif (ret)\n \t\treturn ret;\n \n@@ -624,12 +621,12 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \n \t\tif (stream == outStream) {\n \t\t\tmainCfg = &cfg;\n-\t\t\tret = imgu->configureOutput(cfg, &outputFormat);\n+\t\t\tret = imgu0_.configureOutput(cfg, &outputFormat);\n \t\t\tif (ret)\n \t\t\t\treturn ret;\n \t\t} else if (stream == vfStream) {\n \t\t\tvfCfg = &cfg;\n-\t\t\tret = imgu->configureViewfinder(cfg, &outputFormat);\n+\t\t\tret = imgu0_.configureViewfinder(cfg, &outputFormat);\n \t\t\tif (ret)\n \t\t\t\treturn ret;\n \t\t}\n@@ -641,13 +638,13 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \t * be at least one active stream in the configuration request).\n \t */\n \tif (!vfCfg) {\n-\t\tret = imgu->configureViewfinder(*mainCfg, &outputFormat);\n+\t\tret = imgu0_.configureViewfinder(*mainCfg, &outputFormat);\n \t\tif (ret)\n \t\t\treturn ret;\n \t}\n \n \t/* Apply the \"pipe_mode\" control to the ImgU subdevice. */\n-\tControlList ctrls(imgu->imgu_->controls());\n+\tControlList ctrls(imgu0_.imgu_->controls());\n \t/*\n \t * Set the ImgU pipe mode to 'Video' unconditionally to have statistics\n \t * generated.\n@@ -657,7 +654,7 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \t */\n \tctrls.set(V4L2_CID_IPU3_PIPE_MODE,\n \t\t static_cast<int32_t>(IPU3PipeModeVideo));\n-\tret = imgu->imgu_->setControls(&ctrls);\n+\tret = imgu0_.imgu_->setControls(&ctrls);\n \tif (ret) {\n \t\tLOG(IPU3, Error) << \"Unable to set pipe_mode control\";\n \t\treturn ret;\n@@ -691,9 +688,9 @@ int PipelineHandlerIPU3::exportFrameBuffers(Camera *camera, Stream *stream,\n \tunsigned int count = stream->configuration().bufferCount;\n \n \tif (stream == &data->outStream_)\n-\t\treturn data->imgu_->output_->exportBuffers(count, buffers);\n+\t\treturn imgu0_.output_->exportBuffers(count, buffers);\n \telse if (stream == &data->vfStream_)\n-\t\treturn data->imgu_->viewfinder_->exportBuffers(count, buffers);\n+\t\treturn imgu0_.viewfinder_->exportBuffers(count, buffers);\n \telse if (stream == &data->rawStream_)\n \t\treturn data->cio2_.exportBuffers(count, buffers);\n \n@@ -711,7 +708,6 @@ int PipelineHandlerIPU3::exportFrameBuffers(Camera *camera, Stream *stream,\n int PipelineHandlerIPU3::allocateBuffers(Camera *camera)\n {\n \tIPU3CameraData *data = cameraData(camera);\n-\tImgUDevice *imgu = data->imgu_;\n \tunsigned int bufferCount;\n \tint ret;\n \n@@ -721,26 +717,26 @@ int PipelineHandlerIPU3::allocateBuffers(Camera *camera)\n \t\tdata->rawStream_.configuration().bufferCount,\n \t});\n \n-\tret = imgu->allocateBuffers(bufferCount);\n+\tret = imgu0_.allocateBuffers(bufferCount);\n \tif (ret < 0)\n \t\treturn ret;\n \n \t/* Map buffers to the IPA. */\n \tunsigned int ipaBufferId = 1;\n \n-\tfor (const std::unique_ptr<FrameBuffer> &buffer : imgu->paramBuffers_) {\n+\tfor (const std::unique_ptr<FrameBuffer> &buffer : imgu0_.paramBuffers_) {\n \t\tbuffer->setCookie(ipaBufferId++);\n \t\tipaBuffers_.emplace_back(buffer->cookie(), buffer->planes());\n \t}\n \n-\tfor (const std::unique_ptr<FrameBuffer> &buffer : imgu->statBuffers_) {\n+\tfor (const std::unique_ptr<FrameBuffer> &buffer : imgu0_.statBuffers_) {\n \t\tbuffer->setCookie(ipaBufferId++);\n \t\tipaBuffers_.emplace_back(buffer->cookie(), buffer->planes());\n \t}\n \n \tdata->ipa_->mapBuffers(ipaBuffers_);\n \n-\tdata->frameInfos_.init(imgu->paramBuffers_, imgu->statBuffers_);\n+\tdata->frameInfos_.init(imgu0_.paramBuffers_, imgu0_.statBuffers_);\n \tdata->frameInfos_.bufferAvailable.connect(\n \t\tdata, &IPU3CameraData::queuePendingRequests);\n \n@@ -760,7 +756,7 @@ int PipelineHandlerIPU3::freeBuffers(Camera *camera)\n \tdata->ipa_->unmapBuffers(ids);\n \tipaBuffers_.clear();\n \n-\tdata->imgu_->freeBuffers();\n+\timgu0_.freeBuffers();\n \n \treturn 0;\n }\n@@ -785,9 +781,18 @@ int PipelineHandlerIPU3::start(Camera *camera, [[maybe_unused]] const ControlLis\n \n \tIPU3CameraData *data = cameraData(camera);\n \tCIO2Device *cio2 = &data->cio2_;\n-\tImgUDevice *imgu = data->imgu_;\n \tint ret;\n \n+\timgu0_.input_->bufferReady.connect(&data->cio2_,\n+\t\t\t\t\t &CIO2Device::tryReturnBuffer);\n+\timgu0_.output_->bufferReady.connect(data,\n+\t\t\t\t\t &IPU3CameraData::imguOutputBufferReady);\n+\timgu0_.viewfinder_->bufferReady.connect(data,\n+\t\t\t\t\t\t&IPU3CameraData::imguOutputBufferReady);\n+\timgu0_.param_->bufferReady.connect(data,\n+\t\t\t\t\t &IPU3CameraData::paramBufferReady);\n+\timgu0_.stat_->bufferReady.connect(data,\n+\t\t\t\t\t &IPU3CameraData::statBufferReady);\n \t/* Disable test pattern mode on the sensor, if any. */\n \tret = cio2->sensor()->setTestPatternMode(\n \t\tcontrols::draft::TestPatternModeEnum::TestPatternModeOff);\n@@ -813,19 +818,21 @@ int PipelineHandlerIPU3::start(Camera *camera, [[maybe_unused]] const ControlLis\n \tif (ret)\n \t\tgoto error;\n \n-\tret = imgu->start();\n+\tret = imgu0_.start();\n \tif (ret)\n \t\tgoto error;\n \n \treturn 0;\n \n error:\n-\timgu->stop();\n+\timgu0_.stop();\n \tcio2->stop();\n \tdata->ipa_->stop();\n \tfreeBuffers(camera);\n \tLOG(IPU3, Error) << \"Failed to start camera \" << camera->id();\n \n+\timgu0_.disconnectSignals();\n+\n \treturn ret;\n }\n \n@@ -838,12 +845,14 @@ void PipelineHandlerIPU3::stopDevice(Camera *camera)\n \n \tdata->ipa_->stop();\n \n-\tret |= data->imgu_->stop();\n+\tret |= imgu0_.stop();\n \tret |= data->cio2_.stop();\n \tif (ret)\n \t\tLOG(IPU3, Warning) << \"Failed to stop camera \" << camera->id();\n \n \tfreeBuffers(camera);\n+\n+\timgu0_.disconnectSignals();\n }\n \n void IPU3CameraData::cancelPendingRequests()\n@@ -1186,7 +1195,8 @@ int PipelineHandlerIPU3::registerCameras()\n \t\t * only, and assign imgu0 to the first one and imgu1 to the\n \t\t * second.\n \t\t */\n-\t\tdata->imgu_ = numCameras ? &imgu1_ : &imgu0_;\n+\t\tdata->imgu0_ = &imgu0_;\n+\t\tdata->imgu1_ = &imgu1_;\n \n \t\t/*\n \t\t * Connect video devices' 'bufferReady' signals to their\n@@ -1200,16 +1210,6 @@ int PipelineHandlerIPU3::registerCameras()\n \t\t\t\t\t&IPU3CameraData::cio2BufferReady);\n \t\tdata->cio2_.bufferAvailable.connect(\n \t\t\tdata.get(), &IPU3CameraData::queuePendingRequests);\n-\t\tdata->imgu_->input_->bufferReady.connect(&data->cio2_,\n-\t\t\t\t\t&CIO2Device::tryReturnBuffer);\n-\t\tdata->imgu_->output_->bufferReady.connect(data.get(),\n-\t\t\t\t\t&IPU3CameraData::imguOutputBufferReady);\n-\t\tdata->imgu_->viewfinder_->bufferReady.connect(data.get(),\n-\t\t\t\t\t&IPU3CameraData::imguOutputBufferReady);\n-\t\tdata->imgu_->param_->bufferReady.connect(data.get(),\n-\t\t\t\t\t&IPU3CameraData::paramBufferReady);\n-\t\tdata->imgu_->stat_->bufferReady.connect(data.get(),\n-\t\t\t\t\t&IPU3CameraData::statBufferReady);\n \n \t\t/* Create and register the Camera instance. */\n \t\tconst std::string &cameraId = cio2->sensor()->id();\n@@ -1302,14 +1302,14 @@ void IPU3CameraData::paramsBufferReady(unsigned int id)\n \t\tFrameBuffer *outbuffer = it.second;\n \n \t\tif (stream == &outStream_)\n-\t\t\timgu_->output_->queueBuffer(outbuffer);\n+\t\t\timgu0_->output_->queueBuffer(outbuffer);\n \t\telse if (stream == &vfStream_)\n-\t\t\timgu_->viewfinder_->queueBuffer(outbuffer);\n+\t\t\timgu0_->viewfinder_->queueBuffer(outbuffer);\n \t}\n \n-\timgu_->param_->queueBuffer(info->paramBuffer);\n-\timgu_->stat_->queueBuffer(info->statBuffer);\n-\timgu_->input_->queueBuffer(info->rawBuffer);\n+\timgu0_->param_->queueBuffer(info->paramBuffer);\n+\timgu0_->stat_->queueBuffer(info->statBuffer);\n+\timgu0_->input_->queueBuffer(info->rawBuffer);\n }\n \n void IPU3CameraData::metadataReady(unsigned int id, const ControlList &metadata)\n", "prefixes": [ "libcamera-devel", "v4", "3/9" ] }