Skip to content

Commit

Permalink
Format
Browse files Browse the repository at this point in the history
  • Loading branch information
yaakovschectman committed Oct 15, 2024
1 parent 020afbc commit 4e93e15
Show file tree
Hide file tree
Showing 6 changed files with 575 additions and 382 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -867,9 +867,8 @@ public void pauseVideoRecording() {
if (SdkCapabilityChecker.supportsVideoPause()) {
mediaRecorder.pause();
} else {
throw
new Messages.FlutterError(
"videoRecordingFailed", "pauseVideoRecording requires Android API +24.", null);
throw new Messages.FlutterError(
"videoRecordingFailed", "pauseVideoRecording requires Android API +24.", null);
}
} catch (IllegalStateException e) {
throw new Messages.FlutterError("videoRecordingFailed", e.getMessage(), null);
Expand All @@ -885,9 +884,8 @@ public void resumeVideoRecording() {
if (SdkCapabilityChecker.supportsVideoPause()) {
mediaRecorder.resume();
} else {
throw
new Messages.FlutterError(
"videoRecordingFailed", "resumeVideoRecording requires Android API +24.", null);
throw new Messages.FlutterError(
"videoRecordingFailed", "resumeVideoRecording requires Android API +24.", null);
}
} catch (IllegalStateException e) {
throw new Messages.FlutterError("videoRecordingFailed", e.getMessage(), null);
Expand Down Expand Up @@ -1000,9 +998,8 @@ public void setFocusMode(@NonNull FocusMode newMode) {
captureSession.setRepeatingRequest(
previewRequestBuilder.build(), null, backgroundHandler);
} catch (CameraAccessException e) {
throw
new Messages.FlutterError(
"setFocusModeFailed", "Error setting focus mode: " + e.getMessage(), null);
throw new Messages.FlutterError(
"setFocusModeFailed", "Error setting focus mode: " + e.getMessage(), null);
}
break;
case auto:
Expand Down Expand Up @@ -1342,18 +1339,16 @@ public void uncaughtException(Thread thread, Throwable ex) {
public void setDescriptionWhileRecording(CameraProperties properties) {

if (!recordingVideo) {
throw
new Messages.FlutterError(
"setDescriptionWhileRecordingFailed", "Device was not recording", null);
throw new Messages.FlutterError(
"setDescriptionWhileRecordingFailed", "Device was not recording", null);
}

// See VideoRenderer.java; support for this EGL extension is required to switch camera while recording.
if (!SdkCapabilityChecker.supportsEglRecordableAndroid()) {
throw
new Messages.FlutterError(
"setDescriptionWhileRecordingFailed",
"Device does not support switching the camera while recording",
null);
throw new Messages.FlutterError(
"setDescriptionWhileRecordingFailed",
"Device does not support switching the camera while recording",
null);
}

stopAndReleaseCamera();
Expand All @@ -1371,8 +1366,7 @@ public void setDescriptionWhileRecording(CameraProperties properties) {
try {
open(imageFormatGroup);
} catch (CameraAccessException e) {
throw
new Messages.FlutterError("setDescriptionWhileRecordingFailed", e.getMessage(), null);
throw new Messages.FlutterError("setDescriptionWhileRecordingFailed", e.getMessage(), null);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,20 +154,18 @@ public void create(

@Override
public void initialize(
@NonNull Long cameraId,
@NonNull Messages.PlatformImageFormatGroup imageFormat) {
@NonNull Long cameraId, @NonNull Messages.PlatformImageFormatGroup imageFormat) {
if (camera != null) {
try {
camera.open(CameraUtils.imageFormatGroupFromPigeon(imageFormat));
} catch (CameraAccessException e) {
throw new Messages.FlutterError("CameraAccessException", e.getMessage(), null);
}
} else {
throw
new Messages.FlutterError(
"cameraNotFound",
"Camera not found. Please call the 'create' method before calling 'initialize'.",
null);
throw new Messages.FlutterError(
"cameraNotFound",
"Camera not found. Please call the 'create' method before calling 'initialize'.",
null);
}
}

Expand All @@ -177,8 +175,7 @@ public void takePicture(@NonNull Long cameraId, @NonNull Messages.Result<String>
}

@Override
public void startVideoRecording(
@NonNull Long cameraId, @NonNull Boolean enableStream) {
public void startVideoRecording(@NonNull Long cameraId, @NonNull Boolean enableStream) {
camera.startVideoRecording(Objects.equals(enableStream, true) ? imageStreamChannel : null);
}

Expand Down Expand Up @@ -257,23 +254,20 @@ public void setExposurePoint(

@NonNull
@Override
public Double getMinExposureOffset(
@NonNull Long cameraId) {
return camera.getMinExposureOffset();
public Double getMinExposureOffset(@NonNull Long cameraId) {
return camera.getMinExposureOffset();
}

@NonNull
@Override
public Double getMaxExposureOffset(
@NonNull Long cameraId) {
return camera.getMaxExposureOffset();
public Double getMaxExposureOffset(@NonNull Long cameraId) {
return camera.getMaxExposureOffset();
}

@NonNull
@Override
public Double getExposureOffsetStepSize(
@NonNull Long cameraId) {
return camera.getExposureOffsetStepSize();
public Double getExposureOffsetStepSize(@NonNull Long cameraId) {
return camera.getExposureOffsetStepSize();
}

@Override
Expand All @@ -288,16 +282,13 @@ public void setExposureOffset(
}

@Override
public void setFocusMode(
@NonNull Long cameraId,
@NonNull Messages.PlatformFocusMode focusMode) {
public void setFocusMode(@NonNull Long cameraId, @NonNull Messages.PlatformFocusMode focusMode) {
FocusMode mode = CameraUtils.focusModeFromPigeon(focusMode);
if (mode == null) {
throw
new Messages.FlutterError(
"setFocusModeFailed", "Unknown focus mode " + mode.name(), null);
throw new Messages.FlutterError(
"setFocusModeFailed", "Unknown focus mode " + mode.name(), null);
}
camera.setFocusMode(mode);
camera.setFocusMode(mode);
}

@Override
Expand Down Expand Up @@ -343,7 +334,7 @@ public Double getMaxZoomLevel(@NonNull Long cameraId) {

assert camera != null;

return (double) camera.getMaxZoomLevel();
return (double) camera.getMaxZoomLevel();
}

@NonNull
Expand All @@ -359,25 +350,23 @@ public void setZoomLevel(
@NonNull Long cameraId, @NonNull Double zoom, @NonNull Messages.VoidResult result) {

assert camera != null;
camera.setZoomLevel(result, zoom.floatValue());
camera.setZoomLevel(result, zoom.floatValue());
}

@Override
public void lockCaptureOrientation(
@NonNull Long cameraId,
@NonNull Messages.PlatformDeviceOrientation platformOrientation) {
@NonNull Long cameraId, @NonNull Messages.PlatformDeviceOrientation platformOrientation) {

PlatformChannel.DeviceOrientation orientation =
CameraUtils.orientationFromPigeon(platformOrientation);

camera.lockCaptureOrientation(orientation);
camera.lockCaptureOrientation(orientation);
}

@Override
public void unlockCaptureOrientation(
@NonNull Long cameraId) {
public void unlockCaptureOrientation(@NonNull Long cameraId) {

camera.unlockCaptureOrientation();
camera.unlockCaptureOrientation();
}

@Override
Expand All @@ -401,8 +390,7 @@ public void resumePreview(@NonNull Long cameraId) {
}

@Override
public void setDescriptionWhileRecording(
@NonNull String cameraName) {
public void setDescriptionWhileRecording(@NonNull String cameraName) {

try {
CameraProperties cameraProperties =
Expand Down
Loading

0 comments on commit 4e93e15

Please sign in to comment.