Camera_test: Adds support for testing Metering Areas

- Can be tested using 'y' key.

Signed-off-by: Dimitar Borisov <dborisov@mm-sol.com>
Signed-off-by: Jean Johnson <a0271255@ti.com>
Change-Id: I04a43099d2c46787aba5de15d388edcad2dbd9c9

3 files changed, 31 insertions, 0 deletions

diff --git a/test/CameraHal/camera_test.h b/test/CameraHal/camera_test.h
index 5239a17..ebc4a83 100644
--- a/test/CameraHal/camera_test.h
+++ b/test/CameraHal/camera_test.h
@@ -52,6 +52,7 @@
 #define KEY_METERING_MODE   "meter-mode"
 
 #define TEST_FOCUS_AREA "(0,0,1000,1000,300),(-1000,-1000,1000,1000,300),(0,0,0,0,0)"
+#define TEST_METERING_AREA "(0,0,1000,1000,300),(-1000,-1000,1000,1000,300)"
 
 #define COMPENSATION_OFFSET 20
 #define DELIMITER           "|"
diff --git a/test/CameraHal/camera_test_menu.cpp b/test/CameraHal/camera_test_menu.cpp
index 7dec7a3..ae6d815 100644
--- a/test/CameraHal/camera_test_menu.cpp
+++ b/test/CameraHal/camera_test_menu.cpp
@@ -795,6 +795,7 @@ void printSupportedParams()
     printf("\n\r\tSupported Antibanding Options: %s", params.get(CameraParameters::KEY_SUPPORTED_ANTIBANDING));
     printf("\n\r\tSupported Flash Modes: %s", params.get(CameraParameters::KEY_SUPPORTED_FLASH_MODES));
     printf("\n\r\tSupported Focus Areas: %d", params.getInt(CameraParameters::KEY_MAX_NUM_FOCUS_AREAS));
+    printf("\n\r\tSupported Metering Areas: %d", params.getInt(CameraParameters::KEY_MAX_NUM_METERING_AREAS));
 
     if ( NULL != params.get(CameraParameters::KEY_FOCUS_DISTANCES) ) {
         printf("\n\r\tFocus Distances: %s \n", params.get(CameraParameters::KEY_FOCUS_DISTANCES));
@@ -1366,6 +1367,7 @@ int functional_menu() {
         printf("   F. Start face detection \n");
         printf("   T. Stop face detection \n");
         printf("   G. Touch/Focus area AF\n");
+        printf("   y. Metering area\n");
         printf("   f. Auto Focus/Half Press\n");
         printf("   I. AF Timeout       %s\n", afTimeout[afTimeoutIdx]);
         printf("   J.Flash:              %s\n", flashModes[flashIdx]);
@@ -2039,6 +2041,20 @@ int functional_menu() {
 
             params.remove(CameraParameters::KEY_FOCUS_AREAS);
 
+            break;
+
+        case 'y':
+
+            params.set(CameraParameters::KEY_METERING_AREAS, TEST_METERING_AREA);
+
+            if ( hardwareActive ) {
+                camera->setParameters(params.flatten());
+            }
+
+            params.remove(CameraParameters::KEY_METERING_AREAS);
+
+            break;
+
         case 'f':
 
             gettimeofday(&autofocus_start, 0);
diff --git a/test/CameraHal/camera_test_script.cpp b/test/CameraHal/camera_test_script.cpp
index f1cce57..38566ee 100644
--- a/test/CameraHal/camera_test_script.cpp
+++ b/test/CameraHal/camera_test_script.cpp
@@ -884,6 +884,20 @@ int execute_functional_script(char *script) {
 
                 params.remove(CameraParameters::KEY_FOCUS_AREAS);
 
+                break;
+
+            case 'y':
+
+                params.set(CameraParameters::KEY_METERING_AREAS, (cmd + 1));
+
+                if ( hardwareActive ) {
+                    camera->setParameters(params.flatten());
+                }
+
+                params.remove(CameraParameters::KEY_METERING_AREAS);
+
+                break;
+
             case 'f':
                 gettimeofday(&autofocus_start, 0);