From d5473c962618f29e3f2f971b794a7fc770afc9bd Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Wed, 17 Feb 2021 16:21:59 +0100 Subject: android: camera_device: Rename buffer fields 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. Cosmetic change only. Reviewed-by: Laurent Pinchart Signed-off-by: Jacopo Mondi --- 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 f47f28b8..1c3b0f56 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. */ -- cgit v1.2.1