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/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index 1c5281d..09b1f02 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -161,14 +161,9 @@
                 }
             }
 
-            res = mZoomRatioMappers[physicalId].initZoomRatioTags(
+            mZoomRatioMappers[physicalId] = ZoomRatioMapper(
                     &mPhysicalDeviceInfoMap[physicalId],
                     mSupportNativeZoomRatio, usePrecorrectArray);
-            if (res != OK) {
-                SET_ERR_L("Failed to initialize camera %s's zoomRatio tags: %s (%d)",
-                        physicalId.c_str(), strerror(-res), res);
-                return res;
-            }
         }
     }
 
@@ -353,13 +348,8 @@
         }
     }
 
-    res = mZoomRatioMappers[mId.c_str()].initZoomRatioTags(&mDeviceInfo,
+    mZoomRatioMappers[mId.c_str()] = ZoomRatioMapper(&mDeviceInfo,
             mSupportNativeZoomRatio, usePrecorrectArray);
-    if (res != OK) {
-        SET_ERR_L("Failed to initialize zoomRatio tags: %s (%d)",
-                strerror(-res), res);
-        return res;
-    }
 
     return OK;
 }