package com.google.zxing.client.android;
import com.google.zxing.BarcodeFormat;
-import com.google.zxing.BinaryBitmap;
import com.google.zxing.DecodeHintType;
-import com.google.zxing.MultiFormatReader;
-import com.google.zxing.ReaderException;
-import com.google.zxing.Result;
-import com.google.zxing.common.GlobalHistogramBinarizer;
+import com.google.zxing.ResultPointCallback;
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.util.Hashtable;
import java.util.Vector;
+import java.util.concurrent.CountDownLatch;
/**
* 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";
- private Handler handler;
private final CaptureActivity activity;
- private final MultiFormatReader multiFormatReader;
+ private final Hashtable<DecodeHintType, Object> hints;
+ private Handler handler;
+ private final CountDownLatch handlerInitLatch;
+
+ DecodeThread(CaptureActivity activity,
+ Vector<BarcodeFormat> decodeFormats,
+ String characterSet,
+ ResultPointCallback resultPointCallback) {
- DecodeThread(CaptureActivity activity, String mode) {
this.activity = activity;
- multiFormatReader = new MultiFormatReader();
+ handlerInitLatch = new CountDownLatch(1);
+
+ hints = new Hashtable<DecodeHintType, Object>(3);
// The prefs can't change while the thread is running, so pick them up once here.
- if (mode == null || mode.length() == 0) {
+ if (decodeFormats == null || decodeFormats.isEmpty()) {
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();
+ hints.put(DecodeHintType.POSSIBLE_FORMATS, CaptureActivity.ALL_FORMATS);
} else if (decode1D) {
- setDecode1DMode();
+ hints.put(DecodeHintType.POSSIBLE_FORMATS, CaptureActivity.ONE_D_FORMATS);
} else if (decodeQR) {
- setDecodeQRMode();
+ hints.put(DecodeHintType.POSSIBLE_FORMATS, CaptureActivity.QR_CODE_FORMATS);
}
} 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();
- }
+ hints.put(DecodeHintType.POSSIBLE_FORMATS, decodeFormats);
}
+
+ if (characterSet != null) {
+ hints.put(DecodeHintType.CHARACTER_SET, characterSet);
+ }
+
+ hints.put(DecodeHintType.NEED_RESULT_POINT_CALLBACK, resultPointCallback);
}
Handler getHandler() {
+ try {
+ handlerInitLatch.await();
+ } catch (InterruptedException ie) {
+ // continue?
+ }
return handler;
}
@Override
public void run() {
Looper.prepare();
- handler = new Handler() {
- @Override
- public void handleMessage(Message message) {
- switch (message.what) {
- case R.id.decode:
- decode((byte[]) message.obj, message.arg1, message.arg2);
- break;
- case R.id.quit:
- Looper.myLooper().quit();
- break;
- }
- }
- };
+ handler = new DecodeHandler(activity, hints);
+ handlerInitLatch.countDown();
Looper.loop();
}
- private void setDecodeProductMode() {
- Hashtable<DecodeHintType, Object> hints = new Hashtable<DecodeHintType, Object>(3);
- Vector<BarcodeFormat> vector = new Vector<BarcodeFormat>(4);
- vector.addElement(BarcodeFormat.UPC_A);
- vector.addElement(BarcodeFormat.UPC_E);
- vector.addElement(BarcodeFormat.EAN_13);
- vector.addElement(BarcodeFormat.EAN_8);
- hints.put(DecodeHintType.POSSIBLE_FORMATS, vector);
- multiFormatReader.setHints(hints);
- }
-
- /**
- * Select the 1D formats we want this client to decode by hand.
- */
- private void setDecode1DMode() {
- Hashtable<DecodeHintType, Object> hints = new Hashtable<DecodeHintType, Object>(3);
- Vector<BarcodeFormat> vector = new Vector<BarcodeFormat>(7);
- 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);
- vector.addElement(BarcodeFormat.ITF);
- hints.put(DecodeHintType.POSSIBLE_FORMATS, vector);
- multiFormatReader.setHints(hints);
- }
-
- private void setDecodeQRMode() {
- Hashtable<DecodeHintType, Object> hints = new Hashtable<DecodeHintType, Object>(3);
- Vector<BarcodeFormat> vector = new Vector<BarcodeFormat>(1);
- vector.addElement(BarcodeFormat.QR_CODE);
- hints.put(DecodeHintType.POSSIBLE_FORMATS, vector);
- multiFormatReader.setHints(hints);
- }
-
- /**
- * Instead of calling setHints(null), which would allow new formats to sneak in, we
- * explicitly set which formats are available.
- */
- private void setDecodeAllMode() {
- Hashtable<DecodeHintType, Object> hints = new Hashtable<DecodeHintType, Object>(3);
- Vector<BarcodeFormat> vector = new Vector<BarcodeFormat>(8);
- 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);
- vector.addElement(BarcodeFormat.ITF);
- vector.addElement(BarcodeFormat.QR_CODE);
- hints.put(DecodeHintType.POSSIBLE_FORMATS, vector);
- multiFormatReader.setHints(hints);
- }
-
- /**
- * 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.
- *
- * @param data The YUV preview frame.
- * @param width The width of the preview frame.
- * @param height The height of the preview frame.
- */
- 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 GlobalHistogramBinarizer(source));
- try {
- rawResult = multiFormatReader.decodeWithState(bitmap);
- } catch (ReaderException re) {
- // continue
- }
-
- 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