commit 1c834da07093c79d2a8fedb47836b78f00a31e2e
author Shuzhen Wang <shuzhenwang@google.com> Wed Dec 18 11:17:03 2019 -0800
committer Shuzhen Wang <shuzhenwang@google.com> Tue Dec 31 07:18:16 2019 +0000
tree 4542e2d86881525c694e8111686b1674bec4b8d7
parent 62f49ed06456101818acac1be1508c3439fab2fc

Camera3: Remove mutex from ZoomRatioMapper

ZoomRatioMapper's member variables are const after construction. As a
result, we don't need mutex to protect updateCaptureRequest and
updateCaptureResult calls.

Also fixed missing zoom ratio mapping initialization for physical
sub-camera.

Test: testZoomRatio CTS
Bug: 130025314
Change-Id: Ibe2ff7cffb13178dcf70fc9e2eb044184e58bcf2

services/camera/libcameraservice/device3/ZoomRatioMapper.cpp

diff --git a/services/camera/libcameraservice/device3/ZoomRatioMapper.cpp b/services/camera/libcameraservice/device3/ZoomRatioMapper.cpp
index 7718819..84da45a 100644
--- a/services/camera/libcameraservice/device3/ZoomRatioMapper.cpp
+++ b/services/camera/libcameraservice/device3/ZoomRatioMapper.cpp
@@ -25,8 +25,6 @@
 
 namespace camera3 {
 
-ZoomRatioMapper::ZoomRatioMapper() : mHalSupportsZoomRatio(false) {
-}
 
 status_t ZoomRatioMapper::initZoomRatioInTemplate(CameraMetadata *request) {
     camera_metadata_entry_t entry;
@@ -117,19 +115,17 @@
     return OK;
 }
 
-status_t ZoomRatioMapper::initZoomRatioTags(const CameraMetadata* deviceInfo,
+ZoomRatioMapper::ZoomRatioMapper(const CameraMetadata* deviceInfo,
         bool supportNativeZoomRatio, bool usePrecorrectArray) {
-    std::lock_guard<std::mutex> lock(mMutex);
-
     camera_metadata_ro_entry_t entry;
 
     entry = deviceInfo->find(ANDROID_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE);
-    if (entry.count != 4) return BAD_VALUE;
+    if (entry.count != 4) return;
     int32_t arrayW = entry.data.i32[2];
     int32_t arrayH = entry.data.i32[3];
 
     entry = deviceInfo->find(ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE);
-    if (entry.count != 4) return BAD_VALUE;
+    if (entry.count != 4) return;
     int32_t activeW = entry.data.i32[2];
     int32_t activeH = entry.data.i32[3];
 
@@ -144,11 +140,12 @@
 
     ALOGV("%s: array size: %d x %d, mHalSupportsZoomRatio %d",
             __FUNCTION__, mArrayWidth, mArrayHeight, mHalSupportsZoomRatio);
-    return OK;
+    mIsValid = true;
 }
 
 status_t ZoomRatioMapper::updateCaptureRequest(CameraMetadata* request) {
-    std::lock_guard<std::mutex> lock(mMutex);
+    if (!mIsValid) return INVALID_OPERATION;
+
     status_t res = OK;
     bool zoomRatioIs1 = true;
     camera_metadata_entry_t entry;
@@ -174,7 +171,8 @@
 }
 
 status_t ZoomRatioMapper::updateCaptureResult(CameraMetadata* result, bool requestedZoomRatioIs1) {
-    std::lock_guard<std::mutex> lock(mMutex);
+    if (!mIsValid) return INVALID_OPERATION;
+
     status_t res = OK;
 
     if (mHalSupportsZoomRatio && requestedZoomRatioIs1) {