commit a0c2d35904b979205e1a47131a2bc2528d1e9894
author huans <huans@google.com> Mon Nov 06 09:13:59 2017 -0800
committer huans <huans@google.com> Tue Jan 30 16:00:40 2018 -0800
tree 6030fb55a7e6a662c1ed9c03b055166820d8bea7
parent 500bdb4b97e151b84ecaad6fcc339747a8a2e805

Update 3A control region, add black/white levels.

Bug: 68388225
Test: run cts -m CameraTestCases -t
android.hardware.camera2.cts.CaptureRequestTest#testDigitalZoom
Change-Id: I9852744bac8fcfdf8210a3d9bb54ea859d27e8d1

camera/EmulatedFakeCamera3.cpp

diff --git a/camera/EmulatedFakeCamera3.cpp b/camera/EmulatedFakeCamera3.cpp
index 1d83141..99268eb 100644
--- a/camera/EmulatedFakeCamera3.cpp
+++ b/camera/EmulatedFakeCamera3.cpp
@@ -37,6 +37,7 @@
 #include <cmath>
 
 #include <vector>
+#include <algorithm>
 
 #if defined(LOG_NNDEBUG) && LOG_NNDEBUG == 0
 #define ALOGVV ALOGV
@@ -866,7 +867,6 @@
     uint32_t sensitivity;
     bool     needJpeg = false;
     camera_metadata_entry_t entry;
-
     entry = settings.find(ANDROID_SENSOR_EXPOSURE_TIME);
     exposureTime = (entry.count > 0) ? entry.data.i64[0] : Sensor::kExposureTimeRange[0];
     entry = settings.find(ANDROID_SENSOR_FRAME_DURATION);
@@ -1172,10 +1172,6 @@
                 &Sensor::kSensitivityRange[1], 1);
     }
 
-    static const int32_t sensorBlackLevelPattern[4] = {0, 0, 0, 0};
-    ADD_STATIC_ENTRY(ANDROID_SENSOR_BLACK_LEVEL_PATTERN,
-            sensorBlackLevelPattern, 4);
-
     static const uint8_t sensorColorFilterArrangement =
         ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_RGGB;
     ADD_STATIC_ENTRY(ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT,
@@ -1198,10 +1194,7 @@
     static const uint8_t timestampSource = ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE_REALTIME;
     ADD_STATIC_ENTRY(ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE, &timestampSource, 1);
 
-    if (hasCapability(RAW)) {
-        ADD_STATIC_ENTRY(ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT,
-                &Sensor::kColorFilterArrangement, 1);
-
+    if (hasCapability(RAW) || hasCapability(MANUAL_SENSOR)) {
         ADD_STATIC_ENTRY(ANDROID_SENSOR_INFO_WHITE_LEVEL,
                 (int32_t*)&Sensor::kMaxRawValue, 1);
 
@@ -1213,6 +1206,11 @@
                 blackLevelPattern, sizeof(blackLevelPattern)/sizeof(int32_t));
     }
 
+    if (hasCapability(RAW)) {
+        ADD_STATIC_ENTRY(ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT,
+                &Sensor::kColorFilterArrangement, 1);
+    }
+
     if (hasCapability(BACKWARD_COMPATIBLE)) {
         static const int32_t availableTestPatternModes[] = {
             ANDROID_SENSOR_TEST_PATTERN_MODE_OFF
@@ -2318,6 +2316,39 @@
     return OK;
 }
 
+// Update the 3A Region by calculating the intersection of AE/AF/AWB and CROP
+// regions
+static void update3ARegion(uint32_t tag, CameraMetadata &settings) {
+    if (tag != ANDROID_CONTROL_AE_REGIONS &&
+        tag != ANDROID_CONTROL_AF_REGIONS &&
+        tag != ANDROID_CONTROL_AWB_REGIONS) {
+        return;
+    }
+    camera_metadata_entry_t entry;
+    entry = settings.find(ANDROID_SCALER_CROP_REGION);
+    if (entry.count > 0) {
+        int32_t cropRegion[4];
+        cropRegion[0] =  entry.data.i32[0];
+        cropRegion[1] =  entry.data.i32[1];
+        cropRegion[2] =  entry.data.i32[2] + cropRegion[0];
+        cropRegion[3] =  entry.data.i32[3] + cropRegion[1];
+        entry = settings.find(tag);
+        if (entry.count > 0) {
+            int32_t* ARegion = entry.data.i32;
+            // calculate the intersection of AE/AF/AWB and CROP regions
+            if (ARegion[0] < cropRegion[2] && cropRegion[0] < ARegion[2] &&
+                ARegion[1] < cropRegion[3] && cropRegion[1] < ARegion[3]) {
+                int32_t interSect[5];
+                interSect[0] = std::max(ARegion[0], cropRegion[0]);
+                interSect[1] = std::max(ARegion[1], cropRegion[1]);
+                interSect[2] = std::min(ARegion[2], cropRegion[2]);
+                interSect[3] = std::min(ARegion[3], cropRegion[3]);
+                interSect[4] = ARegion[4];
+                settings.update(tag, &interSect[0], 5);
+            }
+        }
+    }
+}
 
 void EmulatedFakeCamera3::update3A(CameraMetadata &settings) {
     if (mAeMode != ANDROID_CONTROL_AE_MODE_OFF) {
@@ -2350,7 +2381,9 @@
             break;
     }
     settings.update(ANDROID_LENS_STATE, &lensState, 1);
-
+    update3ARegion(ANDROID_CONTROL_AE_REGIONS, settings);
+    update3ARegion(ANDROID_CONTROL_AF_REGIONS, settings);
+    update3ARegion(ANDROID_CONTROL_AWB_REGIONS, settings);
 }
 
 void EmulatedFakeCamera3::signalReadoutIdle() {