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

android: camera_device: Rename buffer fields

Browse Source 
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 <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Jacopo Mondi
2021-02-17 16:21:59 +01:00
parent 99edf1ef42
commit d5473c9626
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/android/camera_device.cpp
View File

@@ -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. */