commit 035219e1193029cb7ad1e104e02016eb73226a7c
author Changyeon Jo <changyeon@google.com> Tue Nov 26 18:25:04 2019 -0800
committer Changyeon Jo <changyeon@google.com> Sat Jan 04 09:12:49 2020 -0800
tree 008a2dc999635a13226a975759201652226282c7
parent b927b889e9523495c6532168a4850a8a1ef9d58f

Fix camera metadata usages in ConfigManager

This change fixes bugs in a logic that fills camera metadata fields and
adds a logic to clean them up properly.

Bug: 142275664
Test: VtsHalEvsV1_1TargetTest
Change-Id: I35dc8b8cfd945649df18d52ba26bf65b78d54bfd
Signed-off-by: Changyeon Jo <changyeon@google.com>

evs/sampleDriver/ConfigManager.cpp

diff --git a/evs/sampleDriver/ConfigManager.cpp b/evs/sampleDriver/ConfigManager.cpp
index d419cd9..48019db 100644
--- a/evs/sampleDriver/ConfigManager.cpp
+++ b/evs/sampleDriver/ConfigManager.cpp
@@ -251,8 +251,8 @@
     size_t numEntries = 0;
     camera_metadata_tag_t tag;
     while (curElem != nullptr) {
-        if (!ConfigManagerUtil::convertToMetadataTag(curElem->FindAttribute("name")->Value(),
-                                                     tag)) {
+        if (ConfigManagerUtil::convertToMetadataTag(curElem->FindAttribute("name")->Value(),
+                                                    tag)) {
             switch(tag) {
                 case ANDROID_LENS_DISTORTION:
                 case ANDROID_LENS_POSE_ROTATION:
@@ -282,7 +282,7 @@
                     camera_metadata_enum_android_request_available_capabilities_t *data =
                         new camera_metadata_enum_android_request_available_capabilities_t[1];
                     if (ConfigManagerUtil::convertToCameraCapability(
-                           curElem->FindAttribute("synchronized")->Value(),
+                           curElem->FindAttribute("value")->Value(),
                            *data)
                        ) {
                         aCamera->cameraMetadata.insert_or_assign(
@@ -315,7 +315,7 @@
                     }
 
                     aCamera->cameraMetadata.insert_or_assign(
-                        tag, make_pair((void *)data, len)
+                        tag, make_pair((void *)data, len + 1)
                     );
 
                     ++numEntries;
@@ -333,6 +333,8 @@
                           curElem->FindAttribute("name")->Value());
                     break;
             }
+        } else {
+            ALOGW("Unsupported metadata tag %s found", curElem->FindAttribute("name")->Value());
         }
 
         curElem = curElem->NextSiblingElement("parameter");
@@ -1033,3 +1035,36 @@
     }
 }
 
+ConfigManager::CameraInfo::~CameraInfo() {
+    free_camera_metadata(characteristics);
+
+    for (auto&& [tag, val] : cameraMetadata) {
+        switch(tag) {
+            case ANDROID_LENS_DISTORTION:
+            case ANDROID_LENS_POSE_ROTATION:
+            case ANDROID_LENS_POSE_TRANSLATION:
+            case ANDROID_LENS_INTRINSIC_CALIBRATION: {
+                delete[] reinterpret_cast<float *>(val.first);
+                break;
+            }
+
+            case ANDROID_REQUEST_AVAILABLE_CAPABILITIES: {
+                delete[] \
+                    reinterpret_cast<
+                        camera_metadata_enum_android_request_available_capabilities_t *
+                    >(val.first);
+                break;
+            }
+
+            case ANDROID_LOGICAL_MULTI_CAMERA_PHYSICAL_IDS: {
+                delete[] reinterpret_cast<char *>(val.first);
+                break;
+            }
+
+            default:
+                ALOGW("Tag 0x%X is not supported.  Data may be corrupted?", tag);
+                break;
+        }
+    }
+}
+