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

Cap preview size used at about 800x480; for Issue 1069, adjust Display info by correcting to landscape

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2046 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2011-11-22 08:48:27 +00:00
parent 922f9e0abc
commit ab0ec7ebc8
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
View file

@ -37,6 +37,7 @@ final class CameraConfigurationManager {
private static final String TAG = "CameraConfiguration"; private static final String TAG = "CameraConfiguration";
private static final int MIN_PREVIEW_PIXELS = 320 * 240; // small screen private static final int MIN_PREVIEW_PIXELS = 320 * 240; // small screen
private static final int MAX_PREVIEW_PIXELS = 800 * 480; // large/HD screen
private final Context context; private final Context context;
private Point screenResolution; private Point screenResolution;
@ -53,7 +54,17 @@ final class CameraConfigurationManager {
Camera.Parameters parameters = camera.getParameters(); Camera.Parameters parameters = camera.getParameters();
WindowManager manager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE); WindowManager manager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
Display display = manager.getDefaultDisplay(); Display display = manager.getDefaultDisplay();
screenResolution = new Point(display.getWidth(), display.getHeight()); int width = display.getWidth();
int height = display.getHeight();
// We're landscape-only, and have apparently seen issues with display thinking it's portrait
// when waking from sleep. If it's not landscape, assume it's mistaken and reverse them:
if (width < height) {
Log.i(TAG, "Display reports portrait orientation; assuming this is incorrect");
int temp = width;
width = height;
height = temp;
}
screenResolution = new Point(width, height);
Log.i(TAG, "Screen resolution: " + screenResolution); Log.i(TAG, "Screen resolution: " + screenResolution);
cameraResolution = findBestPreviewSizeValue(parameters, screenResolution, false); cameraResolution = findBestPreviewSizeValue(parameters, screenResolution, false);
Log.i(TAG, "Camera resolution: " + cameraResolution); Log.i(TAG, "Camera resolution: " + cameraResolution);
@ -128,7 +139,8 @@ final class CameraConfigurationManager {
Point bestSize = null; Point bestSize = null;
int diff = Integer.MAX_VALUE; int diff = Integer.MAX_VALUE;
for (Camera.Size supportedPreviewSize : parameters.getSupportedPreviewSizes()) { for (Camera.Size supportedPreviewSize : parameters.getSupportedPreviewSizes()) {
if (supportedPreviewSize.height * supportedPreviewSize.width < MIN_PREVIEW_PIXELS) { int pixels = supportedPreviewSize.height * supportedPreviewSize.width;
if (pixels < MIN_PREVIEW_PIXELS || pixels > MAX_PREVIEW_PIXELS) {
continue; continue;
} }
int supportedWidth = portrait ? supportedPreviewSize.height : supportedPreviewSize.width; int supportedWidth = portrait ? supportedPreviewSize.height : supportedPreviewSize.width;