commit ab6412a6872a746f03c0ba54bdfddd3ee12dbf68
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 18 18:24:29 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 18 18:24:29 2020 +0000
tree 6215e8855828b8f4569ff0a4e6ac84a660528d6d
parent 0afcf70a62c6e4547abf41d861e7764a0300911b
parent 453044a3a0b190548ef15b27201444617bfec5d9

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

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

Change-Id: Idec427b7861b397706608e850122537abf297534

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;
         }