diff options
Diffstat (limited to 'src/android/mm')
| -rw-r--r-- | src/android/mm/cros_camera_buffer.cpp | 6 | ||||
| -rw-r--r-- | src/android/mm/generic_camera_buffer.cpp | 11 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/android/mm/cros_camera_buffer.cpp b/src/android/mm/cros_camera_buffer.cpp index 44993379..ec45e04c 100644 --- a/src/android/mm/cros_camera_buffer.cpp +++ b/src/android/mm/cros_camera_buffer.cpp @@ -21,7 +21,7 @@ class CameraBuffer::Private : public Extensible::Private public: Private(CameraBuffer *cameraBuffer, buffer_handle_t camera3Buffer, - libcamera::PixelFormat pixelFormat, const libcamera::Size &size, + PixelFormat pixelFormat, const Size &size, int flags); ~Private(); @@ -53,8 +53,8 @@ private: CameraBuffer::Private::Private([[maybe_unused]] CameraBuffer *cameraBuffer, buffer_handle_t camera3Buffer, - [[maybe_unused]] libcamera::PixelFormat pixelFormat, - [[maybe_unused]] const libcamera::Size &size, + [[maybe_unused]] PixelFormat pixelFormat, + [[maybe_unused]] const Size &size, [[maybe_unused]] int flags) : handle_(camera3Buffer), numPlanes_(0), mapped_(false), registered_(false) diff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp index 22efc4d4..27a30e2d 100644 --- a/src/android/mm/generic_camera_buffer.cpp +++ b/src/android/mm/generic_camera_buffer.cpp @@ -20,14 +20,13 @@ using namespace libcamera; LOG_DECLARE_CATEGORY(HAL) class CameraBuffer::Private : public Extensible::Private, - public libcamera::MappedBuffer + public MappedBuffer { LIBCAMERA_DECLARE_PUBLIC(CameraBuffer) public: Private(CameraBuffer *cameraBuffer, buffer_handle_t camera3Buffer, - libcamera::PixelFormat pixelFormat, const libcamera::Size &size, - int flags); + PixelFormat pixelFormat, const Size &size, int flags); ~Private(); unsigned int numPlanes() const; @@ -58,13 +57,13 @@ private: CameraBuffer::Private::Private([[maybe_unused]] CameraBuffer *cameraBuffer, buffer_handle_t camera3Buffer, - libcamera::PixelFormat pixelFormat, - const libcamera::Size &size, int flags) + PixelFormat pixelFormat, + const Size &size, int flags) : fd_(-1), flags_(flags), bufferLength_(-1), mapped_(false) { error_ = 0; - const auto &info = libcamera::PixelFormatInfo::info(pixelFormat); + const auto &info = PixelFormatInfo::info(pixelFormat); if (!info.isValid()) { error_ = -EINVAL; LOG(HAL, Error) << "Invalid pixel format: " |