mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-11-13 14:34:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Zoom and use subset of larger preview

Browse source
This commit is contained in:
Sean Owen 2014-04-30 23:43:06 +01:00
parent d5852ff9ef
commit 9b2ddac3cf
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
glass/src/com/google/zxing/client/glass/CameraConfigurationManager.java
View file

@ -25,15 +25,14 @@ import com.google.zxing.client.android.camera.CameraConfigurationUtils;
*/ */
final class CameraConfigurationManager { final class CameraConfigurationManager {
static final int ZOOM = 2;
private CameraConfigurationManager() { private CameraConfigurationManager() {
} }
static void configure(Camera camera) { static void configure(Camera camera) {
Camera.Parameters parameters = camera.getParameters(); Camera.Parameters parameters = camera.getParameters();
//parameters.setPreviewSize(1024, 768); parameters.setPreviewSize(1280, 720);
parameters.setPreviewSize(1024, 576);
// parameters.setPreviewSize(512, 288);
configureAdvanced(parameters); configureAdvanced(parameters);
camera.setParameters(parameters); camera.setParameters(parameters);
} }
@ -43,7 +42,7 @@ final class CameraConfigurationManager {
CameraConfigurationUtils.setBarcodeSceneMode(parameters); CameraConfigurationUtils.setBarcodeSceneMode(parameters);
CameraConfigurationUtils.setVideoStabilization(parameters); CameraConfigurationUtils.setVideoStabilization(parameters);
CameraConfigurationUtils.setMetering(parameters); CameraConfigurationUtils.setMetering(parameters);
CameraConfigurationUtils.setZoom(parameters, 2.0); CameraConfigurationUtils.setZoom(parameters, ZOOM);
} }
} }

15
glass/src/com/google/zxing/client/glass/DecodeRunnable.java
View file

@ -141,8 +141,19 @@ final class DecodeRunnable implements Runnable, Camera.PreviewCallback {
private void decode(byte[] data) { private void decode(byte[] data) {
Result rawResult = null; Result rawResult = null;
int subtendedWidth = width / CameraConfigurationManager.ZOOM;
int subtendedHeight = height / CameraConfigurationManager.ZOOM;
int excessWidth = width - subtendedWidth;
int excessHeight = height - subtendedHeight;
//long start = System.currentTimeMillis();
PlanarYUVLuminanceSource source = PlanarYUVLuminanceSource source =
new PlanarYUVLuminanceSource(data, width, height, 0, 0, width, height, false); new PlanarYUVLuminanceSource(data,
width, height,
excessWidth / 2, excessHeight / 2,
subtendedWidth, subtendedHeight,
false);
BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source)); BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
try { try {
rawResult = new MultiFormatReader().decode(bitmap, hints); rawResult = new MultiFormatReader().decode(bitmap, hints);
@ -150,6 +161,8 @@ final class DecodeRunnable implements Runnable, Camera.PreviewCallback {
// continue // continue
} }
//long end = System.currentTimeMillis();
//Log.i(TAG, "Decode in " + (end - start));
Handler handler = getHandler(); Handler handler = getHandler();
Message message; Message message;
if (rawResult == null) { if (rawResult == null) {