Issue 338

[zxing.git] / android / src / com / google / zxing / client / android / DecodeThread.java

diff --git a/android/src/com/google/zxing/client/android/DecodeThread.java b/android/src/com/google/zxing/client/android/DecodeThread.java
index ca2afea..b63fc21 100755 (executable)
--- a/android/src/com/google/zxing/client/android/DecodeThread.java
+++ b/android/src/com/google/zxing/client/android/DecodeThread.java
@@ -23,7 +23,7 @@ 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.GlobalHistogramBinarizer;
+import com.google.zxing.common.HybridBinarizer;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
@@ -42,42 +42,45 @@ import java.util.Vector;
  * @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 ResultPointCallback resultPointCallback;
 
-  DecodeThread(CaptureActivity activity, String mode, ResultPointCallback resultPointCallback) {
+  DecodeThread(CaptureActivity activity,
+               Vector<BarcodeFormat> decodeFormats,
+               String characterSet,
+               ResultPointCallback resultPointCallback) {
     this.activity = activity;
     multiFormatReader = new MultiFormatReader();
-    this.resultPointCallback = resultPointCallback;
+    Hashtable<DecodeHintType, Object> 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);
+
+    multiFormatReader.setHints(hints);
   }
 
   Handler getHandler() {
@@ -103,56 +106,6 @@ final class DecodeThread extends Thread {
     Looper.loop();
   }
 
-  private void setDecodeProductMode() {
-    doSetDecodeMode(BarcodeFormat.UPC_A,
-                    BarcodeFormat.UPC_E,
-                    BarcodeFormat.EAN_13,
-                    BarcodeFormat.EAN_8);
-  }
-
-  /**
-   * Select the 1D formats we want this client to decode by hand.
-   */
-  private void setDecode1DMode() {
-    doSetDecodeMode(BarcodeFormat.UPC_A,
-                    BarcodeFormat.UPC_E,
-                    BarcodeFormat.EAN_13,
-                    BarcodeFormat.EAN_8,
-                    BarcodeFormat.CODE_39,
-                    BarcodeFormat.CODE_128,
-                    BarcodeFormat.ITF);
-  }
-
-  private void setDecodeQRMode() {
-    doSetDecodeMode(BarcodeFormat.QR_CODE);
-  }
-
-  /**
-   * Instead of calling setHints(null), which would allow new formats to sneak in, we
-   * explicitly set which formats are available.
-   */
-  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);
-  }
-
   /**
    * 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.
@@ -165,11 +118,13 @@ final class DecodeThread extends Thread {
     long start = System.currentTimeMillis();
     Result rawResult = null;
     PlanarYUVLuminanceSource source = CameraManager.get().buildLuminanceSource(data, width, height);
-    BinaryBitmap bitmap = new BinaryBitmap(new GlobalHistogramBinarizer(source));
+    BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
     try {
       rawResult = multiFormatReader.decodeWithState(bitmap);
     } catch (ReaderException re) {
       // continue
+    } finally {
+      multiFormatReader.reset();
     }
 
     if (rawResult != null) {