commit 4354322b6705e1cc5d50b2f7fbd5bc92a45968f7
author Jan Sebechlebsky <jsebechlebsky@google.com> Fri Feb 16 12:50:32 2024 +0100
committer Jan Sebechlebsky <jsebechlebsky@google.com> Wed Feb 21 10:43:30 2024 +0100
tree 21408a00b2db3985d50a5bee5dcfb5f4005e10c7
parent a8b7ec8e21dc8e4cad45d464703834876c5aed6d

Use RAII for locking/unlocking buffers.

Bug: 324383963
Test: atest virtual_camera_tests
Test: atest VirtualCameraTest

Change-Id: I8d8071250f7847334a75e261c7f69b5022e04507

services/camera/virtualcamera/VirtualCameraRenderThread.cc

diff --git a/services/camera/virtualcamera/VirtualCameraRenderThread.cc b/services/camera/virtualcamera/VirtualCameraRenderThread.cc
index 218e114..615e449 100644
--- a/services/camera/virtualcamera/VirtualCameraRenderThread.cc
+++ b/services/camera/virtualcamera/VirtualCameraRenderThread.cc
@@ -510,12 +510,10 @@
     return {};
   }
 
-  android_ycbcr ycbcr;
-  status_t status =
-      gBuffer->lockYCbCr(AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN, &ycbcr);
-  if (status != NO_ERROR) {
+  YCbCrLockGuard yCbCrLock(inHwBuffer, AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN);
+  if (yCbCrLock.getStatus() != NO_ERROR) {
     ALOGE("%s: Failed to lock graphic buffer while generating thumbnail: %d",
-          __func__, status);
+          __func__, yCbCrLock.getStatus());
     return {};
   }
 
@@ -523,9 +521,9 @@
   compressedThumbnail.resize(kJpegThumbnailBufferSize);
   ALOGE("%s: Compressing thumbnail %d x %d", __func__, gBuffer->getWidth(),
         gBuffer->getHeight());
-  std::optional<size_t> compressedSize =
-      compressJpeg(gBuffer->getWidth(), gBuffer->getHeight(), quality, ycbcr,
-                   {}, compressedThumbnail.size(), compressedThumbnail.data());
+  std::optional<size_t> compressedSize = compressJpeg(
+      gBuffer->getWidth(), gBuffer->getHeight(), quality, *yCbCrLock, {},
+      compressedThumbnail.size(), compressedThumbnail.data());
   if (!compressedSize.has_value()) {
     ALOGE("%s: Failed to compress jpeg thumbnail", __func__);
     return {};
@@ -570,14 +568,9 @@
     return status;
   }
 
-  AHardwareBuffer_Planes planes_info;
-
-  int32_t rawFence = fence != nullptr ? fence->get() : -1;
-  int result = AHardwareBuffer_lockPlanes(hwBuffer.get(),
-                                          AHARDWAREBUFFER_USAGE_CPU_READ_RARELY,
-                                          rawFence, nullptr, &planes_info);
-  if (result != OK) {
-    ALOGE("%s: Failed to lock planes for BLOB buffer: %d", __func__, result);
+  PlanesLockGuard planesLock(hwBuffer, AHARDWAREBUFFER_USAGE_CPU_READ_RARELY,
+                             fence);
+  if (planesLock.getStatus() != OK) {
     return cameraStatus(Status::INTERNAL_ERROR);
   }
 
@@ -586,22 +579,16 @@
 
   std::optional<size_t> compressedSize;
   if (gBuffer != nullptr) {
-    android_ycbcr ycbcr;
     if (gBuffer->getPixelFormat() != HAL_PIXEL_FORMAT_YCbCr_420_888) {
       // This should never happen since we're allocating the temporary buffer
       // with YUV420 layout above.
       ALOGE("%s: Cannot compress non-YUV buffer (pixelFormat %d)", __func__,
             gBuffer->getPixelFormat());
-      AHardwareBuffer_unlock(hwBuffer.get(), nullptr);
       return cameraStatus(Status::INTERNAL_ERROR);
     }
 
-    status_t status =
-        gBuffer->lockYCbCr(AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN, &ycbcr);
-    ALOGV("Locked buffers");
-    if (status != NO_ERROR) {
-      AHardwareBuffer_unlock(hwBuffer.get(), nullptr);
-      ALOGE("%s: Failed to lock graphic buffer: %d", __func__, status);
+    YCbCrLockGuard yCbCrLock(inHwBuffer, AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN);
+    if (yCbCrLock.getStatus() != OK) {
       return cameraStatus(Status::INTERNAL_ERROR);
     }
 
@@ -611,24 +598,18 @@
                                    requestSettings.thumbnailJpegQuality));
     compressedSize = compressJpeg(
         gBuffer->getWidth(), gBuffer->getHeight(), requestSettings.jpegQuality,
-        ycbcr, app1ExifData, stream->bufferSize - sizeof(CameraBlob),
-        planes_info.planes[0].data);
-
-    status_t res = gBuffer->unlock();
-    if (res != NO_ERROR) {
-      ALOGE("Failed to unlock graphic buffer: %d", res);
-    }
+        *yCbCrLock, app1ExifData, stream->bufferSize - sizeof(CameraBlob),
+        (*planesLock).planes[0].data);
   } else {
     std::vector<uint8_t> app1ExifData =
         createExif(Resolution(stream->width, stream->height));
     compressedSize = compressBlackJpeg(
         stream->width, stream->height, requestSettings.jpegQuality, app1ExifData,
-        stream->bufferSize - sizeof(CameraBlob), planes_info.planes[0].data);
+        stream->bufferSize - sizeof(CameraBlob), (*planesLock).planes[0].data);
   }
 
   if (!compressedSize.has_value()) {
     ALOGE("%s: Failed to compress JPEG image", __func__);
-    AHardwareBuffer_unlock(hwBuffer.get(), nullptr);
     return cameraStatus(Status::INTERNAL_ERROR);
   }
 
@@ -636,12 +617,10 @@
       .blobId = CameraBlobId::JPEG,
       .blobSizeBytes = static_cast<int32_t>(compressedSize.value())};
 
-  memcpy(reinterpret_cast<uint8_t*>(planes_info.planes[0].data) +
+  memcpy(reinterpret_cast<uint8_t*>((*planesLock).planes[0].data) +
              (stream->bufferSize - sizeof(cameraBlob)),
          &cameraBlob, sizeof(cameraBlob));
 
-  AHardwareBuffer_unlock(hwBuffer.get(), nullptr);
-
   ALOGV("%s: Successfully compressed JPEG image, resulting size %zu B",
         __func__, compressedSize.value());