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

services/camera/libcameraservice/api2/HeicCompositeStream.cpp

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1311,10 +1311,12 @@ void HeicCompositeStream::releaseInputFramesLocked() {
	if (firstPendingFrame != mPendingInputFrames.end()) {		if (firstPendingFrame != mPendingInputFrames.end()) {
	updateCodecQualityLocked(firstPendingFrame->second.quality);		updateCodecQualityLocked(firstPendingFrame->second.quality);
	} else {		} else {
			if (mSettingsByFrameNumber.size() == 0) {
	markTrackerIdle();		markTrackerIdle();
	}		}
	}		}
	}		}
			}

	status_t HeicCompositeStream::initializeCodec(uint32_t width, uint32_t height,		status_t HeicCompositeStream::initializeCodec(uint32_t width, uint32_t height,
	const sp<CameraDeviceBase>& cameraDevice) {		const sp<CameraDeviceBase>& cameraDevice) {
	@@ -1737,8 +1739,10 @@ bool HeicCompositeStream::threadLoop() {
	// removed, they are simply skipped.		// removed, they are simply skipped.
	mPendingInputFrames.erase(failingFrameNumber);		mPendingInputFrames.erase(failingFrameNumber);
	if (mPendingInputFrames.size() == 0) {		if (mPendingInputFrames.size() == 0) {
			if (mSettingsByFrameNumber.size() == 0) {
	markTrackerIdle();		markTrackerIdle();
	}		}
			}
	return true;		return true;
	}		}