Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Camera: Try to recover from failing stopRepeating requests" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-11-24 00:40:57 +00:00
committed by Android (Google) Code Review
parent f730a2c592 caa1a65588
commit d0d3b02874
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/java/android/hardware/camera2/impl/CameraDeviceImpl.java
View File

@@ -110,6 +110,11 @@ public class CameraDeviceImpl extends CameraDevice
private int mRepeatingRequestId = REQUEST_ID_NONE; private int mRepeatingRequestId = REQUEST_ID_NONE;
// Latest repeating request list's types // Latest repeating request list's types
private int[] mRepeatingRequestTypes; private int[] mRepeatingRequestTypes;
// Cache failed requests to process later in case of a repeating error callback
private int mFailedRepeatingRequestId = REQUEST_ID_NONE;
private int[] mFailedRepeatingRequestTypes;
// Map stream IDs to input/output configurations // Map stream IDs to input/output configurations
private SimpleEntry<Integer, InputConfiguration> mConfiguredInput = private SimpleEntry<Integer, InputConfiguration> mConfiguredInput =
new SimpleEntry<>(REQUEST_ID_NONE, null); new SimpleEntry<>(REQUEST_ID_NONE, null);
@@ -1326,16 +1331,25 @@ public class CameraDeviceImpl extends CameraDevice
int requestId = mRepeatingRequestId; int requestId = mRepeatingRequestId;
mRepeatingRequestId = REQUEST_ID_NONE; mRepeatingRequestId = REQUEST_ID_NONE;
mFailedRepeatingRequestId = REQUEST_ID_NONE;
int[] requestTypes = mRepeatingRequestTypes; int[] requestTypes = mRepeatingRequestTypes;
mRepeatingRequestTypes = null; mRepeatingRequestTypes = null;
mFailedRepeatingRequestTypes = null;
long lastFrameNumber; long lastFrameNumber;
try { try {
lastFrameNumber = mRemoteDevice.cancelRequest(requestId); lastFrameNumber = mRemoteDevice.cancelRequest(requestId);
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
if (DEBUG) { if (DEBUG) {
Log.v(TAG, "Repeating request was already stopped for request " + requestId); Log.v(TAG, "Repeating request was already stopped for request " +
requestId);
} }
// Cache request id and request types in case of a race with
// "onRepeatingRequestError" which may no yet be scheduled on another thread
// or blocked by us.
mFailedRepeatingRequestId = requestId;
mFailedRepeatingRequestTypes = requestTypes;
// Repeating request was already stopped. Nothing more to do. // Repeating request was already stopped. Nothing more to do.
return; return;
} }
@@ -1965,7 +1979,17 @@ public class CameraDeviceImpl extends CameraDevice
synchronized(mInterfaceLock) { synchronized(mInterfaceLock) {
// Camera is already closed or no repeating request is present. // Camera is already closed or no repeating request is present.
if (mRemoteDevice == null || mRepeatingRequestId == REQUEST_ID_NONE) { if (mRemoteDevice == null || mRepeatingRequestId == REQUEST_ID_NONE) {
return; // Camera already closed if ((mFailedRepeatingRequestId == repeatingRequestId) &&
(mFailedRepeatingRequestTypes != null) && (mRemoteDevice != null)) {
Log.v(TAG, "Resuming stop of failed repeating request with id: " +
mFailedRepeatingRequestId);
checkEarlyTriggerSequenceCompleteLocked(mFailedRepeatingRequestId,
lastFrameNumber, mFailedRepeatingRequestTypes);
mFailedRepeatingRequestId = REQUEST_ID_NONE;
mFailedRepeatingRequestTypes = null;
}
return;
} }
// Redirect device callback to the offline session in case we are in the middle // Redirect device callback to the offline session in case we are in the middle