commit e3299fb67da45e966e0c17d680b3b92f233497a3
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 18 18:38:20 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 18 18:38:20 2020 +0000
tree 6215e8855828b8f4569ff0a4e6ac84a660528d6d
parent dac1d1dc3fd542c5b1555253a51eb08ea25eaa10
parent f3975879f82e83779777e98fe0f8d0a696a93fc3

Merge "Camera: Fix a wrong erase call for app segment buffer" into rvc-dev am: 453044a3a0 am: f3975879f8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11913452

Change-Id: If3e2080b9ce411ffa41478576a03c046f116aa64

services/camera/libcameraservice/api2/HeicCompositeStream.cpp

diff --git a/services/camera/libcameraservice/api2/HeicCompositeStream.cpp b/services/camera/libcameraservice/api2/HeicCompositeStream.cpp
index 1a0881f..a63f402 100644
--- a/services/camera/libcameraservice/api2/HeicCompositeStream.cpp
+++ b/services/camera/libcameraservice/api2/HeicCompositeStream.cpp
@@ -620,7 +620,8 @@
         if (mPendingInputFrames.find(mAppSegmentFrameNumbers.front()) == mPendingInputFrames.end()) {
             ALOGE("%s: mPendingInputFrames doesn't contain frameNumber %" PRId64, __FUNCTION__,
                     mAppSegmentFrameNumbers.front());
-            mInputYuvBuffers.erase(it);
+            mInputAppSegmentBuffers.erase(it);
+            mAppSegmentFrameNumbers.pop();
             continue;
         }
 
@@ -664,6 +665,7 @@
             ALOGE("%s: mPendingInputFrames doesn't contain frameNumber %" PRId64, __FUNCTION__,
                     mMainImageFrameNumbers.front());
             mInputYuvBuffers.erase(it);
+            mMainImageFrameNumbers.pop();
             continue;
         }