{"id":9144,"url":"https://patchwork.libcamera.org/api/patches/9144/?format=json","web_url":"https://patchwork.libcamera.org/patch/9144/","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":"<20200803161816.107113-5-kieran.bingham@ideasonboard.com>","date":"2020-08-03T16:18:08","name":"[libcamera-devel,v2,04/12] 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/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9144/mbox/","series":[{"id":1183,"url":"https://patchwork.libcamera.org/api/series/1183/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1183","date":"2020-08-03T16:18:04","name":"android: jpeg","version":2,"mbox":"https://patchwork.libcamera.org/series/1183/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9144/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9144/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 73C0BBD86F\n\tfor ;\n\tMon, 3 Aug 2020 16:18:27 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3B38F60396;\n\tMon, 3 Aug 2020 18:18:27 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 389A66199D\n\tfor ;\n\tMon, 3 Aug 2020 18:18:23 +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 B8FD3B27;\n\tMon, 3 Aug 2020 18:18:22 +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=\"W6VsN1L+\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1596471502;\n\tbh=ogy899GEHQ2j1b5E66u6H0gWtBw2hIdVmT+pTTs87Pw=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=W6VsN1L+AQz8JTKK1fH/lraVX0V77WQx/YyE6HMrI1uIt4LUAKpueT8+RBVLaAQ7o\n\t8bgYL9WiGCiMwdEyGr7IAzdqCwq0lXEH4zSbpMeN+vKiYMxyhC8oCFpAb94v5nhqBG\n\tRb+dIxZsrwjPTRs6JqWxh41EF67fant7U7LnUKFs=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Mon, 3 Aug 2020 17:18:08 +0100","Message-Id":"<20200803161816.107113-5-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20200803161816.107113-1-kieran.bingham@ideasonboard.com>","References":"<20200803161816.107113-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 04/12] 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\nSigned-off-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \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 2f667db42922..fc15fc1c8ec4 100644\n--- a/src/libcamera/buffer.cpp\n+++ b/src/libcamera/buffer.cpp\n@@ -258,32 +258,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","v2","04/12"]}