Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a12b3af0 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by android-build-merger
Browse files

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

am: 62e310cb

Change-Id: If86e613dafb3ac8268f543d64b424c0ffecd1521
parents 20b08dec 62e310cb

camera/device/3.2/default/CameraDeviceSession.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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();