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

Commit 991b7b67 authored by Shuzhen Wang's avatar Shuzhen Wang
Browse files

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
parent 752adf7f

services/camera/libcameraservice/api2/HeicCompositeStream.cpp

+3 −1
Original line number Diff line number Diff line
@@ -620,7 +620,8 @@ void HeicCompositeStream::compilePendingInputLocked() { 
        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 @@ void HeicCompositeStream::compilePendingInputLocked() { 
            ALOGE("%s: mPendingInputFrames doesn't contain frameNumber %" PRId64, __FUNCTION__,

                    mMainImageFrameNumbers.front());

            mInputYuvBuffers.erase(it);

            mMainImageFrameNumbers.pop();

            continue;

        }