PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: Drop the LIBCAMERA_D_PTR macro in favour of the _d() function

Browse Source 
Now that all Extensible classes expose a _d() function that performs
appropriate casts, the LIBCAMERA_D_PTR brings no real additional value.
Replace it with direct calls to the _d() function.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Laurent Pinchart
2021-07-11 19:46:55 +03:00
parent a81ccba6a2
commit 689811d87a
6 changed files with 34 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/android/camera_buffer.h
View File

@@ -40,27 +40,22 @@ CameraBuffer::~CameraBuffer() \
} \
bool CameraBuffer::isValid() const \
{ \
const Private *const d = LIBCAMERA_D_PTR(); \
return d->isValid(); \
return _d()->isValid(); \
} \
unsigned int CameraBuffer::numPlanes() const \
{ \
const Private *const d = LIBCAMERA_D_PTR(); \
return d->numPlanes(); \
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); \
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); \
return _d()->plane(plane); \
} \
size_t CameraBuffer::jpegBufferSize(size_t maxJpegBufferSize) const \
{ \
const Private *const d = LIBCAMERA_D_PTR(); \
return d->jpegBufferSize(maxJpegBufferSize); \
return _d()->jpegBufferSize(maxJpegBufferSize); \
}
#endif /* __ANDROID_CAMERA_BUFFER_H__ */

3
src/android/camera_hal_config.cpp
View File

@@ -375,8 +375,7 @@ int CameraHalConfig::parseConfigurationFile()
exists_ = true;
Private *const d = LIBCAMERA_D_PTR();
int ret = d->parseConfigFile(fh, &cameras_);
int ret = _d()->parseConfigFile(fh, &cameras_);
fclose(fh);
if (ret)
return -EINVAL;