Merge "Camera: HeicCompositeStream: Fix IDLE state transition" into main (4fc998be) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/api2/HeicCompositeStream.cpp

+6 −2

Original line number	Diff line number	Diff line
		@@ -1311,10 +1311,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) {
		@@ -1737,8 +1739,10 @@ bool HeicCompositeStream::threadLoop() {
		// removed, they are simply skipped.
		mPendingInputFrames.erase(failingFrameNumber);
		if (mPendingInputFrames.size() == 0) {
		if (mSettingsByFrameNumber.size() == 0) {
		markTrackerIdle();
		}
		}
		return true;
		}