Merge "CameraService: fix waitUntilIdle bug revealed by TestingCamera2." (e7ec24c9) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -497,6 +497,7 @@ status_t CameraDeviceClient::flush(int64_t* lastFrameNumber) {

		if (!mDevice.get()) return DEAD_OBJECT;

		mStreamingRequestList.clear();
		return mDevice->flush(lastFrameNumber);
		}

+6 −4

Original line number	Diff line number	Diff line
		@@ -1751,13 +1751,14 @@ void Camera3Device::processCaptureResult(const camera3_capture_result *result) {

		gotResult = true;

		if (frameNumber != mNextResultFrameNumber) {
		// TODO: need to track errors for tighter bounds on expected frame number
		if (frameNumber < mNextResultFrameNumber) {
		SET_ERR("Out-of-order capture result metadata submitted! "
		"(got frame number %d, expecting %d)",
		frameNumber, mNextResultFrameNumber);
		return;
		}
		mNextResultFrameNumber++;
		mNextResultFrameNumber = frameNumber + 1;

		CaptureResult captureResult;
		captureResult.mResultExtras = resultExtras;
		@@ -1891,13 +1892,14 @@ void Camera3Device::notify(const camera3_notify_msg *msg) {
		// Verify ordering of shutter notifications
		{
		Mutex::Autolock l(mOutputLock);
		if (frameNumber != mNextShutterFrameNumber) {
		// TODO: need to track errors for tighter bounds on expected frame number.
		if (frameNumber < mNextShutterFrameNumber) {
		SET_ERR("Shutter notification out-of-order. Expected "
		"notification for frame %d, got frame %d",
		mNextShutterFrameNumber, frameNumber);
		break;
		}
		mNextShutterFrameNumber++;
		mNextShutterFrameNumber = frameNumber + 1;
		}

		CaptureResultExtras resultExtras;