From 04192d2ae5eb55dfe5395683b562e034cfef8966 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Fri, 30 Aug 2019 14:31:02 +0200 Subject: [PATCH] Rename mapper methods --- .../cameraview/CameraOptions1Test.java | 3 +- .../cameraview/engine/Camera1MapperTest.java | 33 +++++++++---------- .../otaliastudios/cameraview/CameraUtils.java | 3 +- .../cameraview/engine/Camera1Engine.java | 9 +++-- .../cameraview/engine/Camera2Engine.java | 9 +++-- .../engine/mappers/Camera1Mapper.java | 8 ++--- .../engine/mappers/Camera2Mapper.java | 8 ++--- 7 files changed, 34 insertions(+), 39 deletions(-) diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraOptions1Test.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraOptions1Test.java index d78b2bcf..f6e303f0 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraOptions1Test.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraOptions1Test.java @@ -4,7 +4,6 @@ package com.otaliastudios.cameraview; import android.hardware.Camera; import com.otaliastudios.cameraview.controls.Audio; -import com.otaliastudios.cameraview.controls.Engine; import com.otaliastudios.cameraview.controls.Facing; import com.otaliastudios.cameraview.controls.Flash; import com.otaliastudios.cameraview.engine.mappers.Camera1Mapper; @@ -256,7 +255,7 @@ public class CameraOptions1Test extends BaseTest { Collection s = o.getSupportedControls(Facing.class); assertEquals(s.size(), supported.size()); for (Facing facing : s) { - assertTrue(supported.contains(m.map(facing))); + assertTrue(supported.contains(m.mapFacing(facing))); assertTrue(o.supports(facing)); } } diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/Camera1MapperTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/Camera1MapperTest.java index 47b8f019..54cf2e57 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/Camera1MapperTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/Camera1MapperTest.java @@ -4,7 +4,6 @@ package com.otaliastudios.cameraview.engine; import android.hardware.Camera; import com.otaliastudios.cameraview.BaseTest; -import com.otaliastudios.cameraview.controls.Engine; import com.otaliastudios.cameraview.controls.Facing; import com.otaliastudios.cameraview.controls.Flash; import com.otaliastudios.cameraview.controls.Hdr; @@ -28,22 +27,22 @@ public class Camera1MapperTest extends BaseTest { @Test public void testMap() { - assertEquals(mapper.map(Flash.OFF), Camera.Parameters.FLASH_MODE_OFF); - assertEquals(mapper.map(Flash.ON), Camera.Parameters.FLASH_MODE_ON); - assertEquals(mapper.map(Flash.AUTO), Camera.Parameters.FLASH_MODE_AUTO); - assertEquals(mapper.map(Flash.TORCH), Camera.Parameters.FLASH_MODE_TORCH); - - assertEquals(mapper.map(Facing.BACK), Camera.CameraInfo.CAMERA_FACING_BACK); - assertEquals(mapper.map(Facing.FRONT), Camera.CameraInfo.CAMERA_FACING_FRONT); - - assertEquals(mapper.map(Hdr.OFF), Camera.Parameters.SCENE_MODE_AUTO); - assertEquals(mapper.map(Hdr.ON), Camera.Parameters.SCENE_MODE_HDR); - - assertEquals(mapper.map(WhiteBalance.AUTO), Camera.Parameters.WHITE_BALANCE_AUTO); - assertEquals(mapper.map(WhiteBalance.DAYLIGHT), Camera.Parameters.WHITE_BALANCE_DAYLIGHT); - assertEquals(mapper.map(WhiteBalance.CLOUDY), Camera.Parameters.WHITE_BALANCE_CLOUDY_DAYLIGHT); - assertEquals(mapper.map(WhiteBalance.INCANDESCENT), Camera.Parameters.WHITE_BALANCE_INCANDESCENT); - assertEquals(mapper.map(WhiteBalance.FLUORESCENT), Camera.Parameters.WHITE_BALANCE_FLUORESCENT); + assertEquals(mapper.mapFlash(Flash.OFF), Camera.Parameters.FLASH_MODE_OFF); + assertEquals(mapper.mapFlash(Flash.ON), Camera.Parameters.FLASH_MODE_ON); + assertEquals(mapper.mapFlash(Flash.AUTO), Camera.Parameters.FLASH_MODE_AUTO); + assertEquals(mapper.mapFlash(Flash.TORCH), Camera.Parameters.FLASH_MODE_TORCH); + + assertEquals(mapper.mapFacing(Facing.BACK), Camera.CameraInfo.CAMERA_FACING_BACK); + assertEquals(mapper.mapFacing(Facing.FRONT), Camera.CameraInfo.CAMERA_FACING_FRONT); + + assertEquals(mapper.mapHdr(Hdr.OFF), Camera.Parameters.SCENE_MODE_AUTO); + assertEquals(mapper.mapHdr(Hdr.ON), Camera.Parameters.SCENE_MODE_HDR); + + assertEquals(mapper.mapWhiteBalance(WhiteBalance.AUTO), Camera.Parameters.WHITE_BALANCE_AUTO); + assertEquals(mapper.mapWhiteBalance(WhiteBalance.DAYLIGHT), Camera.Parameters.WHITE_BALANCE_DAYLIGHT); + assertEquals(mapper.mapWhiteBalance(WhiteBalance.CLOUDY), Camera.Parameters.WHITE_BALANCE_CLOUDY_DAYLIGHT); + assertEquals(mapper.mapWhiteBalance(WhiteBalance.INCANDESCENT), Camera.Parameters.WHITE_BALANCE_INCANDESCENT); + assertEquals(mapper.mapWhiteBalance(WhiteBalance.FLUORESCENT), Camera.Parameters.WHITE_BALANCE_FLUORESCENT); } diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraUtils.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraUtils.java index 6517ef75..246a6db5 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraUtils.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraUtils.java @@ -9,7 +9,6 @@ import android.graphics.Matrix; import android.hardware.Camera; import android.os.Handler; -import com.otaliastudios.cameraview.controls.Engine; import com.otaliastudios.cameraview.controls.Facing; import com.otaliastudios.cameraview.engine.mappers.Camera1Mapper; import com.otaliastudios.cameraview.internal.utils.ExifHelper; @@ -61,7 +60,7 @@ public class CameraUtils { */ public static boolean hasCameraFacing(@SuppressWarnings("unused") @NonNull Context context, @NonNull Facing facing) { - int internal = Camera1Mapper.get().map(facing); + int internal = Camera1Mapper.get().mapFacing(facing); Camera.CameraInfo cameraInfo = new Camera.CameraInfo(); for (int i = 0, count = Camera.getNumberOfCameras(); i < count; i++) { Camera.getCameraInfo(i, cameraInfo); diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera1Engine.java b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera1Engine.java index bae9f2ab..7a181fd2 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera1Engine.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera1Engine.java @@ -21,7 +21,6 @@ import com.google.android.gms.tasks.Tasks; import com.otaliastudios.cameraview.CameraException; import com.otaliastudios.cameraview.CameraLogger; import com.otaliastudios.cameraview.CameraOptions; -import com.otaliastudios.cameraview.controls.Engine; import com.otaliastudios.cameraview.engine.mappers.Camera1Mapper; import com.otaliastudios.cameraview.engine.offset.Axis; import com.otaliastudios.cameraview.engine.offset.Reference; @@ -118,7 +117,7 @@ public class Camera1Engine extends CameraEngine implements @Override protected boolean collectCameraInfo(@NonNull Facing facing) { - int internalFacing = mMapper.map(facing); + int internalFacing = mMapper.mapFacing(facing); LOG.i("collectCameraInfo", "Facing:", facing, "Internal:", internalFacing, "Cameras:", Camera.getNumberOfCameras()); Camera.CameraInfo cameraInfo = new Camera.CameraInfo(); for (int i = 0, count = Camera.getNumberOfCameras(); i < count; i++) { @@ -444,7 +443,7 @@ public class Camera1Engine extends CameraEngine implements private boolean applyFlash(@NonNull Camera.Parameters params, @NonNull Flash oldFlash) { if (mCameraOptions.supports(mFlash)) { - params.setFlashMode(mMapper.map(mFlash)); + params.setFlashMode(mMapper.mapFlash(mFlash)); return true; } mFlash = oldFlash; @@ -497,7 +496,7 @@ public class Camera1Engine extends CameraEngine implements private boolean applyWhiteBalance(@NonNull Camera.Parameters params, @NonNull WhiteBalance oldWhiteBalance) { if (mCameraOptions.supports(mWhiteBalance)) { - params.setWhiteBalance(mMapper.map(mWhiteBalance)); + params.setWhiteBalance(mMapper.mapWhiteBalance(mWhiteBalance)); return true; } mWhiteBalance = oldWhiteBalance; @@ -522,7 +521,7 @@ public class Camera1Engine extends CameraEngine implements private boolean applyHdr(@NonNull Camera.Parameters params, @NonNull Hdr oldHdr) { if (mCameraOptions.supports(mHdr)) { - params.setSceneMode(mMapper.map(mHdr)); + params.setSceneMode(mMapper.mapHdr(mHdr)); return true; } mHdr = oldHdr; 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 0b0aa33d..08833e1a 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java @@ -61,7 +61,6 @@ import com.otaliastudios.cameraview.video.Full2VideoRecorder; import com.otaliastudios.cameraview.video.SnapshotVideoRecorder; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; @@ -290,7 +289,7 @@ public class Camera2Engine extends CameraEngine implements ImageReader.OnImageAv @Override protected boolean collectCameraInfo(@NonNull Facing facing) { - int internalFacing = mMapper.map(facing); + int internalFacing = mMapper.mapFacing(facing); String[] cameraIds = null; try { cameraIds = mManager.getCameraIdList(); @@ -878,7 +877,7 @@ public class Camera2Engine extends CameraEngine implements ImageReader.OnImageAv List availableAeModes = new ArrayList<>(); for (int mode : availableAeModesArray) { availableAeModes.add(mode); } - List> pairs = mMapper.map(mFlash); + List> pairs = mMapper.mapFlash(mFlash); for (Pair pair : pairs) { if (availableAeModes.contains(pair.first)) { LOG.i("applyFlash: setting CONTROL_AE_MODE to", pair.first); @@ -944,7 +943,7 @@ public class Camera2Engine extends CameraEngine implements ImageReader.OnImageAv private boolean applyWhiteBalance(@NonNull CaptureRequest.Builder builder, @NonNull WhiteBalance oldWhiteBalance) { if (mCameraOptions.supports(mWhiteBalance)) { - int whiteBalance = mMapper.map(mWhiteBalance); + int whiteBalance = mMapper.mapWhiteBalance(mWhiteBalance); builder.set(CaptureRequest.CONTROL_AWB_MODE, whiteBalance); return true; } @@ -972,7 +971,7 @@ public class Camera2Engine extends CameraEngine implements ImageReader.OnImageAv private boolean applyHdr(@NonNull CaptureRequest.Builder builder, @NonNull Hdr oldHdr) { if (mCameraOptions.supports(mHdr)) { - int hdr = mMapper.map(mHdr); + int hdr = mMapper.mapHdr(mHdr); builder.set(CaptureRequest.CONTROL_SCENE_MODE, hdr); return true; } diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/mappers/Camera1Mapper.java b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/mappers/Camera1Mapper.java index 125763f9..95f288b4 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/mappers/Camera1Mapper.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/mappers/Camera1Mapper.java @@ -58,24 +58,24 @@ public class Camera1Mapper { private Camera1Mapper() {} @NonNull - public String map(@NonNull Flash flash) { + public String mapFlash(@NonNull Flash flash) { //noinspection ConstantConditions return FLASH.get(flash); } - public int map(@NonNull Facing facing) { + public int mapFacing(@NonNull Facing facing) { //noinspection ConstantConditions return FACING.get(facing); } @NonNull - public String map(@NonNull WhiteBalance whiteBalance) { + public String mapWhiteBalance(@NonNull WhiteBalance whiteBalance) { //noinspection ConstantConditions return WB.get(whiteBalance); } @NonNull - public String map(@NonNull Hdr hdr) { + public String mapHdr(@NonNull Hdr hdr) { //noinspection ConstantConditions return HDR.get(hdr); } diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/mappers/Camera2Mapper.java b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/mappers/Camera2Mapper.java index 7e1ee4fb..0fc919f1 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/mappers/Camera2Mapper.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/mappers/Camera2Mapper.java @@ -59,7 +59,7 @@ public class Camera2Mapper { private Camera2Mapper() {} @NonNull - public List> map(@NonNull Flash flash) { + public List> mapFlash(@NonNull Flash flash) { List> result = new ArrayList<>(); switch (flash) { case ON: { @@ -101,17 +101,17 @@ public class Camera2Mapper { return result; } - public int map(@NonNull Facing facing) { + public int mapFacing(@NonNull Facing facing) { //noinspection ConstantConditions return FACING.get(facing); } - public int map(@NonNull WhiteBalance whiteBalance) { + public int mapWhiteBalance(@NonNull WhiteBalance whiteBalance) { //noinspection ConstantConditions return WB.get(whiteBalance); } - public int map(@NonNull Hdr hdr) { + public int mapHdr(@NonNull Hdr hdr) { //noinspection ConstantConditions return HDR.get(hdr); }