commit 991b7b672203d79b66ba7fcb672cb885d7947ae1
author Shuzhen Wang <shuzhenwang@google.com> Wed Jun 17 11:39:11 2020 -0700
committer Shuzhen Wang <shuzhenwang@google.com> Thu Jun 18 16:10:11 2020 +0000
tree 0cc5547b9ee22303c27a285d239648a8ff6b1d11
parent 752adf7f1a340cbb6599fcff1842cf3659c75612

Camera: Fix a wrong erase call for app segment buffer

Also make sure the pending frame number is also removed in the error
case.

Test: vendor testing
Bug: 159197773
Change-Id: I3f9ba90d0b9335e99283bbafbd635d3eaebf2275

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