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

Commit 7162e78b authored by Emilian Peev's avatar Emilian Peev
Browse files

Camera: Allow error frame number gaps 

The frame number tracker for a specific request type
expects frame errors to come in for the very next
completed frame number. If we have a gap due to still
capture burst and the very next regular capture buffer
fails, then the corresponding request type completion
will not be marked and the requests will timeout draining.

Bug: 308914917
Test: Camera CTS
Change-Id: Iff3a65a6054acee44896c7f723ae559a46295732
parent 303e2ced

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

+16 −0
Original line number Diff line number Diff line
@@ -90,6 +90,22 @@ public class FrameNumberTracker { 
                        break;

                    }

                }



                if (!removeError) {

                    // Check for the case where we might have an error after a frame number gap

                    // caused by other types of capture requests

                    int otherType1 = (requestType + 1) % CaptureRequest.REQUEST_TYPE_COUNT;

                    int otherType2 = (requestType + 2) % CaptureRequest.REQUEST_TYPE_COUNT;

                    if (mPendingFrameNumbersWithOtherType[otherType1].isEmpty() &&

                            mPendingFrameNumbersWithOtherType[otherType2].isEmpty()) {

                        long errorGapNumber = Math.max(mCompletedFrameNumber[otherType1],

                                mCompletedFrameNumber[otherType2]) + 1;

                        if ((errorGapNumber > mCompletedFrameNumber[requestType] + 1) &&

                                (errorGapNumber == errorFrameNumber)) {

                            removeError = true;

                        }

                    }

                }

            }

            if (removeError) {

                mCompletedFrameNumber[requestType] = errorFrameNumber;