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

Commit b8641fe0 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Automerger Merge Worker
Browse files

Camera: HeicCompositeStream: Fix IDLE state transition am: f3ace5d8 

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



Change-Id: I255a3615a9654628f1a4dd6f88b7086996445ff9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 68179457 f3ace5d8

services/camera/libcameraservice/api2/HeicCompositeStream.cpp

+6 −2
Original line number Diff line number Diff line
@@ -1297,10 +1297,12 @@ void HeicCompositeStream::releaseInputFramesLocked() { 
        if (firstPendingFrame != mPendingInputFrames.end()) {

            updateCodecQualityLocked(firstPendingFrame->second.quality);

        } else {

            if (mSettingsByFrameNumber.size() == 0) {

                markTrackerIdle();

            }

        }

    }

}



status_t HeicCompositeStream::initializeCodec(uint32_t width, uint32_t height,

        const sp<CameraDeviceBase>& cameraDevice) {
@@ -1723,8 +1725,10 @@ bool HeicCompositeStream::threadLoop() { 
                    // removed, they are simply skipped.

                    mPendingInputFrames.erase(failingFrameNumber);

                    if (mPendingInputFrames.size() == 0) {

                        if (mSettingsByFrameNumber.size() == 0) {

                            markTrackerIdle();

                        }

                    }

                    return true;

                }