{"id":9232,"url":"https://patchwork.libcamera.org/api/1.1/patches/9232/?format=json","web_url":"https://patchwork.libcamera.org/patch/9232/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20200805151507.227503-6-kieran.bingham@ideasonboard.com>","date":"2020-08-05T15:14:59","name":"[libcamera-devel,v4,05/13] libcamera: buffer: Convert copyFrom to use MappedFrameBuffer","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"c4320df69a05b014586ba78c5095a9c02fe32b3b","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/1.1/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9232/mbox/","series":[{"id":1198,"url":"https://patchwork.libcamera.org/api/1.1/series/1198/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1198","date":"2020-08-05T15:14:54","name":"android: JPEG support","version":4,"mbox":"https://patchwork.libcamera.org/series/1198/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9232/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9232/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 3C3FABD86F\n\tfor ;\n\tWed, 5 Aug 2020 15:15:16 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E4AF160730;\n\tWed, 5 Aug 2020 17:15:15 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6A65A60737\n\tfor ;\n\tWed, 5 Aug 2020 17:15:14 +0200 (CEST)","from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net\n\t[86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 63B8DDA1;\n\tWed, 5 Aug 2020 17:15:12 +0200 (CEST)"],"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=\"GKUrhLKp\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1596640512;\n\tbh=dvsmXy48aQgVz1ENpEM12XqvzUq6OSx0WuWTFauAczY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=GKUrhLKpE6s1Et3MPJhK42KwQC9OQer+Q/vGF9Ui0vb2Zhtc/zRZp6v5LxRcu6q5h\n\t3pSncDPjI8kcHJYQJ5mAKLEzU7w6FeAS0iyuJqDDRfnNhLFbIExhLBwKwbUx0+7esw\n\teqAK4SN7NEs40svlMdrlE3xPiBTkh/ea2ZOuWvTo=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Wed, 5 Aug 2020 16:14:59 +0100","Message-Id":"<20200805151507.227503-6-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20200805151507.227503-1-kieran.bingham@ideasonboard.com>","References":"<20200805151507.227503-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 05/13] libcamera: buffer: Convert\n\tcopyFrom to use MappedFrameBuffer","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=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Utilise the new MappedFrameBuffer helper to handle all mapping and\nunmapping of the copyFrom helper function.\n\nReviewed-by: Laurent Pinchart \nSigned-off-by: Kieran Bingham \n---\n src/libcamera/buffer.cpp | 37 ++++++++++++++-----------------------\n 1 file changed, 14 insertions(+), 23 deletions(-)","diff":"diff --git a/src/libcamera/buffer.cpp b/src/libcamera/buffer.cpp\nindex 8666f1992a77..a2b66dc86129 100644\n--- a/src/libcamera/buffer.cpp\n+++ b/src/libcamera/buffer.cpp\n@@ -259,32 +259,23 @@ int FrameBuffer::copyFrom(const FrameBuffer *src)\n \t\t}\n \t}\n \n-\tfor (unsigned int i = 0; i < planes_.size(); i++) {\n-\t\tvoid *dstmem = mmap(nullptr, planes_[i].length, PROT_WRITE,\n-\t\t\t\t MAP_SHARED, planes_[i].fd.fd(), 0);\n+\tMappedFrameBuffer source(src, PROT_READ);\n+\tMappedFrameBuffer destination(this, PROT_WRITE);\n \n-\t\tif (dstmem == MAP_FAILED) {\n-\t\t\tLOG(Buffer, Error)\n-\t\t\t\t<< \"Failed to map destination plane \" << i;\n-\t\t\tmetadata_.status = FrameMetadata::FrameError;\n-\t\t\treturn -EINVAL;\n-\t\t}\n-\n-\t\tvoid *srcmem = mmap(nullptr, src->planes_[i].length, PROT_READ,\n-\t\t\t\t MAP_SHARED, src->planes_[i].fd.fd(), 0);\n-\n-\t\tif (srcmem == MAP_FAILED) {\n-\t\t\tmunmap(dstmem, planes_[i].length);\n-\t\t\tLOG(Buffer, Error)\n-\t\t\t\t<< \"Failed to map source plane \" << i;\n-\t\t\tmetadata_.status = FrameMetadata::FrameError;\n-\t\t\treturn -EINVAL;\n-\t\t}\n+\tif (!source.isValid()) {\n+\t\tLOG(Buffer, Error) << \"Failed to map source planes\";\n+\t\treturn -EINVAL;\n+\t}\n \n-\t\tmemcpy(dstmem, srcmem, src->planes_[i].length);\n+\tif (!destination.isValid()) {\n+\t\tLOG(Buffer, Error) << \"Failed to map destination planes\";\n+\t\treturn -EINVAL;\n+\t}\n \n-\t\tmunmap(srcmem, src->planes_[i].length);\n-\t\tmunmap(dstmem, planes_[i].length);\n+\tfor (unsigned int i = 0; i < planes_.size(); i++) {\n+\t\tmemcpy(destination.maps()[i].data(),\n+\t\t source.maps()[i].data(),\n+\t\t source.maps()[i].size());\n \t}\n \n \tmetadata_ = src->metadata_;\n","prefixes":["libcamera-devel","v4","05/13"]}