/*
- * Copyright (C) 2008 Google Inc.
+ * Copyright (C) 2008 ZXing authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package com.google.zxing.client.android;
-import android.app.Application;
-import android.graphics.Bitmap;
-import android.os.Debug;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
import com.google.zxing.BarcodeFormat;
+import com.google.zxing.BinaryBitmap;
import com.google.zxing.DecodeHintType;
-import com.google.zxing.MonochromeBitmapSource;
import com.google.zxing.MultiFormatReader;
import com.google.zxing.ReaderException;
import com.google.zxing.Result;
+import com.google.zxing.ResultPointCallback;
+import com.google.zxing.common.HybridBinarizer;
+
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.preference.PreferenceManager;
+import android.util.Log;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Date;
import java.util.Hashtable;
import java.util.Vector;
/**
- * This thread does all the heavy lifting of decoding the images. It can also save images to flash
- * for debugging purposes.
+ * This thread does all the heavy lifting of decoding the images.
*
* @author dswitkin@google.com (Daniel Switkin)
*/
final class DecodeThread extends Thread {
+ public static final String BARCODE_BITMAP = "barcode_bitmap";
+ private static final String TAG = "DecodeThread";
- public Handler handler;
-
- private final BarcodeReaderCaptureActivity activity;
- private final CameraManager cameraManager;
- private Hashtable<DecodeHintType, Object> hints;
- private Handler cameraThreadHandler;
- private int methodTraceCount;
- private boolean tracing;
+ private Handler handler;
+ private final CaptureActivity activity;
+ private final MultiFormatReader multiFormatReader;
+ private final ResultPointCallback resultPointCallback;
- DecodeThread(BarcodeReaderCaptureActivity activity, CameraManager cameraManager) {
+ DecodeThread(CaptureActivity activity, String mode, ResultPointCallback resultPointCallback) {
this.activity = activity;
- this.cameraManager = cameraManager;
- methodTraceCount = 0;
- tracing = false;
+ multiFormatReader = new MultiFormatReader();
+ this.resultPointCallback = resultPointCallback;
+
+ // The prefs can't change while the thread is running, so pick them up once here.
+ if (mode == null || mode.length() == 0) {
+ SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
+ boolean decode1D = prefs.getBoolean(PreferencesActivity.KEY_DECODE_1D, true);
+ boolean decodeQR = prefs.getBoolean(PreferencesActivity.KEY_DECODE_QR, true);
+ if (decode1D && decodeQR) {
+ setDecodeAllMode();
+ } else if (decode1D) {
+ setDecode1DMode();
+ } else if (decodeQR) {
+ setDecodeQRMode();
+ }
+ } else {
+ if (mode.equals(Intents.Scan.PRODUCT_MODE)) {
+ setDecodeProductMode();
+ } else if (mode.equals(Intents.Scan.ONE_D_MODE)) {
+ setDecode1DMode();
+ } else if (mode.equals(Intents.Scan.QR_CODE_MODE)) {
+ setDecodeQRMode();
+ } else {
+ setDecodeAllMode();
+ }
+ }
+ }
+
+ Handler getHandler() {
+ return handler;
}
@Override
public void handleMessage(Message message) {
switch (message.what) {
case R.id.decode:
- captureAndDecode();
- break;
- case R.id.save:
- captureAndSave();
+ decode((byte[]) message.obj, message.arg1, message.arg2);
break;
case R.id.quit:
Looper.myLooper().quit();
break;
- case R.id.set_decode_all_mode:
- setDecodeAllMode();
- break;
- case R.id.set_decode_1D_mode:
- setDecode1DMode();
- break;
- case R.id.set_decode_QR_mode:
- setDecodeQRMode();
- break;
- case R.id.toggle_tracing:
- tracing = !tracing;
- break;
}
}
};
Looper.loop();
}
- public void setCameraThreadHandler(Handler cameraThreadHandler) {
- this.cameraThreadHandler = cameraThreadHandler;
+ private void setDecodeProductMode() {
+ doSetDecodeMode(BarcodeFormat.UPC_A,
+ BarcodeFormat.UPC_E,
+ BarcodeFormat.EAN_13,
+ BarcodeFormat.EAN_8);
}
- private void setDecodeAllMode() {
- hints = null;
- }
-
- // TODO: This is fragile in case we add new formats. It would be better to have a new enum
- // value which represented all 1D formats.
+ /**
+ * Select the 1D formats we want this client to decode by hand.
+ */
private void setDecode1DMode() {
- hints = new Hashtable<DecodeHintType, Object>(3);
- Vector<BarcodeFormat> vector = new Vector<BarcodeFormat>();
- vector.addElement(BarcodeFormat.UPC_A);
- vector.addElement(BarcodeFormat.UPC_E);
- vector.addElement(BarcodeFormat.EAN_13);
- vector.addElement(BarcodeFormat.EAN_8);
- vector.addElement(BarcodeFormat.CODE_39);
- vector.addElement(BarcodeFormat.CODE_128);
- hints.put(DecodeHintType.POSSIBLE_FORMATS, vector);
+ doSetDecodeMode(BarcodeFormat.UPC_A,
+ BarcodeFormat.UPC_E,
+ BarcodeFormat.EAN_13,
+ BarcodeFormat.EAN_8,
+ BarcodeFormat.CODE_39,
+ BarcodeFormat.CODE_128,
+ BarcodeFormat.ITF);
}
private void setDecodeQRMode() {
- hints = new Hashtable<DecodeHintType, Object>(3);
- Vector<BarcodeFormat> vector = new Vector<BarcodeFormat>();
- vector.addElement(BarcodeFormat.QR_CODE);
- hints.put(DecodeHintType.POSSIBLE_FORMATS, vector);
- }
-
- private void captureAndDecode() {
- Date startDate = new Date();
- Bitmap bitmap = cameraManager.captureStill();
- // Let the CameraThread know it can resume previews while the decoding continues in parallel.
- Message restart = Message.obtain(cameraThreadHandler, R.id.decode_started);
- restart.sendToTarget();
-
- if (tracing) {
- Debug.startMethodTracing("/sdcard/ZXingDecodeThread" + methodTraceCount);
- methodTraceCount++;
- }
- boolean success;
- Result rawResult = null;
- try {
- MonochromeBitmapSource source = new RGBMonochromeBitmapSource(bitmap);
- rawResult = new MultiFormatReader().decode(source, hints);
- success = true;
- } catch (ReaderException e) {
- success = false;
- }
- if (tracing) {
- Debug.stopMethodTracing();
- }
- Date endDate = new Date();
-
- if (success) {
- Message message = Message.obtain(cameraThreadHandler, R.id.decode_succeeded, rawResult);
- message.arg1 = (int) (endDate.getTime() - startDate.getTime());
- message.sendToTarget();
- } else {
- Message message = Message.obtain(cameraThreadHandler, R.id.decode_failed);
- message.sendToTarget();
- }
+ doSetDecodeMode(BarcodeFormat.QR_CODE);
}
/**
- * This is a debugging feature used to take photos and save them as JPEGs using the exact camera
- * setup as in normal decoding. This is useful for building up a library of test images.
+ * Instead of calling setHints(null), which would allow new formats to sneak in, we
+ * explicitly set which formats are available.
*/
- private void captureAndSave() {
- Bitmap bitmap = cameraManager.captureStill();
- OutputStream outStream = getNewPhotoOutputStream();
- if (outStream != null) {
- bitmap.compress(Bitmap.CompressFormat.JPEG, 80, outStream);
- try {
- outStream.close();
- } catch (IOException e) {
- }
- Message success = Message.obtain(cameraThreadHandler, R.id.save_succeeded);
- success.sendToTarget();
- } else {
- Message failure = Message.obtain(cameraThreadHandler, R.id.save_failed);
- failure.sendToTarget();
+ private void setDecodeAllMode() {
+ doSetDecodeMode(BarcodeFormat.UPC_A,
+ BarcodeFormat.UPC_E,
+ BarcodeFormat.EAN_13,
+ BarcodeFormat.EAN_8,
+ BarcodeFormat.CODE_39,
+ BarcodeFormat.CODE_128,
+ BarcodeFormat.ITF,
+ BarcodeFormat.QR_CODE);
+ }
+
+ private void doSetDecodeMode(BarcodeFormat... formats) {
+ Hashtable<DecodeHintType, Object> hints = new Hashtable<DecodeHintType, Object>(3);
+ Vector<BarcodeFormat> vector = new Vector<BarcodeFormat>(formats.length);
+ for (BarcodeFormat format : formats) {
+ vector.addElement(format);
}
+ hints.put(DecodeHintType.POSSIBLE_FORMATS, vector);
+ hints.put(DecodeHintType.NEED_RESULT_POINT_CALLBACK, resultPointCallback);
+ multiFormatReader.setHints(hints);
}
/**
- * We prefer to write to the SD Card because it has more space, and is automatically mounted as a
- * drive over USB. If it's not present, fall back to the package's private file area here:
+ * Decode the data within the viewfinder rectangle, and time how long it took. For efficiency,
+ * reuse the same reader objects from one decode to the next.
*
- * /data/data/com.google.zxing.client.android/files
- *
- * @return A stream which represents the new file where the photo will be saved.
+ * @param data The YUV preview frame.
+ * @param width The width of the preview frame.
+ * @param height The height of the preview frame.
*/
- private OutputStream getNewPhotoOutputStream() {
- File sdcard = new File("/sdcard");
- if (sdcard.exists()) {
- File barcodes = new File(sdcard, "barcodes");
- if (!barcodes.exists()) {
- if (!barcodes.mkdir()) {
- return null;
- }
- }
- String fileName = getNewPhotoName();
- try {
- return new FileOutputStream(new File(barcodes, fileName));
- } catch (FileNotFoundException e) {
- }
- } else {
- Application application = activity.getApplication();
- String fileName = getNewPhotoName();
- try {
- return application.openFileOutput(fileName, 0);
- } catch (FileNotFoundException e) {
- }
+ private void decode(byte[] data, int width, int height) {
+ long start = System.currentTimeMillis();
+ Result rawResult = null;
+ PlanarYUVLuminanceSource source = CameraManager.get().buildLuminanceSource(data, width, height);
+ BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
+ try {
+ rawResult = multiFormatReader.decodeWithState(bitmap);
+ } catch (ReaderException re) {
+ // continue
}
- return null;
- }
- private String getNewPhotoName() {
- Date now = new Date();
- return "capture" + now.getTime() + ".jpg";
+ if (rawResult != null) {
+ long end = System.currentTimeMillis();
+ Log.v(TAG, "Found barcode (" + (end - start) + " ms):\n" + rawResult.toString());
+ Message message = Message.obtain(activity.getHandler(), R.id.decode_succeeded, rawResult);
+ Bundle bundle = new Bundle();
+ bundle.putParcelable(BARCODE_BITMAP, source.renderCroppedGreyscaleBitmap());
+ message.setData(bundle);
+ message.sendToTarget();
+ } else {
+ Message message = Message.obtain(activity.getHandler(), R.id.decode_failed);
+ message.sendToTarget();
+ }
}
-
}
projects / zxing.git / blobdiff