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

Merge "Merge "Camera: Allow reprocessing session to configure physical streams" into rvc-dev am: 861a8178f9" into rvc-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2020-06-19 20:47:17 +00:00
committed by Android (Google) Code Review
parent 0230b93d42 7841de0683
commit 76bd691f34
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1154,7 +1154,6 @@ public class CameraDeviceImpl extends CameraDevice
checkIfCameraClosedOrInError(); checkIfCameraClosedOrInError();
// Make sure that there all requests have at least 1 surface; all surfaces are non-null; // Make sure that there all requests have at least 1 surface; all surfaces are non-null;
// the surface isn't a physical stream surface for reprocessing request
for (CaptureRequest request : requestList) { for (CaptureRequest request : requestList) {
if (request.getTargets().isEmpty()) { if (request.getTargets().isEmpty()) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
@@ -1165,17 +1164,6 @@ public class CameraDeviceImpl extends CameraDevice
if (surface == null) { if (surface == null) {
throw new IllegalArgumentException("Null Surface targets are not allowed"); throw new IllegalArgumentException("Null Surface targets are not allowed");
} }
for (int i = 0; i < mConfiguredOutputs.size(); i++) {
OutputConfiguration configuration = mConfiguredOutputs.valueAt(i);
if (configuration.isForPhysicalCamera()
&& configuration.getSurfaces().contains(surface)) {
if (request.isReprocess()) {
throw new IllegalArgumentException(
"Reprocess request on physical stream is not allowed");
}
}
}
} }
} }