Rename mapper methods

pull/574/head
Mattia Iavarone 6 years ago
parent 3849e549c4
commit 04192d2ae5
  1. 3
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraOptions1Test.java
  2. 33
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/engine/Camera1MapperTest.java
  3. 3
      cameraview/src/main/java/com/otaliastudios/cameraview/CameraUtils.java
  4. 9
      cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera1Engine.java
  5. 9
      cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java
  6. 8
      cameraview/src/main/java/com/otaliastudios/cameraview/engine/mappers/Camera1Mapper.java
  7. 8
      cameraview/src/main/java/com/otaliastudios/cameraview/engine/mappers/Camera2Mapper.java

@ -4,7 +4,6 @@ package com.otaliastudios.cameraview;
import android.hardware.Camera; import android.hardware.Camera;
import com.otaliastudios.cameraview.controls.Audio; import com.otaliastudios.cameraview.controls.Audio;
import com.otaliastudios.cameraview.controls.Engine;
import com.otaliastudios.cameraview.controls.Facing; import com.otaliastudios.cameraview.controls.Facing;
import com.otaliastudios.cameraview.controls.Flash; import com.otaliastudios.cameraview.controls.Flash;
import com.otaliastudios.cameraview.engine.mappers.Camera1Mapper; import com.otaliastudios.cameraview.engine.mappers.Camera1Mapper;
@ -256,7 +255,7 @@ public class CameraOptions1Test extends BaseTest {
Collection<Facing> s = o.getSupportedControls(Facing.class); Collection<Facing> s = o.getSupportedControls(Facing.class);
assertEquals(s.size(), supported.size()); assertEquals(s.size(), supported.size());
for (Facing facing : s) { for (Facing facing : s) {
assertTrue(supported.contains(m.map(facing))); assertTrue(supported.contains(m.mapFacing(facing)));
assertTrue(o.supports(facing)); assertTrue(o.supports(facing));
} }
} }

@ -4,7 +4,6 @@ package com.otaliastudios.cameraview.engine;
import android.hardware.Camera; import android.hardware.Camera;
import com.otaliastudios.cameraview.BaseTest; import com.otaliastudios.cameraview.BaseTest;
import com.otaliastudios.cameraview.controls.Engine;
import com.otaliastudios.cameraview.controls.Facing; import com.otaliastudios.cameraview.controls.Facing;
import com.otaliastudios.cameraview.controls.Flash; import com.otaliastudios.cameraview.controls.Flash;
import com.otaliastudios.cameraview.controls.Hdr; import com.otaliastudios.cameraview.controls.Hdr;
@ -28,22 +27,22 @@ public class Camera1MapperTest extends BaseTest {
@Test @Test
public void testMap() { public void testMap() {
assertEquals(mapper.map(Flash.OFF), Camera.Parameters.FLASH_MODE_OFF); assertEquals(mapper.mapFlash(Flash.OFF), Camera.Parameters.FLASH_MODE_OFF);
assertEquals(mapper.map(Flash.ON), Camera.Parameters.FLASH_MODE_ON); assertEquals(mapper.mapFlash(Flash.ON), Camera.Parameters.FLASH_MODE_ON);
assertEquals(mapper.map(Flash.AUTO), Camera.Parameters.FLASH_MODE_AUTO); assertEquals(mapper.mapFlash(Flash.AUTO), Camera.Parameters.FLASH_MODE_AUTO);
assertEquals(mapper.map(Flash.TORCH), Camera.Parameters.FLASH_MODE_TORCH); assertEquals(mapper.mapFlash(Flash.TORCH), Camera.Parameters.FLASH_MODE_TORCH);
assertEquals(mapper.map(Facing.BACK), Camera.CameraInfo.CAMERA_FACING_BACK); assertEquals(mapper.mapFacing(Facing.BACK), Camera.CameraInfo.CAMERA_FACING_BACK);
assertEquals(mapper.map(Facing.FRONT), Camera.CameraInfo.CAMERA_FACING_FRONT); assertEquals(mapper.mapFacing(Facing.FRONT), Camera.CameraInfo.CAMERA_FACING_FRONT);
assertEquals(mapper.map(Hdr.OFF), Camera.Parameters.SCENE_MODE_AUTO); assertEquals(mapper.mapHdr(Hdr.OFF), Camera.Parameters.SCENE_MODE_AUTO);
assertEquals(mapper.map(Hdr.ON), Camera.Parameters.SCENE_MODE_HDR); assertEquals(mapper.mapHdr(Hdr.ON), Camera.Parameters.SCENE_MODE_HDR);
assertEquals(mapper.map(WhiteBalance.AUTO), Camera.Parameters.WHITE_BALANCE_AUTO); assertEquals(mapper.mapWhiteBalance(WhiteBalance.AUTO), Camera.Parameters.WHITE_BALANCE_AUTO);
assertEquals(mapper.map(WhiteBalance.DAYLIGHT), Camera.Parameters.WHITE_BALANCE_DAYLIGHT); assertEquals(mapper.mapWhiteBalance(WhiteBalance.DAYLIGHT), Camera.Parameters.WHITE_BALANCE_DAYLIGHT);
assertEquals(mapper.map(WhiteBalance.CLOUDY), Camera.Parameters.WHITE_BALANCE_CLOUDY_DAYLIGHT); assertEquals(mapper.mapWhiteBalance(WhiteBalance.CLOUDY), Camera.Parameters.WHITE_BALANCE_CLOUDY_DAYLIGHT);
assertEquals(mapper.map(WhiteBalance.INCANDESCENT), Camera.Parameters.WHITE_BALANCE_INCANDESCENT); assertEquals(mapper.mapWhiteBalance(WhiteBalance.INCANDESCENT), Camera.Parameters.WHITE_BALANCE_INCANDESCENT);
assertEquals(mapper.map(WhiteBalance.FLUORESCENT), Camera.Parameters.WHITE_BALANCE_FLUORESCENT); assertEquals(mapper.mapWhiteBalance(WhiteBalance.FLUORESCENT), Camera.Parameters.WHITE_BALANCE_FLUORESCENT);
} }

@ -9,7 +9,6 @@ import android.graphics.Matrix;
import android.hardware.Camera; import android.hardware.Camera;
import android.os.Handler; import android.os.Handler;
import com.otaliastudios.cameraview.controls.Engine;
import com.otaliastudios.cameraview.controls.Facing; import com.otaliastudios.cameraview.controls.Facing;
import com.otaliastudios.cameraview.engine.mappers.Camera1Mapper; import com.otaliastudios.cameraview.engine.mappers.Camera1Mapper;
import com.otaliastudios.cameraview.internal.utils.ExifHelper; import com.otaliastudios.cameraview.internal.utils.ExifHelper;
@ -61,7 +60,7 @@ public class CameraUtils {
*/ */
public static boolean hasCameraFacing(@SuppressWarnings("unused") @NonNull Context context, public static boolean hasCameraFacing(@SuppressWarnings("unused") @NonNull Context context,
@NonNull Facing facing) { @NonNull Facing facing) {
int internal = Camera1Mapper.get().map(facing); int internal = Camera1Mapper.get().mapFacing(facing);
Camera.CameraInfo cameraInfo = new Camera.CameraInfo(); Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
for (int i = 0, count = Camera.getNumberOfCameras(); i < count; i++) { for (int i = 0, count = Camera.getNumberOfCameras(); i < count; i++) {
Camera.getCameraInfo(i, cameraInfo); Camera.getCameraInfo(i, cameraInfo);

@ -21,7 +21,6 @@ import com.google.android.gms.tasks.Tasks;
import com.otaliastudios.cameraview.CameraException; import com.otaliastudios.cameraview.CameraException;
import com.otaliastudios.cameraview.CameraLogger; import com.otaliastudios.cameraview.CameraLogger;
import com.otaliastudios.cameraview.CameraOptions; import com.otaliastudios.cameraview.CameraOptions;
import com.otaliastudios.cameraview.controls.Engine;
import com.otaliastudios.cameraview.engine.mappers.Camera1Mapper; import com.otaliastudios.cameraview.engine.mappers.Camera1Mapper;
import com.otaliastudios.cameraview.engine.offset.Axis; import com.otaliastudios.cameraview.engine.offset.Axis;
import com.otaliastudios.cameraview.engine.offset.Reference; import com.otaliastudios.cameraview.engine.offset.Reference;
@ -118,7 +117,7 @@ public class Camera1Engine extends CameraEngine implements
@Override @Override
protected boolean collectCameraInfo(@NonNull Facing facing) { 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()); LOG.i("collectCameraInfo", "Facing:", facing, "Internal:", internalFacing, "Cameras:", Camera.getNumberOfCameras());
Camera.CameraInfo cameraInfo = new Camera.CameraInfo(); Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
for (int i = 0, count = Camera.getNumberOfCameras(); i < count; i++) { 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) { private boolean applyFlash(@NonNull Camera.Parameters params, @NonNull Flash oldFlash) {
if (mCameraOptions.supports(mFlash)) { if (mCameraOptions.supports(mFlash)) {
params.setFlashMode(mMapper.map(mFlash)); params.setFlashMode(mMapper.mapFlash(mFlash));
return true; return true;
} }
mFlash = oldFlash; mFlash = oldFlash;
@ -497,7 +496,7 @@ public class Camera1Engine extends CameraEngine implements
private boolean applyWhiteBalance(@NonNull Camera.Parameters params, @NonNull WhiteBalance oldWhiteBalance) { private boolean applyWhiteBalance(@NonNull Camera.Parameters params, @NonNull WhiteBalance oldWhiteBalance) {
if (mCameraOptions.supports(mWhiteBalance)) { if (mCameraOptions.supports(mWhiteBalance)) {
params.setWhiteBalance(mMapper.map(mWhiteBalance)); params.setWhiteBalance(mMapper.mapWhiteBalance(mWhiteBalance));
return true; return true;
} }
mWhiteBalance = oldWhiteBalance; mWhiteBalance = oldWhiteBalance;
@ -522,7 +521,7 @@ public class Camera1Engine extends CameraEngine implements
private boolean applyHdr(@NonNull Camera.Parameters params, @NonNull Hdr oldHdr) { private boolean applyHdr(@NonNull Camera.Parameters params, @NonNull Hdr oldHdr) {
if (mCameraOptions.supports(mHdr)) { if (mCameraOptions.supports(mHdr)) {
params.setSceneMode(mMapper.map(mHdr)); params.setSceneMode(mMapper.mapHdr(mHdr));
return true; return true;
} }
mHdr = oldHdr; mHdr = oldHdr;

@ -61,7 +61,6 @@ import com.otaliastudios.cameraview.video.Full2VideoRecorder;
import com.otaliastudios.cameraview.video.SnapshotVideoRecorder; import com.otaliastudios.cameraview.video.SnapshotVideoRecorder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
@ -290,7 +289,7 @@ public class Camera2Engine extends CameraEngine implements ImageReader.OnImageAv
@Override @Override
protected boolean collectCameraInfo(@NonNull Facing facing) { protected boolean collectCameraInfo(@NonNull Facing facing) {
int internalFacing = mMapper.map(facing); int internalFacing = mMapper.mapFacing(facing);
String[] cameraIds = null; String[] cameraIds = null;
try { try {
cameraIds = mManager.getCameraIdList(); cameraIds = mManager.getCameraIdList();
@ -878,7 +877,7 @@ public class Camera2Engine extends CameraEngine implements ImageReader.OnImageAv
List<Integer> availableAeModes = new ArrayList<>(); List<Integer> availableAeModes = new ArrayList<>();
for (int mode : availableAeModesArray) { availableAeModes.add(mode); } for (int mode : availableAeModesArray) { availableAeModes.add(mode); }
List<Pair<Integer, Integer>> pairs = mMapper.map(mFlash); List<Pair<Integer, Integer>> pairs = mMapper.mapFlash(mFlash);
for (Pair<Integer, Integer> pair : pairs) { for (Pair<Integer, Integer> pair : pairs) {
if (availableAeModes.contains(pair.first)) { if (availableAeModes.contains(pair.first)) {
LOG.i("applyFlash: setting CONTROL_AE_MODE to", 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, private boolean applyWhiteBalance(@NonNull CaptureRequest.Builder builder,
@NonNull WhiteBalance oldWhiteBalance) { @NonNull WhiteBalance oldWhiteBalance) {
if (mCameraOptions.supports(mWhiteBalance)) { if (mCameraOptions.supports(mWhiteBalance)) {
int whiteBalance = mMapper.map(mWhiteBalance); int whiteBalance = mMapper.mapWhiteBalance(mWhiteBalance);
builder.set(CaptureRequest.CONTROL_AWB_MODE, whiteBalance); builder.set(CaptureRequest.CONTROL_AWB_MODE, whiteBalance);
return true; return true;
} }
@ -972,7 +971,7 @@ public class Camera2Engine extends CameraEngine implements ImageReader.OnImageAv
private boolean applyHdr(@NonNull CaptureRequest.Builder builder, @NonNull Hdr oldHdr) { private boolean applyHdr(@NonNull CaptureRequest.Builder builder, @NonNull Hdr oldHdr) {
if (mCameraOptions.supports(mHdr)) { if (mCameraOptions.supports(mHdr)) {
int hdr = mMapper.map(mHdr); int hdr = mMapper.mapHdr(mHdr);
builder.set(CaptureRequest.CONTROL_SCENE_MODE, hdr); builder.set(CaptureRequest.CONTROL_SCENE_MODE, hdr);
return true; return true;
} }

@ -58,24 +58,24 @@ public class Camera1Mapper {
private Camera1Mapper() {} private Camera1Mapper() {}
@NonNull @NonNull
public String map(@NonNull Flash flash) { public String mapFlash(@NonNull Flash flash) {
//noinspection ConstantConditions //noinspection ConstantConditions
return FLASH.get(flash); return FLASH.get(flash);
} }
public int map(@NonNull Facing facing) { public int mapFacing(@NonNull Facing facing) {
//noinspection ConstantConditions //noinspection ConstantConditions
return FACING.get(facing); return FACING.get(facing);
} }
@NonNull @NonNull
public String map(@NonNull WhiteBalance whiteBalance) { public String mapWhiteBalance(@NonNull WhiteBalance whiteBalance) {
//noinspection ConstantConditions //noinspection ConstantConditions
return WB.get(whiteBalance); return WB.get(whiteBalance);
} }
@NonNull @NonNull
public String map(@NonNull Hdr hdr) { public String mapHdr(@NonNull Hdr hdr) {
//noinspection ConstantConditions //noinspection ConstantConditions
return HDR.get(hdr); return HDR.get(hdr);
} }

@ -59,7 +59,7 @@ public class Camera2Mapper {
private Camera2Mapper() {} private Camera2Mapper() {}
@NonNull @NonNull
public List<Pair<Integer, Integer>> map(@NonNull Flash flash) { public List<Pair<Integer, Integer>> mapFlash(@NonNull Flash flash) {
List<Pair<Integer, Integer>> result = new ArrayList<>(); List<Pair<Integer, Integer>> result = new ArrayList<>();
switch (flash) { switch (flash) {
case ON: { case ON: {
@ -101,17 +101,17 @@ public class Camera2Mapper {
return result; return result;
} }
public int map(@NonNull Facing facing) { public int mapFacing(@NonNull Facing facing) {
//noinspection ConstantConditions //noinspection ConstantConditions
return FACING.get(facing); return FACING.get(facing);
} }
public int map(@NonNull WhiteBalance whiteBalance) { public int mapWhiteBalance(@NonNull WhiteBalance whiteBalance) {
//noinspection ConstantConditions //noinspection ConstantConditions
return WB.get(whiteBalance); return WB.get(whiteBalance);
} }
public int map(@NonNull Hdr hdr) { public int mapHdr(@NonNull Hdr hdr) {
//noinspection ConstantConditions //noinspection ConstantConditions
return HDR.get(hdr); return HDR.get(hdr);
} }

Loading…
Cancel
Save