Patch Detail
Show a patch.
GET /api/1.1/patches/16429/?format=api
{ "id": 16429, "url": "https://patchwork.libcamera.org/api/1.1/patches/16429/?format=api", "web_url": "https://patchwork.libcamera.org/patch/16429/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20220629103018.4025635-4-chenghaoyang@google.com>", "date": "2022-06-29T10:30:12", "name": "[libcamera-devel,v3,3/9] ipu3: Use imgu0 as default", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "ae07b2c32f69073134608a1198d8e5ae88d4b3f2", "submitter": { "id": 117, "url": "https://patchwork.libcamera.org/api/1.1/people/117/?format=api", "name": "Cheng-Hao Yang", "email": "chenghaoyang@chromium.org" }, "delegate": { "id": 12, "url": "https://patchwork.libcamera.org/api/1.1/users/12/?format=api", "username": "uajain", "first_name": "Umang", "last_name": "Jain", "email": "umang.jain@ideasonboard.com" }, "mbox": "https://patchwork.libcamera.org/patch/16429/mbox/", "series": [ { "id": 3232, "url": "https://patchwork.libcamera.org/api/1.1/series/3232/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3232", "date": "2022-06-29T10:30:09", "name": "Use two imgus in ipu3 pipeline handler", "version": 3, "mbox": "https://patchwork.libcamera.org/series/3232/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/16429/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/16429/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 A637EBE173\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 29 Jun 2022 10:30:31 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6835065642;\n\tWed, 29 Jun 2022 12:30:31 +0200 (CEST)", "from mail-pg1-x532.google.com (mail-pg1-x532.google.com\n\t[IPv6:2607:f8b0:4864:20::532])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F26B565631\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 29 Jun 2022 12:30:27 +0200 (CEST)", "by mail-pg1-x532.google.com with SMTP id z14so14950450pgh.0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 29 Jun 2022 03:30:27 -0700 (PDT)", "from chenghaoyang-low.c.googlers.com.com\n\t(208.158.221.35.bc.googleusercontent.com. [35.221.158.208])\n\tby smtp.gmail.com with ESMTPSA id\n\tjb4-20020a170903258400b00169071538a0sm10946059plb.267.2022.06.29.03.30.25\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 29 Jun 2022 03:30:25 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1656498631;\n\tbh=oIrRxgWxnXvAKLo4F65Dfr5GH6EKBHOAv4e5Gty+XTI=;\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=ZoN/ONqsl8QHCFR9mQeGvU7PvQBSCA/KMu/v7mgOP2EgjDYg/vfdHS+x+K67RgGZM\n\t1zn33L2ySEe/PYgSr/Opp8HKFjLpZdpvmAKkX9Q0PcoFsDkX4PXPjrCyTQD6vWOz3Q\n\tOa3B9U0ivbdmipQr6eixG8I4HL842GXzERjFFHUw+++wkCkqPxyPDYV/xaly4TU4Fe\n\tkqSIU4xdf/g8qw6Uhi5SrvoqsbarjhODRRcc9CaeFgF9+gT4lVhkmDNa2UfYf2XOBI\n\tqHOfezI1KZKYx11hZdmFC9YY/S5wlsDLFnl+CBue8JoU9lj6+OW3YqX5vqyUt7870t\n\tFi4bLmWCEXa9w==", "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=Pj21KPq7U93iREIWfwjAbXuLCLUn5kburhNyE5CWBnM=;\n\tb=VA41+dtqT6hNaSxFhdq54jc9V1mTrZ1pEc3thV3wjBwdUoFYBpB0cwlROLsDKlG3Qd\n\tGeGSpY3fEwMEAtus6DWwI9J9cuuoOvnVD7xqbA7iBVu2xLf1n8NlgUksDOo35rBac+Af\n\tUN07q/6UgoHvOQqUTe1ZvD2FLFZICVHBxPuPc=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"VA41+dtq\"; \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=Pj21KPq7U93iREIWfwjAbXuLCLUn5kburhNyE5CWBnM=;\n\tb=K8Jz+UuFVBp4lKmis1fECPNvVAX858ckachkh7eEebcOZVtXgJfLfNRguLJ/ffRZFF\n\tR+6wuDLagGjR4jpbl9ja1GxGwoO+SUroMBqWk9RDvwASMaEDI0NzReQfSGuBHICOgitc\n\tERdIa7kbbtf3huvtdEtBjc5jfAfg5u7lxhLxRmBMuPqQ28hAjJO7ScJfCzvKkade72Mh\n\t5XP96CR0fl+UIWUIOfHNYjHdmaPFpfET4SQsfzsYHMoVcy+bhoD9CXTlXOMejUXFRWNA\n\tMhPjm2Wpr4hieUyDBDg1w8o2UZ6vBp/EUoO9xJmJakOK4tXlTqnw1MV4o3D7oit7MqL5\n\t/Z+A==", "X-Gm-Message-State": "AJIora83PGJCqG3qp3Zfw9KrIpx7DuKS8Pds1hyAGgAEc2vCO4SyLDYU\n\tK8Bp+rQec9LrrnFdfd9tQ7pa8ud4AHS/Y9m2", "X-Google-Smtp-Source": "AGRyM1ul/Sw8oZjQCKWpKMH2YS0AaEu1LOOROO6KWpaDMh5mora38++Y77bxALD8/k/Tn6KgQaJdSA==", "X-Received": "by 2002:a63:751b:0:b0:40c:9c39:c890 with SMTP id\n\tq27-20020a63751b000000b0040c9c39c890mr2391898pgc.302.1656498626298; \n\tWed, 29 Jun 2022 03:30:26 -0700 (PDT)", "X-Google-Original-From": "Harvey Yang <chenghaoyang@google.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 29 Jun 2022 10:30:12 +0000", "Message-Id": "<20220629103018.4025635-4-chenghaoyang@google.com>", "X-Mailer": "git-send-email 2.37.0.rc0.161.g10f37bed90-goog", "In-Reply-To": "<20220629103018.4025635-1-chenghaoyang@google.com>", "References": "<20220629103018.4025635-1-chenghaoyang@google.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 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/ipu3.cpp | 86 ++++++++++++++++------------\n 1 file changed, 48 insertions(+), 38 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex c943ee6a..e219f704 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,7 +519,6 @@ 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@@ -560,7 +560,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 +610,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 +624,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 +641,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 +657,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 +691,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 +711,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 +720,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 +759,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@@ -777,9 +776,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@@ -807,19 +815,24 @@ 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_.input_->bufferReady.disconnect();\n+\timgu0_.output_->bufferReady.disconnect();\n+\timgu0_.viewfinder_->bufferReady.disconnect();\n+\timgu0_.param_->bufferReady.disconnect();\n+\timgu0_.stat_->bufferReady.disconnect();\n \tinUseCamera_ = nullptr;\n \n \treturn ret;\n@@ -834,13 +847,19 @@ 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+\tdata->imgu0_->input_->bufferReady.disconnect();\n+\tdata->imgu0_->output_->bufferReady.disconnect();\n+\tdata->imgu0_->viewfinder_->bufferReady.disconnect();\n+\tdata->imgu0_->param_->bufferReady.disconnect();\n+\tdata->imgu0_->stat_->bufferReady.disconnect();\n+\n \tinUseCamera_ = nullptr;\n }\n \n@@ -1184,7 +1203,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@@ -1198,16 +1218,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@@ -1300,14 +1310,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", "v3", "3/9" ] }