[libcamera-devel] [PATCH 05/12] android: camera_device: Rename buffer fields
Laurent Pinchart
laurent.pinchart at ideasonboard.com
Sun Feb 28 19:23:23 CET 2021
Hi Jacopo,
Thank you for the patch.
On Fri, Feb 26, 2021 at 02:29:25PM +0100, Jacopo Mondi wrote:
> The buffers passed to the post processor are currently named 'buffer'
> and 'mapped', names that do not convey their role.
>
> Use 'src' and 'dest' instead.
Much better. I maye have used 'dst' to have the same number of
characters ;-). It really doesn't matter.
Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> Cosmetic change only.
>
> Signed-off-by: Jacopo Mondi <jacopo at jmondi.org>
> ---
> src/android/camera_device.cpp | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
> index f47f28b8c7ee..1c3b0f56ed28 100644
> --- a/src/android/camera_device.cpp
> +++ b/src/android/camera_device.cpp
> @@ -1851,8 +1851,8 @@ void CameraDevice::requestComplete(Request *request)
> if (cameraStream->camera3Stream().format != HAL_PIXEL_FORMAT_BLOB)
> continue;
>
> - FrameBuffer *buffer = request->findBuffer(cameraStream->stream());
> - if (!buffer) {
> + FrameBuffer *src = request->findBuffer(cameraStream->stream());
> + if (!src) {
> LOG(HAL, Error) << "Failed to find a source stream buffer";
> continue;
> }
> @@ -1862,14 +1862,14 @@ void CameraDevice::requestComplete(Request *request)
> * separate thread.
> */
>
> - CameraBuffer mapped(*descriptor->buffers_[i].buffer,
> - PROT_READ | PROT_WRITE);
> - if (!mapped.isValid()) {
> - LOG(HAL, Error) << "Failed to mmap android blob buffer";
> + CameraBuffer dest(*descriptor->buffers_[i].buffer,
> + PROT_READ | PROT_WRITE);
> + if (!dest.isValid()) {
> + LOG(HAL, Error) << "Failed to map android blob buffer";
> continue;
> }
>
> - int ret = cameraStream->process(*buffer, &mapped,
> + int ret = cameraStream->process(*src, &dest,
> descriptor->settings_,
> resultMetadata.get());
> if (ret) {
> @@ -1882,7 +1882,7 @@ void CameraDevice::requestComplete(Request *request)
> * done processing it.
> */
> if (cameraStream->type() == CameraStream::Type::Internal)
> - cameraStream->putBuffer(buffer);
> + cameraStream->putBuffer(src);
> }
>
> /* Prepare to call back the Android camera stack. */
--
Regards,
Laurent Pinchart
More information about the libcamera-devel
mailing list