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

Commit 9b85471c authored by Zhijun He's avatar Zhijun He Committed by android-build-merger
Browse files

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

am: 71e07faa

Change-Id: I5fad04f7a8e3f2f2ba19204e19d41e256b6a1a6e
parents e346c604 71e07faa

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

+4 −0
Original line number Diff line number Diff line
@@ -96,6 +96,9 @@ public class CameraConstrainedHighSpeedCaptureSessionImpl 
        CaptureRequest.Builder singleTargetRequestBuilder = new CaptureRequest.Builder(

                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.

        Iterator<Surface> iterator = outputSurfaces.iterator();

        Surface firstSurface = iterator.next();
@@ -118,6 +121,7 @@ public class CameraConstrainedHighSpeedCaptureSessionImpl 
            requestMetadata = new CameraMetadataNative(request.getNativeCopy());

            doubleTargetRequestBuilder = new CaptureRequest.Builder(

                    requestMetadata, /*reprocess*/false, CameraCaptureSession.SESSION_ID_NONE);

            doubleTargetRequestBuilder.setTag(request.getTag());

            doubleTargetRequestBuilder.set(CaptureRequest.CONTROL_CAPTURE_INTENT,

                    CaptureRequest.CONTROL_CAPTURE_INTENT_VIDEO_RECORD);

            doubleTargetRequestBuilder.addTarget(firstSurface);