mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactored open() into one method

Browse source
This commit is contained in:
slepmog 2014-05-01 06:30:29 -07:00
parent 0d31475707
commit 0b6d83ed10
1 changed files with 28 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
android/src/com/google/zxing/client/android/camera/open/OpenCameraInterface.java
View file

@ -30,29 +30,46 @@ public final class OpenCameraInterface {
/** /**
* Opens the requested camera with {@link Camera#open(int)}, if one exists. * Opens the requested camera with {@link Camera#open(int)}, if one exists.
* *
* @param cameraId camera ID of the camera to use * @param cameraId camera ID of the camera to use. A negative value means "no preference"
* @return handle to {@link Camera} that was opened * @return handle to {@link Camera} that was opened
*/ */
public static Camera open(int cameraId) { public static Camera open(int cameraId) {
if (cameraId < 0) {
Log.w(TAG, "Requested invalid camera ID: " + cameraId);
return null;
}
int numCameras = Camera.getNumberOfCameras(); int numCameras = Camera.getNumberOfCameras();
if (numCameras == 0) { if (numCameras == 0) {
Log.w(TAG, "No cameras!"); Log.w(TAG, "No cameras!");
return null; return null;
} }
boolean explicitRequest = cameraId >= 0;
if (!explicitRequest) {
// Select a camera if no explicit camera requested
int index = 0;
while (index < numCameras) {
Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
Camera.getCameraInfo(index, cameraInfo);
if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_BACK) {
break;
}
index++;
}
cameraId = index;
}
Camera camera; Camera camera;
if (cameraId < numCameras) { if (cameraId < numCameras) {
Log.i(TAG, "Opening camera #" + cameraId); Log.i(TAG, "Opening camera #" + cameraId);
camera = Camera.open(cameraId); camera = Camera.open(cameraId);
} else { } else {
if (explicitRequest) {
Log.w(TAG, "Requested camera does not exist: " + cameraId); Log.w(TAG, "Requested camera does not exist: " + cameraId);
camera = null; camera = null;
} else {
Log.i(TAG, "No camera facing back; returning camera #0");
camera = Camera.open(0);
}
} }
return camera; return camera;
@ -65,33 +82,7 @@ public final class OpenCameraInterface {
* @return handle to {@link Camera} that was opened * @return handle to {@link Camera} that was opened
*/ */
public static Camera open() { public static Camera open() {
return open(-1);
int numCameras = Camera.getNumberOfCameras();
if (numCameras == 0) {
Log.w(TAG, "No cameras!");
return null;
}
int index = 0;
while (index < numCameras) {
Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
Camera.getCameraInfo(index, cameraInfo);
if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_BACK) {
break;
}
index++;
}
Camera camera;
if (index < numCameras) {
Log.i(TAG, "Opening camera #" + index);
camera = Camera.open(index);
} else {
Log.i(TAG, "No camera facing back; returning camera #0");
camera = Camera.open(0);
}
return camera;
} }
} }