From 77ed7785647b6609eb7cd48cf94e3180bf5e7c52 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Sun, 24 Feb 2019 16:40:30 +0100 Subject: [PATCH] Rename getSurfaceSize to getPreviewSurfaceSize --- .../src/main/java/com/otaliastudios/cameraview/Camera1.java | 4 ++-- .../java/com/otaliastudios/cameraview/CameraController.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java b/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java index 8e6c62d5..76c09970 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java @@ -72,7 +72,7 @@ class Camera1 extends CameraController implements Camera.PreviewCallback, Camera */ @Override public void onSurfaceAvailable() { - LOG.i("onSurfaceAvailable:", "Size is", getSurfaceSize(REF_VIEW)); + LOG.i("onSurfaceAvailable:", "Size is", getPreviewSurfaceSize(REF_VIEW)); schedule(null, false, new Runnable() { @Override public void run() { @@ -90,7 +90,7 @@ class Camera1 extends CameraController implements Camera.PreviewCallback, Camera */ @Override public void onSurfaceChanged() { - LOG.i("onSurfaceChanged, size is", getSurfaceSize(REF_VIEW)); + LOG.i("onSurfaceChanged, size is", getPreviewSurfaceSize(REF_VIEW)); schedule(null, true, new Runnable() { @Override public void run() { diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java index 752b037c..bf48253c 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java @@ -511,8 +511,9 @@ abstract class CameraController implements return flip(REF_SENSOR, reference) ? mPreviewStreamSize.flip() : mPreviewStreamSize; } + @SuppressWarnings("SameParameterValue") @Nullable - final Size getSurfaceSize(int reference) { + final Size getPreviewSurfaceSize(int reference) { if (mPreview == null) return null; return flip(REF_VIEW, reference) ? mPreview.getSurfaceSize().flip() : mPreview.getSurfaceSize(); } @@ -570,7 +571,7 @@ abstract class CameraController implements // Create our own default selector, which will be used if the external mPreviewStreamSizeSelector // is null, or if it fails in finding a size. - Size targetMinSize = getSurfaceSize(REF_VIEW); + Size targetMinSize = getPreviewSurfaceSize(REF_VIEW); AspectRatio targetRatio = AspectRatio.of(mCaptureSize.getWidth(), mCaptureSize.getHeight()); if (flip) targetRatio = targetRatio.inverse(); LOG.i("size:", "computePreviewStreamSize:", "targetRatio:", targetRatio, "targetMinSize:", targetMinSize);