[libcamera-devel] [PATCH 03/12] android: Rename MappedCamera3Buffer to CameraBuffer
Jacopo Mondi
jacopo at jmondi.org
Fri Feb 26 14:29:23 CET 2021
Rename the MappedCamera3Buffer class to the simpler CameraBuffer to match
the name of the header file where the interface is defined.
Signed-off-by: Jacopo Mondi <jacopo at jmondi.org>
---
src/android/camera_buffer.h | 6 +++---
src/android/camera_device.cpp | 4 ++--
src/android/mm/android_generic_buffer.cpp | 5 ++---
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h
index a1fb97a3c6db..00b061502d6e 100644
--- a/src/android/camera_buffer.h
+++ b/src/android/camera_buffer.h
@@ -11,11 +11,11 @@
#include <libcamera/internal/buffer.h>
-class MappedCamera3Buffer : public libcamera::MappedBuffer
+class CameraBuffer : public libcamera::MappedBuffer
{
public:
- MappedCamera3Buffer(const buffer_handle_t camera3buffer, int flags);
- ~MappedCamera3Buffer();
+ CameraBuffer(const buffer_handle_t camera3buffer, int flags);
+ ~CameraBuffer();
};
#endif /* __ANDROID_CAMERA_BUFFER_H__ */
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index a7a5b7986aa4..f47f28b8c7ee 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -1862,8 +1862,8 @@ void CameraDevice::requestComplete(Request *request)
* separate thread.
*/
- MappedCamera3Buffer mapped(*descriptor->buffers_[i].buffer,
- PROT_READ | PROT_WRITE);
+ CameraBuffer mapped(*descriptor->buffers_[i].buffer,
+ PROT_READ | PROT_WRITE);
if (!mapped.isValid()) {
LOG(HAL, Error) << "Failed to mmap android blob buffer";
continue;
diff --git a/src/android/mm/android_generic_buffer.cpp b/src/android/mm/android_generic_buffer.cpp
index 2504d9276e9e..6f41215bb0f9 100644
--- a/src/android/mm/android_generic_buffer.cpp
+++ b/src/android/mm/android_generic_buffer.cpp
@@ -13,8 +13,7 @@ using namespace libcamera;
LOG_DECLARE_CATEGORY(HAL)
-MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer,
- int flags)
+CameraBuffer::CameraBuffer(const buffer_handle_t camera3buffer, int flags)
{
maps_.reserve(camera3buffer->numFds);
error_ = 0;
@@ -43,6 +42,6 @@ MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer,
}
}
-MappedCamera3Buffer::~MappedCamera3Buffer()
+CameraBuffer::~CameraBuffer()
{
}
--
2.30.0
More information about the libcamera-devel
mailing list