From c16fecbd2b6d27ede36b19ae160f78a3f0acf4c1 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Mon, 16 Dec 2019 13:26:55 +0100 Subject: [PATCH] Fix tests --- .../src/main/java/com/otaliastudios/cameraview/CameraView.java | 2 +- .../java/com/otaliastudios/cameraview/engine/Camera2Engine.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java index 77ac5e99..636bc98a 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java @@ -981,7 +981,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver { setSnapshotMaxHeight(oldEngine.getSnapshotMaxHeight()); setFrameProcessingMaxWidth(oldEngine.getFrameProcessingMaxWidth()); setFrameProcessingMaxHeight(oldEngine.getFrameProcessingMaxHeight()); - setFrameProcessingFormat(oldEngine.getFrameProcessingFormat()); + setFrameProcessingFormat(0 /* this is very engine specific, so do not pass */); } /** diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java index acb3320f..bf64da89 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java @@ -334,7 +334,7 @@ public class Camera2Engine extends CameraBaseEngine implements if (streamMap == null) { throw new RuntimeException("StreamConfigurationMap is null. Should not happen."); } - android.util.Size[] sizes = streamMap.getOutputSizes(getFrameProcessingFormat()); + android.util.Size[] sizes = streamMap.getOutputSizes(mFrameProcessingFormat); List candidates = new ArrayList<>(sizes.length); for (android.util.Size size : sizes) { Size add = new Size(size.getWidth(), size.getHeight());