diff options
| author | Shuzhen Wang <shuzhenwang@google.com> | 2018-06-05 22:23:39 -0700 |
|---|---|---|
| committer | Shuzhen Wang <shuzhenwang@google.com> | 2018-06-05 23:13:54 -0700 |
| commit | 9b71bc20c436eae3642ca0014d1381afaabe52d4 (patch) | |
| tree | bf7358049fba1ab81203996ac852e5d6210d2ff2 /camera/device/3.2/default/CameraDeviceSession.cpp | |
| parent | 3b50bd927b7c494d04657383d486aa0b862b3fe5 (diff) | |
Camera: Avoid Metadata re-allocation during shrinkCaptureResult
If capture result metadata is to be shrinked, reserve enough space so
that CameraMetadata isn't re-allocated when std::vector expands.
If vector expansion happens, CameraMetadata is re-allocated, causing
camera_metadata_t being re-allocated as well.
Test: Camera CTS
Bug: 109672123
Change-Id: Idaf5bf409bdbbccf617614edc96c0478260b4c30
Diffstat (limited to 'camera/device/3.2/default/CameraDeviceSession.cpp')
| -rw-r--r-- | camera/device/3.2/default/CameraDeviceSession.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/camera/device/3.2/default/CameraDeviceSession.cpp b/camera/device/3.2/default/CameraDeviceSession.cpp index 8d002646c0..69f853562c 100644 --- a/camera/device/3.2/default/CameraDeviceSession.cpp +++ b/camera/device/3.2/default/CameraDeviceSession.cpp @@ -1391,6 +1391,8 @@ void CameraDeviceSession::sShrinkCaptureResult( 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(); |