Patch Detail
Show a patch.
GET /api/patches/8517/?format=api
{ "id": 8517, "url": "https://patchwork.libcamera.org/api/patches/8517/?format=api", "web_url": "https://patchwork.libcamera.org/patch/8517/", "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": "<20200630130518.99866-2-niklas.soderlund@ragnatech.se>", "date": "2020-06-30T13:05:18", "name": "[libcamera-devel,v2,2/2] libcamera: ipu3: cio2: Do not proxy signal", "commit_ref": "73b18967b6c04c2b6170d6f84685262b8c380cda", "pull_url": null, "state": "accepted", "archived": false, "hash": "bf1cf72bb2e3d38d7f5333764ce575aae11bf05a", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/8517/mbox/", "series": [ { "id": 1062, "url": "https://patchwork.libcamera.org/api/series/1062/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1062", "date": "2020-06-30T13:05:17", "name": "[libcamera-devel,v2,1/2] libcamera: ipu3: Make it easier to read when a request may be completed", "version": 2, "mbox": "https://patchwork.libcamera.org/series/1062/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/8517/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/8517/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 90710BFFE2\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 30 Jun 2020 13:05:29 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BA02A60C5C;\n\tTue, 30 Jun 2020 15:05:28 +0200 (CEST)", "from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CADDF609C7\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 30 Jun 2020 15:05:26 +0200 (CEST)", "from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de\n\t[79.202.46.202]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid 5d3440f1-bad2-11ea-8fb8-005056917f90;\n\tTue, 30 Jun 2020 15:05:26 +0200 (CEST)" ], "X-Halon-ID": "5d3440f1-bad2-11ea-8fb8-005056917f90", "Authorized-sender": "niklas@soderlund.pp.se", "From": "=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 30 Jun 2020 15:05:18 +0200", "Message-Id": "<20200630130518.99866-2-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20200630130518.99866-1-niklas.soderlund@ragnatech.se>", "References": "<20200630130518.99866-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v2 2/2] libcamera: ipu3: cio2: Do not\n\tproxy signal", "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>", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Do not proxy the signal in the CI2Device when there is no need for it,\nremove it.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\nThis is a leftover form the CIO2 rework which fell thru the cracks I'm\nsorry I missed to resort it in the last version.\n\n* Changes since v1\n- Merge the return with the last function call in CIO2Device::init().\n---\n src/libcamera/pipeline/ipu3/cio2.cpp | 14 +-------------\n src/libcamera/pipeline/ipu3/cio2.h | 6 +++---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 2 +-\n 3 files changed, 5 insertions(+), 17 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp\nindex aa1459fb3599283b..97a434a73b2855e5 100644\n--- a/src/libcamera/pipeline/ipu3/cio2.cpp\n+++ b/src/libcamera/pipeline/ipu3/cio2.cpp\n@@ -15,7 +15,6 @@\n #include \"libcamera/internal/camera_sensor.h\"\n #include \"libcamera/internal/media_device.h\"\n #include \"libcamera/internal/v4l2_subdevice.h\"\n-#include \"libcamera/internal/v4l2_videodevice.h\"\n \n namespace libcamera {\n \n@@ -121,13 +120,7 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)\n \n \tstd::string cio2Name = \"ipu3-cio2 \" + std::to_string(index);\n \toutput_ = V4L2VideoDevice::fromEntityName(media, cio2Name);\n-\tret = output_->open();\n-\tif (ret)\n-\t\treturn ret;\n-\n-\toutput_->bufferReady.connect(this, &CIO2Device::cio2BufferReady);\n-\n-\treturn 0;\n+\treturn output_->open();\n }\n \n /**\n@@ -289,9 +282,4 @@ void CIO2Device::freeBuffers()\n \t\tLOG(IPU3, Error) << \"Failed to release CIO2 buffers\";\n }\n \n-void CIO2Device::cio2BufferReady(FrameBuffer *buffer)\n-{\n-\tbufferReady.emit(buffer);\n-}\n-\n } /* namespace libcamera */\ndiff --git a/src/libcamera/pipeline/ipu3/cio2.h b/src/libcamera/pipeline/ipu3/cio2.h\nindex dc764b101f112f05..4fd949f8e5132e07 100644\n--- a/src/libcamera/pipeline/ipu3/cio2.h\n+++ b/src/libcamera/pipeline/ipu3/cio2.h\n@@ -13,15 +13,15 @@\n \n #include <libcamera/signal.h>\n \n+#include \"libcamera/internal/v4l2_videodevice.h\"\n+\n namespace libcamera {\n \n class CameraSensor;\n class FrameBuffer;\n class MediaDevice;\n class Request;\n-class V4L2DeviceFormat;\n class V4L2Subdevice;\n-class V4L2VideoDevice;\n struct Size;\n struct StreamConfiguration;\n \n@@ -48,7 +48,7 @@ public:\n \n \tint queueBuffer(Request *request, FrameBuffer *rawBuffer);\n \tvoid tryReturnBuffer(FrameBuffer *buffer);\n-\tSignal<FrameBuffer *> bufferReady;\n+\tSignal<FrameBuffer *> &bufferReady() { return output_->bufferReady; }\n \n private:\n \tvoid freeBuffers();\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 958d8362b55783de..00559ce318e1b8c3 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -805,7 +805,7 @@ int PipelineHandlerIPU3::registerCameras()\n \t\t * associated ImgU input where they get processed and\n \t\t * returned through the ImgU main and secondary outputs.\n \t\t */\n-\t\tdata->cio2_.bufferReady.connect(data.get(),\n+\t\tdata->cio2_.bufferReady().connect(data.get(),\n \t\t\t\t\t&IPU3CameraData::cio2BufferReady);\n \t\tdata->imgu_->input_->bufferReady.connect(&data->cio2_,\n \t\t\t\t\t&CIO2Device::tryReturnBuffer);\n", "prefixes": [ "libcamera-devel", "v2", "2/2" ] }