commit a7a4f5bd8a3a1207c6972b3e114312b823bf2767
author Shuzhen Wang <shuzhenwang@google.com> Wed Jun 06 09:41:53 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jun 06 09:41:53 2018 -0700
tree 9911c19a7710a6c1e3f4d699bb2272087cfad697
parent 715a9092b04a7b3f954a10ba85057f9d378c7d89
parent 62e310cbfdd89d661b7d5550df29075e4eb911ad

Merge "Camera: Avoid Metadata re-allocation during shrinkCaptureResult" into pi-dev
am: 62e310cbfd

Change-Id: I3ef8040de1fbbf4239cb0e15e0a04f9fd0ec70b7

camera/device/3.2/default/CameraDeviceSession.cpp

diff --git a/camera/device/3.2/default/CameraDeviceSession.cpp b/camera/device/3.2/default/CameraDeviceSession.cpp
index 8d00264..69f8535 100644
--- a/camera/device/3.2/default/CameraDeviceSession.cpp
+++ b/camera/device/3.2/default/CameraDeviceSession.cpp
@@ -1391,6 +1391,8 @@
         std::vector<const camera_metadata_t*>* physCamMdArray,
         bool handlePhysCam) {
     *dst = *src;
+    // Reserve maximum number of entries to avoid metadata re-allocation.
+    mds->reserve(1 + (handlePhysCam ? src->num_physcam_metadata : 0));
     if (sShouldShrink(src->result)) {
         mds->emplace_back(sCreateCompactCopy(src->result));
         dst->result = mds->back().getAndLock();