{"id":11396,"url":"https://patchwork.libcamera.org/api/1.1/patches/11396/?format=json","web_url":"https://patchwork.libcamera.org/patch/11396/","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":"<20210226132932.165484-4-jacopo@jmondi.org>","date":"2021-02-26T13:29:23","name":"[libcamera-devel,03/12] android: Rename MappedCamera3Buffer to CameraBuffer","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"79d70b9b82b02a9eae8203cd3eb46352717ac62f","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/11396/mbox/","series":[{"id":1731,"url":"https://patchwork.libcamera.org/api/1.1/series/1731/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1731","date":"2021-02-26T13:29:20","name":"android: Support memory backends","version":1,"mbox":"https://patchwork.libcamera.org/series/1731/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11396/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11396/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 EB6B1BD1F1\n\tfor ;\n\tFri, 26 Feb 2021 13:29:19 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 106AE68A79;\n\tFri, 26 Feb 2021 14:29:18 +0100 (CET)","from relay12.mail.gandi.net (relay12.mail.gandi.net\n\t[217.70.178.232])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 520ED68A61\n\tfor ;\n\tFri, 26 Feb 2021 14:29:14 +0100 (CET)","from uno.LocalDomain (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay12.mail.gandi.net (Postfix) with ESMTPSA id 1968F200010\n\tfor ;\n\tFri, 26 Feb 2021 13:29:13 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 26 Feb 2021 14:29:23 +0100","Message-Id":"<20210226132932.165484-4-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.30.0","In-Reply-To":"<20210226132932.165484-1-jacopo@jmondi.org>","References":"<20210226132932.165484-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 03/12] android: Rename MappedCamera3Buffer\n\tto CameraBuffer","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":"Rename the MappedCamera3Buffer class to the simpler CameraBuffer to match\nthe name of the header file where the interface is defined.\n\nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_buffer.h | 6 +++---\n src/android/camera_device.cpp | 4 ++--\n src/android/mm/android_generic_buffer.cpp | 5 ++---\n 3 files changed, 7 insertions(+), 8 deletions(-)","diff":"diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h\nindex a1fb97a3c6db..00b061502d6e 100644\n--- a/src/android/camera_buffer.h\n+++ b/src/android/camera_buffer.h\n@@ -11,11 +11,11 @@\n \n #include \n \n-class MappedCamera3Buffer : public libcamera::MappedBuffer\n+class CameraBuffer : public libcamera::MappedBuffer\n {\n public:\n-\tMappedCamera3Buffer(const buffer_handle_t camera3buffer, int flags);\n-\t~MappedCamera3Buffer();\n+\tCameraBuffer(const buffer_handle_t camera3buffer, int flags);\n+\t~CameraBuffer();\n };\n \n #endif /* __ANDROID_CAMERA_BUFFER_H__ */\ndiff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex a7a5b7986aa4..f47f28b8c7ee 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1862,8 +1862,8 @@ void CameraDevice::requestComplete(Request *request)\n \t\t * separate thread.\n \t\t */\n \n-\t\tMappedCamera3Buffer mapped(*descriptor->buffers_[i].buffer,\n-\t\t\t\t\t PROT_READ | PROT_WRITE);\n+\t\tCameraBuffer mapped(*descriptor->buffers_[i].buffer,\n+\t\t\t\t PROT_READ | PROT_WRITE);\n \t\tif (!mapped.isValid()) {\n \t\t\tLOG(HAL, Error) << \"Failed to mmap android blob buffer\";\n \t\t\tcontinue;\ndiff --git a/src/android/mm/android_generic_buffer.cpp b/src/android/mm/android_generic_buffer.cpp\nindex 2504d9276e9e..6f41215bb0f9 100644\n--- a/src/android/mm/android_generic_buffer.cpp\n+++ b/src/android/mm/android_generic_buffer.cpp\n@@ -13,8 +13,7 @@ using namespace libcamera;\n \n LOG_DECLARE_CATEGORY(HAL)\n \n-MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer,\n-\t\t\t\t\t int flags)\n+CameraBuffer::CameraBuffer(const buffer_handle_t camera3buffer, int flags)\n {\n \tmaps_.reserve(camera3buffer->numFds);\n \terror_ = 0;\n@@ -43,6 +42,6 @@ MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer,\n \t}\n }\n \n-MappedCamera3Buffer::~MappedCamera3Buffer()\n+CameraBuffer::~CameraBuffer()\n {\n }\n","prefixes":["libcamera-devel","03/12"]}