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

Commit 847c4d49 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:... 

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

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

Change-Id: Ifa7f2c0a8424853b724173827b1221bb34686756
parents 1ca115c4 f3975879

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;

        }