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

Merge "Camera2: copy user tag to HFR request list" into oc-dr1-dev

Browse Source 
am: a34c04d5c3

Change-Id: Ie7fbfc6948f19c36a487defffa4ca0a10e8eae66
This commit is contained in:
Zhijun He
2017-06-19 05:04:29 +00:00
committed by android-build-merger
parent 008bc4f265 a34c04d5c3
commit 71e07faafb
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/hardware/camera2/impl/CameraConstrainedHighSpeedCaptureSessionImpl.java
View File

@@ -96,6 +96,9 @@ public class CameraConstrainedHighSpeedCaptureSessionImpl
CaptureRequest.Builder singleTargetRequestBuilder = new CaptureRequest.Builder( CaptureRequest.Builder singleTargetRequestBuilder = new CaptureRequest.Builder(
requestMetadata, /*reprocess*/false, CameraCaptureSession.SESSION_ID_NONE); requestMetadata, /*reprocess*/false, CameraCaptureSession.SESSION_ID_NONE);
// Carry over userTag, as native metadata doesn't have this field.
singleTargetRequestBuilder.setTag(request.getTag());
// Overwrite the capture intent to make sure a good value is set. // Overwrite the capture intent to make sure a good value is set.
Iterator<Surface> iterator = outputSurfaces.iterator(); Iterator<Surface> iterator = outputSurfaces.iterator();
Surface firstSurface = iterator.next(); Surface firstSurface = iterator.next();
@@ -118,6 +121,7 @@ public class CameraConstrainedHighSpeedCaptureSessionImpl
requestMetadata = new CameraMetadataNative(request.getNativeCopy()); requestMetadata = new CameraMetadataNative(request.getNativeCopy());
doubleTargetRequestBuilder = new CaptureRequest.Builder( doubleTargetRequestBuilder = new CaptureRequest.Builder(
requestMetadata, /*reprocess*/false, CameraCaptureSession.SESSION_ID_NONE); requestMetadata, /*reprocess*/false, CameraCaptureSession.SESSION_ID_NONE);
doubleTargetRequestBuilder.setTag(request.getTag());
doubleTargetRequestBuilder.set(CaptureRequest.CONTROL_CAPTURE_INTENT, doubleTargetRequestBuilder.set(CaptureRequest.CONTROL_CAPTURE_INTENT,
CaptureRequest.CONTROL_CAPTURE_INTENT_VIDEO_RECORD); CaptureRequest.CONTROL_CAPTURE_INTENT_VIDEO_RECORD);
doubleTargetRequestBuilder.addTarget(firstSurface); doubleTargetRequestBuilder.addTarget(firstSurface);