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

Commit 8dd105aa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: If2f5f06d1b11e5d078ed834c9b3a5c15ebef1b8a
parents fc16421a 453044a3

services/camera/libcameraservice/api2/HeicCompositeStream.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -620,7 +620,8 @@ void HeicCompositeStream::compilePendingInputLocked() { 
        if (mPendingInputFrames.find(mAppSegmentFrameNumbers.front()) == mPendingInputFrames.end()) {

        if (mPendingInputFrames.find(mAppSegmentFrameNumbers.front()) == mPendingInputFrames.end()) {

            ALOGE("%s: mPendingInputFrames doesn't contain frameNumber %" PRId64, __FUNCTION__,

            ALOGE("%s: mPendingInputFrames doesn't contain frameNumber %" PRId64, __FUNCTION__,

                    mAppSegmentFrameNumbers.front());

                    mAppSegmentFrameNumbers.front());

            mInputYuvBuffers.erase(it);

            mInputAppSegmentBuffers.erase(it);

            mAppSegmentFrameNumbers.pop();

            continue;

            continue;

        }

        }
@@ -664,6 +665,7 @@ void HeicCompositeStream::compilePendingInputLocked() { 
            ALOGE("%s: mPendingInputFrames doesn't contain frameNumber %" PRId64, __FUNCTION__,

            ALOGE("%s: mPendingInputFrames doesn't contain frameNumber %" PRId64, __FUNCTION__,

                    mMainImageFrameNumbers.front());

                    mMainImageFrameNumbers.front());

            mInputYuvBuffers.erase(it);

            mInputYuvBuffers.erase(it);

            mMainImageFrameNumbers.pop();

            continue;

            continue;

        }

        }