diff options
| -rw-r--r-- | src/android/camera_buffer.h | 33 | ||||
| -rw-r--r-- | src/android/mm/generic_camera_buffer.cpp | 39 |
2 files changed, 34 insertions, 38 deletions
diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h index 784fbd50..7e8970b4 100644 --- a/src/android/camera_buffer.h +++ b/src/android/camera_buffer.h @@ -30,4 +30,37 @@ public: size_t jpegBufferSize(size_t maxJpegBufferSize) const; }; +#define PUBLIC_CAMERA_BUFFER_IMPLEMENTATION \ +CameraBuffer::CameraBuffer(buffer_handle_t camera3Buffer, int flags) \ + : Extensible(new Private(this, camera3Buffer, flags)) \ +{ \ +} \ +CameraBuffer::~CameraBuffer() \ +{ \ +} \ +bool CameraBuffer::isValid() const \ +{ \ + const Private *const d = LIBCAMERA_D_PTR(); \ + return d->isValid(); \ +} \ +unsigned int CameraBuffer::numPlanes() const \ +{ \ + const Private *const d = LIBCAMERA_D_PTR(); \ + return d->numPlanes(); \ +} \ +Span<const uint8_t> CameraBuffer::plane(unsigned int plane) const \ +{ \ + const Private *const d = LIBCAMERA_D_PTR(); \ + return const_cast<Private *>(d)->plane(plane); \ +} \ +Span<uint8_t> CameraBuffer::plane(unsigned int plane) \ +{ \ + Private *const d = LIBCAMERA_D_PTR(); \ + return d->plane(plane); \ +} \ +size_t CameraBuffer::jpegBufferSize(size_t maxJpegBufferSize) const \ +{ \ + const Private *const d = LIBCAMERA_D_PTR(); \ + return d->jpegBufferSize(maxJpegBufferSize); \ +} #endif /* __ANDROID_CAMERA_BUFFER_H__ */ diff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp index 98e63dfa..929e078a 100644 --- a/src/android/mm/generic_camera_buffer.cpp +++ b/src/android/mm/generic_camera_buffer.cpp @@ -85,41 +85,4 @@ size_t CameraBuffer::Private::jpegBufferSize(size_t maxJpegBufferSize) const maxJpegBufferSize); } -CameraBuffer::CameraBuffer(buffer_handle_t camera3Buffer, int flags) - : Extensible(new Private(this, camera3Buffer, flags)) -{ -} - -CameraBuffer::~CameraBuffer() -{ -} - -bool CameraBuffer::isValid() const -{ - const Private *const d = LIBCAMERA_D_PTR(); - return d->isValid(); -} - -unsigned int CameraBuffer::numPlanes() const -{ - const Private *const d = LIBCAMERA_D_PTR(); - return d->numPlanes(); -} - -Span<const uint8_t> CameraBuffer::plane(unsigned int plane) const -{ - const Private *const d = LIBCAMERA_D_PTR(); - return const_cast<Private *>(d)->plane(plane); -} - -Span<uint8_t> CameraBuffer::plane(unsigned int plane) -{ - Private *const d = LIBCAMERA_D_PTR(); - return d->plane(plane); -} - -size_t CameraBuffer::jpegBufferSize(size_t maxJpegBufferSize) const -{ - const Private *const d = LIBCAMERA_D_PTR(); - return d->jpegBufferSize(maxJpegBufferSize); -} +PUBLIC_CAMERA_BUFFER_IMPLEMENTATION |