[{"id":13689,"web_url":"https://patchwork.libcamera.org/comment/13689/","msgid":"","date":"2020-11-12T22:20:38","subject":"Re: [libcamera-devel] [PATCH 2/2] ipa: raspberrypi: Use\n\tMappedFrameBuffer for the IPA buffers","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Naush,\n\nOn 26/10/2020 09:53, Naushir Patuck wrote:\n> Instead of directly mmaping/unmapping buffers passed to the IPA, use\n> a MappedFrameBuffer. The latter is a cleaner interface, and avoid\n> code duplication.\n> \n> Signed-off-by: Naushir Patuck \n> ---\n> src/ipa/raspberrypi/raspberrypi.cpp | 43 ++++++++++++-----------------\n> 1 file changed, 17 insertions(+), 26 deletions(-)\n> \n> diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\n> index 1c255aa2..8d204082 100644\n> --- a/src/ipa/raspberrypi/raspberrypi.cpp\n> +++ b/src/ipa/raspberrypi/raspberrypi.cpp\n> @@ -24,6 +24,7 @@\n> \n> #include \n> \n> +#include \"libcamera/internal/buffer.h\"\n> #include \"libcamera/internal/camera_sensor.h\"\n> #include \"libcamera/internal/log.h\"\n> #include \"libcamera/internal/utils.h\"\n> @@ -110,8 +111,7 @@ private:\n> \tvoid applyLS(const struct AlscStatus *lsStatus, ControlList &ctrls);\n> \tvoid resampleTable(uint16_t dest[], double const src[12][16], int destW, int destH);\n> \n> -\tstd::map buffers_;\n> -\tstd::map buffersMemory_;\n> +\tstd::map buffers_;\n> \n> \tControlInfoMap unicamCtrls_;\n> \tControlInfoMap ispCtrls_;\n> @@ -319,31 +319,20 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,\n> void IPARPi::mapBuffers(const std::vector &buffers)\n> {\n> \tfor (const IPABuffer &buffer : buffers) {\n> -\t\tauto elem = buffers_.emplace(std::piecewise_construct,\n> -\t\t\t\t\t std::forward_as_tuple(buffer.id),\n> -\t\t\t\t\t std::forward_as_tuple(buffer.planes));\n> -\t\tconst FrameBuffer &fb = elem.first->second;\n> -\n> -\t\tbuffersMemory_[buffer.id] = mmap(nullptr, fb.planes()[0].length,\n> -\t\t\t\t\t\t PROT_READ | PROT_WRITE, MAP_SHARED,\n> -\t\t\t\t\t\t fb.planes()[0].fd.fd(), 0);\n> -\n> -\t\tif (buffersMemory_[buffer.id] == MAP_FAILED) {\n> -\t\t\tint ret = -errno;\n> -\t\t\tLOG(IPARPI, Fatal) << \"Failed to mmap buffer: \" << strerror(-ret);\n> -\t\t}\n> +\t\tconst FrameBuffer fb = FrameBuffer(buffer.planes);\n> +\t\tbuffers_.emplace(std::piecewise_construct,\n> +\t\t\t\t std::forward_as_tuple(buffer.id),\n> +\t\t\t\t std::forward_as_tuple(MappedFrameBuffer(&fb, PROT_READ | PROT_WRITE)));\n\nSame here, I anticipate this doesn't need to be piecewise, but overall\notherwise I think it does help clean things up.\n\n\n\n> \t}\n> }\n> \n> void IPARPi::unmapBuffers(const std::vector &ids)\n> {\n> \tfor (unsigned int id : ids) {\n> -\t\tconst auto fb = buffers_.find(id);\n> -\t\tif (fb == buffers_.end())\n> +\t\tauto it = buffers_.find(id);\n> +\t\tif (it == buffers_.end())\n> \t\t\tcontinue;\n> \n> -\t\tmunmap(buffersMemory_[id], fb->second.planes()[0].length);\n> -\t\tbuffersMemory_.erase(id);\n> \t\tbuffers_.erase(id);\n> \t}\n> }\n> @@ -785,15 +774,16 @@ void IPARPi::prepareISP(unsigned int bufferId)\n> \n> bool IPARPi::parseEmbeddedData(unsigned int bufferId, struct DeviceStatus &deviceStatus)\n> {\n> -\tauto it = buffersMemory_.find(bufferId);\n> -\tif (it == buffersMemory_.end()) {\n> +\tauto it = buffers_.find(bufferId);\n> +\tif (it == buffers_.end()) {\n> \t\tLOG(IPARPI, Error) << \"Could not find embedded buffer!\";\n> \t\treturn false;\n> \t}\n> \n> -\tint size = buffers_.find(bufferId)->second.planes()[0].length;\n> +\tint size = buffers_.find(bufferId)->second.maps()[0].size();\n> +\tvoid *ptr = buffers_.find(bufferId)->second.maps()[0].data();\n> \thelper_->Parser().SetBufferSize(size);\n> -\tRPiController::MdParser::Status status = helper_->Parser().Parse(it->second);\n> +\tRPiController::MdParser::Status status = helper_->Parser().Parse(ptr);\n> \tif (status != RPiController::MdParser::Status::OK) {\n> \t\tLOG(IPARPI, Error) << \"Embedded Buffer parsing failed, error \" << status;\n> \t} else {\n> @@ -820,13 +810,14 @@ bool IPARPi::parseEmbeddedData(unsigned int bufferId, struct DeviceStatus &devic\n> \n> void IPARPi::processStats(unsigned int bufferId)\n> {\n> -\tauto it = buffersMemory_.find(bufferId);\n> -\tif (it == buffersMemory_.end()) {\n> +\tauto it = buffers_.find(bufferId);\n> +\tif (it == buffers_.end()) {\n> \t\tLOG(IPARPI, Error) << \"Could not find stats buffer!\";\n> \t\treturn;\n> \t}\n> \n> -\tbcm2835_isp_stats *stats = static_cast(it->second);\n> +\tvoid *ptr = buffers_.find(bufferId)->second.maps()[0].data();\n> +\tbcm2835_isp_stats *stats = static_cast(ptr);\n\nHrm, I defintely want to make it easier to get required pointers out of\na MappedBuffer than this. (but that's not required of this patch)\n\nWith piecewise clarified, or simplified.\n\nReviewed-by: Kieran Bingham \n\n> \tRPiController::StatisticsPtr statistics = std::make_shared(*stats);\n> \tcontroller_.Process(statistics, &rpiMetadata_);\n> \n>","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 CE63CBE086\n\tfor ;\n\tThu, 12 Nov 2020 22:20:43 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 63EF9631AC;\n\tThu, 12 Nov 2020 23:20:43 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9B35C63171\n\tfor ;\n\tThu, 12 Nov 2020 23:20:41 +0100 (CET)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1C807A2A;\n\tThu, 12 Nov 2020 23:20:41 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"W+xj8phN\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1605219641;\n\tbh=sD59TGOKb868VyEz4VCNySVfw32Cjo9PLHmnjhtaIB4=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=W+xj8phNvthBJhsi6puO1t+YumXiYvhSYABurNHxAz5pBeUQZc1hxhiSjYcrGEhMo\n\tyf9M12Pm+xELWMywhE/NG52+aT0ZcoVgjPICoK5lb+byG1x5hCJAlg8oCerXdBDcUm\n\tXG7Pz3t6ubP5Rnh4/xiEOG+u6BYVUJVY3adjR4Kg=","To":"Naushir Patuck ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20201026095356.442605-1-naush@raspberrypi.com>\n\t<20201026095356.442605-2-naush@raspberrypi.com>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"","Date":"Thu, 12 Nov 2020 22:20:38 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20201026095356.442605-2-naush@raspberrypi.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH 2/2] ipa: raspberrypi: Use\n\tMappedFrameBuffer for the IPA buffers","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","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]