Skip to content

Commit

Permalink
Better zoom utility method, and FPS method that doesn't always pick t…
Browse files Browse the repository at this point in the history 
…he highest FPS, and that can be given a min/max FPS
  • Loading branch information
@srowen
srowen committed Apr 30, 2014
1 parent 2209df1 commit 461d15a
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 24 deletions.
63 changes: 42 additions & 21 deletions ...d-core/src/main/java/com/google/zxing/client/android/camera/CameraConfigurationUtils.java
View file
Expand Up @@ -43,6 +43,7 @@ public final class CameraConfigurationUtils {
private static final float MIN_EXPOSURE_COMPENSATION = 0.0f;
private static final double MAX_ASPECT_DISTORTION = 0.15;
private static final int MIN_FPS = 10;
private static final int MAX_FPS = 20;
private static final int AREA_PER_1000 = 400;

private CameraConfigurationUtils() {
Expand Down Expand Up @@ -129,33 +130,33 @@ public static void setBestExposure(Camera.Parameters parameters, boolean lightOn
}

public static void setBestPreviewFPS(Camera.Parameters parameters) {
setBestPreviewFPS(parameters, MIN_FPS);
setBestPreviewFPS(parameters, MIN_FPS, MAX_FPS);
}

public static void setBestPreviewFPS(Camera.Parameters parameters, int minFPS) {
public static void setBestPreviewFPS(Camera.Parameters parameters, int minFPS, int maxFPS) {
List<int[]> supportedPreviewFpsRanges = parameters.getSupportedPreviewFpsRange();
Log.i(TAG, "Supported FPS ranges: " + toString(supportedPreviewFpsRanges));
if (supportedPreviewFpsRanges != null && !supportedPreviewFpsRanges.isEmpty()) {
int[] minimumSuitableFpsRange = null;
int[] suitableFPSRange = null;
for (int[] fpsRange : supportedPreviewFpsRanges) {
int fpsMax = fpsRange[Camera.Parameters.PREVIEW_FPS_MAX_INDEX];
if (fpsMax >= minFPS * 1000 &&
(minimumSuitableFpsRange == null ||
fpsMax > minimumSuitableFpsRange[Camera.Parameters.PREVIEW_FPS_MAX_INDEX])) {
minimumSuitableFpsRange = fpsRange;
int thisMin = fpsRange[Camera.Parameters.PREVIEW_FPS_MIN_INDEX];
int thisMax = fpsRange[Camera.Parameters.PREVIEW_FPS_MAX_INDEX];
if (thisMin >= minFPS * 1000 && thisMax <= maxFPS * 1000) {
suitableFPSRange = fpsRange;
break;
}
}
if (minimumSuitableFpsRange == null) {
if (suitableFPSRange == null) {
Log.i(TAG, "No suitable FPS range?");
} else {
int[] currentFpsRange = new int[2];
parameters.getPreviewFpsRange(currentFpsRange);
if (Arrays.equals(currentFpsRange, minimumSuitableFpsRange)) {
Log.i(TAG, "FPS range already set to " + Arrays.toString(minimumSuitableFpsRange));
if (Arrays.equals(currentFpsRange, suitableFPSRange)) {
Log.i(TAG, "FPS range already set to " + Arrays.toString(suitableFPSRange));
} else {
Log.i(TAG, "Setting FPS range to " + Arrays.toString(minimumSuitableFpsRange));
parameters.setPreviewFpsRange(minimumSuitableFpsRange[Camera.Parameters.PREVIEW_FPS_MIN_INDEX],
minimumSuitableFpsRange[Camera.Parameters.PREVIEW_FPS_MAX_INDEX]);
Log.i(TAG, "Setting FPS range to " + Arrays.toString(suitableFPSRange));
parameters.setPreviewFpsRange(suitableFPSRange[Camera.Parameters.PREVIEW_FPS_MIN_INDEX],
suitableFPSRange[Camera.Parameters.PREVIEW_FPS_MAX_INDEX]);
}
}
}
Expand Down Expand Up @@ -214,14 +215,12 @@ public static void setBarcodeSceneMode(Camera.Parameters parameters) {
}
}

public static void setMaxZoom(Camera.Parameters parameters) {
int maxZoom = parameters.getMaxZoom();
Log.i(TAG, "Setting zoom to max of " + maxZoom);
setZoom(parameters, maxZoom);
}

public static void setZoom(Camera.Parameters parameters, int zoom) {
public static void setZoom(Camera.Parameters parameters, double targetZoomRatio) {
if (parameters.isZoomSupported()) {
Integer zoom = indexOfClosestZoom(parameters, targetZoomRatio);
if (zoom == null) {
return;
}
if (parameters.getZoom() == zoom) {
Log.i(TAG, "Zoom is already set to " + zoom);
} else {
Expand All @@ -233,6 +232,28 @@ public static void setZoom(Camera.Parameters parameters, int zoom) {
}
}

private static Integer indexOfClosestZoom(Camera.Parameters parameters, double targetZoomRatio) {
List<Integer> ratios = parameters.getZoomRatios();
Log.i(TAG, "Zoom ratios: " + ratios);
int maxZoom = parameters.getMaxZoom();
if (ratios == null || ratios.isEmpty() || ratios.size() != maxZoom + 1) {
Log.w(TAG, "Invalid zoom ratios!");
return null;
}
double target100 = 100.0 * targetZoomRatio;
double smallestDiff = Double.POSITIVE_INFINITY;
int closestIndex = 0;
for (int i = 0; i < ratios.size(); i++) {
double diff = Math.abs(ratios.get(i) - target100);
if (diff < smallestDiff) {
smallestDiff = diff;
closestIndex = i;
}
}
Log.i(TAG, "Chose zoom ratio of " + (ratios.get(closestIndex) / 100.0));
return closestIndex;
}

public static void setInvertColor(Camera.Parameters parameters) {
if (Camera.Parameters.EFFECT_NEGATIVE.equals(parameters.getColorEffect())) {
Log.i(TAG, "Negative effect already set");
Expand Down
8 changes: 5 additions & 3 deletions glass/src/com/google/zxing/client/glass/CameraConfigurationManager.java
View file
Expand Up @@ -31,8 +31,10 @@ private CameraConfigurationManager() {
static void configure(Camera camera) {
Camera.Parameters parameters = camera.getParameters();
//parameters.setPreviewSize(1024, 768);
parameters.setPreviewSize(512, 288);
//configureAdvanced(parameters);
parameters.setPreviewSize(1024, 576);
// parameters.setPreviewSize(512, 288);

configureAdvanced(parameters);
camera.setParameters(parameters);
}

Expand All @@ -41,7 +43,7 @@ private static void configureAdvanced(Camera.Parameters parameters) {
CameraConfigurationUtils.setBarcodeSceneMode(parameters);
CameraConfigurationUtils.setVideoStabilization(parameters);
CameraConfigurationUtils.setMetering(parameters);
CameraConfigurationUtils.setMaxZoom(parameters);
CameraConfigurationUtils.setZoom(parameters, 2.0);
}

}

0 comments on commit 461d15a

Please sign in to comment.