|
|
@ -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; |
|
|
|