Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit ad54915

Browse files
committed
Formatted files
1 parent bd7b667 commit ad54915

File tree

1 file changed

+40
-47
lines changed
  • packages/camera/camera/android/src/main/java/io/flutter/plugins/camera

1 file changed

+40
-47
lines changed

packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/Camera.java

Lines changed: 40 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ public void onOrientationChanged(int i) {
136136
initFps(cameraCharacteristics);
137137
sensorOrientation = cameraCharacteristics.get(CameraCharacteristics.SENSOR_ORIENTATION);
138138
isFrontFacing =
139-
cameraCharacteristics.get(CameraCharacteristics.LENS_FACING) == CameraMetadata.LENS_FACING_FRONT;
139+
cameraCharacteristics.get(CameraCharacteristics.LENS_FACING)
140+
== CameraMetadata.LENS_FACING_FRONT;
140141
ResolutionPreset preset = ResolutionPreset.valueOf(resolutionPreset);
141142
recordingProfile =
142143
CameraUtils.getBestAvailableCamcorderProfileForResolutionPreset(cameraName, preset);
@@ -148,10 +149,11 @@ public void onOrientationChanged(int i) {
148149
cameraCharacteristics.get(CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM));
149150
}
150151

151-
private void initFps(CameraCharacteristics cameraCharacteristics){
152+
private void initFps(CameraCharacteristics cameraCharacteristics) {
152153
try {
153-
Range<Integer>[] ranges = cameraCharacteristics.get(CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES);
154-
if(ranges != null) {
154+
Range<Integer>[] ranges =
155+
cameraCharacteristics.get(CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES);
156+
if (ranges != null) {
155157
for (Range<Integer> range : ranges) {
156158
int upper = range.getUpper();
157159
Log.i("Camera", "[FPS Range Available] is:" + range);
@@ -285,21 +287,19 @@ private void createCaptureSession(
285287
new CameraCaptureSession.StateCallback() {
286288
@Override
287289
public void onConfigured(@NonNull CameraCaptureSession session) {
288-
if (cameraDevice == null) {
289-
dartMessenger.sendCameraErrorEvent("The camera was closed during configuration.");
290-
return;
291-
}
292-
cameraCaptureSession = session;
290+
if (cameraDevice == null) {
291+
dartMessenger.sendCameraErrorEvent("The camera was closed during configuration.");
292+
return;
293+
}
294+
cameraCaptureSession = session;
293295

294-
updateFpsRange();
295-
updateAutoFocus();
296-
updateFlash(flashMode);
297-
updateExposure(exposureMode);
296+
updateFpsRange();
297+
updateAutoFocus();
298+
updateFlash(flashMode);
299+
updateExposure(exposureMode);
298300

299-
refreshPreviewCaptureSession(
300-
onSuccessCallback,
301-
(code, message) ->dartMessenger.sendCameraErrorEvent(message)
302-
);
301+
refreshPreviewCaptureSession(
302+
onSuccessCallback, (code, message) -> dartMessenger.sendCameraErrorEvent(message));
303303
}
304304

305305
@Override
@@ -347,9 +347,7 @@ private void createCaptureSession(
347347
}
348348

349349
private void refreshPreviewCaptureSession(
350-
@Nullable Runnable onSuccessCallback,
351-
@NonNull ErrorCallback onErrorCallback
352-
) {
350+
@Nullable Runnable onSuccessCallback, @NonNull ErrorCallback onErrorCallback) {
353351
if (cameraCaptureSession == null) {
354352
return;
355353
}
@@ -509,11 +507,11 @@ private void runPicturePreCapture() {
509507
CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER_START);
510508

511509
refreshPreviewCaptureSession(
512-
() -> captureRequestBuilder.set(
513-
CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER,
514-
CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER_IDLE),
515-
(code, message) -> pictureCaptureRequest.error(code, message, null)
516-
);
510+
() ->
511+
captureRequestBuilder.set(
512+
CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER,
513+
CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER_IDLE),
514+
(code, message) -> pictureCaptureRequest.error(code, message, null));
517515
}
518516

519517
private void runPictureCapture() {
@@ -562,9 +560,7 @@ private void lockAutoFocus() {
562560
CaptureRequest.CONTROL_AF_TRIGGER, CaptureRequest.CONTROL_AF_TRIGGER_START);
563561

564562
refreshPreviewCaptureSession(
565-
null,
566-
(code, message) ->pictureCaptureRequest.error(code, message, null)
567-
);
563+
null, (code, message) -> pictureCaptureRequest.error(code, message, null));
568564
}
569565

570566
private void unlockAutoFocus() {
@@ -709,9 +705,10 @@ public void onCaptureCompleted(
709705
refreshPreviewCaptureSession(
710706
() -> {
711707
result.success(null);
712-
isFinished = true; },
713-
(code, message) -> result.error("setFlashModeFailed", "Could not set flash mode.", null)
714-
);
708+
isFinished = true;
709+
},
710+
(code, message) ->
711+
result.error("setFlashModeFailed", "Could not set flash mode.", null));
715712
}
716713

717714
@Override
@@ -732,9 +729,8 @@ public void onCaptureFailed(
732729
updateFlash(mode);
733730

734731
refreshPreviewCaptureSession(
735-
() -> result.success(null) ,
736-
(code, message) -> result.error("setFlashModeFailed", "Could not set flash mode.", null)
737-
);
732+
() -> result.success(null),
733+
(code, message) -> result.error("setFlashModeFailed", "Could not set flash mode.", null));
738734
}
739735
}
740736

@@ -769,9 +765,7 @@ public void setExposurePoint(@NonNull final Result result, Double x, Double y)
769765
// Apply it
770766
updateExposure(exposureMode);
771767
refreshPreviewCaptureSession(
772-
() -> result.success(null),
773-
(code, message) -> result.error("CameraAccess", message, null)
774-
);
768+
() -> result.success(null), (code, message) -> result.error("CameraAccess", message, null));
775769
}
776770

777771
@TargetApi(VERSION_CODES.P)
@@ -905,21 +899,20 @@ private void updateFpsRange() {
905899

906900
private void updateAutoFocus() {
907901
if (useAutoFocus) {
908-
int[] modes = cameraCharacteristics.get(
909-
CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES);
902+
int[] modes = cameraCharacteristics.get(CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES);
910903
// Auto focus is not supported
911-
if (modes == null || modes.length == 0 ||
912-
(modes.length == 1 && modes[0] == CameraCharacteristics.CONTROL_AF_MODE_OFF)) {
904+
if (modes == null
905+
|| modes.length == 0
906+
|| (modes.length == 1 && modes[0] == CameraCharacteristics.CONTROL_AF_MODE_OFF)) {
913907
useAutoFocus = false;
914-
captureRequestBuilder.set(CaptureRequest.CONTROL_AF_MODE,
915-
CaptureRequest.CONTROL_AF_MODE_OFF);
908+
captureRequestBuilder.set(
909+
CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_OFF);
916910
} else {
917-
captureRequestBuilder.set(CaptureRequest.CONTROL_AF_MODE,
918-
CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
911+
captureRequestBuilder.set(
912+
CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
919913
}
920914
} else {
921-
captureRequestBuilder.set(CaptureRequest.CONTROL_AF_MODE,
922-
CaptureRequest.CONTROL_AF_MODE_OFF);
915+
captureRequestBuilder.set(CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_OFF);
923916
}
924917
}
925918

0 commit comments

Comments
 (0)