Merge "camera2: Remove partial result nodes for error frames." (bec0a901) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/impl/FrameNumberTracker.java

+16 −17

Original line number	Diff line number	Diff line
		@@ -70,30 +70,29 @@ public class FrameNumberTracker {
		int requestType = (int) pair.getValue();
		Boolean removeError = false;
		if (errorFrameNumber == mCompletedFrameNumber[requestType] + 1) {
		mCompletedFrameNumber[requestType] = errorFrameNumber;
		removeError = true;
		} else {
		}
		// The error frame number could have also either been in the pending list or one of the
		// 'other' pending lists.
		if (!mPendingFrameNumbers[requestType].isEmpty()) {
		if (errorFrameNumber == mPendingFrameNumbers[requestType].element()) {
		mCompletedFrameNumber[requestType] = errorFrameNumber;
		mPendingFrameNumbers[requestType].remove();
		removeError = true;
		}
		} else {
		for (int i = 1; i < CaptureRequest.REQUEST_TYPE_COUNT; i++) {
		int otherType = (requestType + i) % CaptureRequest.REQUEST_TYPE_COUNT;
		if (!mPendingFrameNumbersWithOtherType[otherType].isEmpty()
		&& errorFrameNumber
		if (!mPendingFrameNumbersWithOtherType[otherType].isEmpty() && errorFrameNumber
		== mPendingFrameNumbersWithOtherType[otherType].element()) {
		mCompletedFrameNumber[requestType] = errorFrameNumber;
		mPendingFrameNumbersWithOtherType[otherType].remove();
		removeError = true;
		break;
		}
		}
		}
		}
		if (removeError) {
		mCompletedFrameNumber[requestType] = errorFrameNumber;
		mPartialResults.remove(errorFrameNumber);
		iter.remove();
		}
		}