{"id":8461,"url":"https://patchwork.libcamera.org/api/patches/8461/?format=json","web_url":"https://patchwork.libcamera.org/patch/8461/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20200628001532.2685967-5-niklas.soderlund@ragnatech.se>","date":"2020-06-28T00:15:23","name":"[libcamera-devel,v2,04/13] libcamera: ipu3: Remove usage of IPU3CameraData from ImgUDevice","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"5c8bfa14807947d0b7a42876e1eb881945d09a00","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8461/mbox/","series":[{"id":1048,"url":"https://patchwork.libcamera.org/api/series/1048/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1048","date":"2020-06-28T00:15:19","name":"libcamera: ipu3: Refactoring of ImgU","version":2,"mbox":"https://patchwork.libcamera.org/series/1048/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8461/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8461/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 13172C2E69\n\tfor ;\n\tSun, 28 Jun 2020 00:15:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AE54560B00;\n\tSun, 28 Jun 2020 02:15:50 +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 AE2F8609C8\n\tfor ;\n\tSun, 28 Jun 2020 02:15:47 +0200 (CEST)","from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de\n\t[79.202.46.202]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA\n\tid 6f4f62be-b8d4-11ea-86ee-0050569116f7;\n\tSun, 28 Jun 2020 02:15:13 +0200 (CEST)"],"X-Halon-ID":"6f4f62be-b8d4-11ea-86ee-0050569116f7","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Sun, 28 Jun 2020 02:15:23 +0200","Message-Id":"<20200628001532.2685967-5-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200628001532.2685967-1-niklas.soderlund@ragnatech.se>","References":"<20200628001532.2685967-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 04/13] libcamera: ipu3: Remove usage of\n\tIPU3CameraData from ImgUDevice","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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The IPU3CameraData argument to allocateBuffers() and freeBuffers() is no\nlonger used and can be removed.\n\nSigned-off-by: Niklas Söderlund \nReviewed-by: Jacopo Mondi \nReviewed-by: Laurent Pinchart \n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 16 +++++++---------\n 1 file changed, 7 insertions(+), 9 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex f35672f4761659f4..fd2725c7bd0c144b 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -34,8 +34,6 @@ namespace libcamera {\n \n LOG_DEFINE_CATEGORY(IPU3)\n \n-class IPU3CameraData;\n-\n class ImgUDevice\n {\n public:\n@@ -75,8 +73,8 @@ public:\n \t\t\t const StreamConfiguration &cfg,\n \t\t\t V4L2DeviceFormat *outputFormat);\n \n-\tint allocateBuffers(IPU3CameraData *data, unsigned int bufferCount);\n-\tvoid freeBuffers(IPU3CameraData *data);\n+\tint allocateBuffers(unsigned int bufferCount);\n+\tvoid freeBuffers();\n \n \tint start();\n \tint stop();\n@@ -665,7 +663,7 @@ int PipelineHandlerIPU3::allocateBuffers(Camera *camera)\n \t\tdata->rawStream_.configuration().bufferCount,\n \t});\n \n-\tret = imgu->allocateBuffers(data, bufferCount);\n+\tret = imgu->allocateBuffers(bufferCount);\n \tif (ret < 0)\n \t\treturn ret;\n \n@@ -676,7 +674,7 @@ int PipelineHandlerIPU3::freeBuffers(Camera *camera)\n {\n \tIPU3CameraData *data = cameraData(camera);\n \n-\tdata->imgu_->freeBuffers(data);\n+\tdata->imgu_->freeBuffers();\n \n \treturn 0;\n }\n@@ -1121,7 +1119,7 @@ int ImgUDevice::configureOutput(ImgUOutput *output,\n /**\n * \\brief Allocate buffers for all the ImgU video devices\n */\n-int ImgUDevice::allocateBuffers(IPU3CameraData *data, unsigned int bufferCount)\n+int ImgUDevice::allocateBuffers(unsigned int bufferCount)\n {\n \t/* Share buffers between CIO2 output and ImgU input. */\n \tint ret = input_->importBuffers(bufferCount);\n@@ -1163,7 +1161,7 @@ int ImgUDevice::allocateBuffers(IPU3CameraData *data, unsigned int bufferCount)\n \treturn 0;\n \n error:\n-\tfreeBuffers(data);\n+\tfreeBuffers();\n \n \treturn ret;\n }\n@@ -1171,7 +1169,7 @@ error:\n /**\n * \\brief Release buffers for all the ImgU video devices\n */\n-void ImgUDevice::freeBuffers(IPU3CameraData *data)\n+void ImgUDevice::freeBuffers()\n {\n \tint ret;\n \n","prefixes":["libcamera-devel","v2","04/13"]}