X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=android%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fclient%2Fandroid%2FDecodeThread.java;h=b63fc21905f5b86068d17054dcf815a1a871d70d;hb=9497553ad4f6e6ab4d5ee8f3db7865ef895e6d9d;hp=f2ad73bf03e91177a58b4fd5519699c293b30f0f;hpb=05c3d33ab82e878557fab04d08266f5aae7af5a1;p=zxing.git diff --git a/android/src/com/google/zxing/client/android/DecodeThread.java b/android/src/com/google/zxing/client/android/DecodeThread.java index f2ad73bf..b63fc219 100755 --- a/android/src/com/google/zxing/client/android/DecodeThread.java +++ b/android/src/com/google/zxing/client/android/DecodeThread.java @@ -16,66 +16,82 @@ 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.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 com.google.zxing.BarcodeFormat; -import com.google.zxing.DecodeHintType; -import com.google.zxing.MultiFormatReader; -import com.google.zxing.ReaderException; -import com.google.zxing.Result; +import android.util.Log; -import java.util.Date; import java.util.Hashtable; import java.util.Vector; /** * 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"; - - public Handler mHandler; - private final CaptureActivity mActivity; - private final MultiFormatReader mMultiFormatReader; - - DecodeThread(CaptureActivity activity, String mode) { - mActivity = activity; - mMultiFormatReader = new MultiFormatReader(); + private static final String TAG = "DecodeThread"; + + private Handler handler; + private final CaptureActivity activity; + private final MultiFormatReader multiFormatReader; + + DecodeThread(CaptureActivity activity, + Vector decodeFormats, + String characterSet, + ResultPointCallback resultPointCallback) { + this.activity = activity; + multiFormatReader = new MultiFormatReader(); + Hashtable hints = new Hashtable(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() { + return handler; } @Override public void run() { Looper.prepare(); - mHandler = new Handler() { + handler = new Handler() { + @Override public void handleMessage(Message message) { switch (message.what) { case R.id.decode: @@ -90,58 +106,6 @@ final class DecodeThread extends Thread { Looper.loop(); } - private void setDecodeProductMode() { - Hashtable hints = new Hashtable(3); - Vector vector = new Vector(); - 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); - mMultiFormatReader.setHints(hints); - } - - // 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. - private void setDecode1DMode() { - Hashtable hints = new Hashtable(3); - Vector vector = new Vector(); - 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); - mMultiFormatReader.setHints(hints); - } - - private void setDecodeQRMode() { - Hashtable hints = new Hashtable(3); - Vector vector = new Vector(); - vector.addElement(BarcodeFormat.QR_CODE); - hints.put(DecodeHintType.POSSIBLE_FORMATS, vector); - mMultiFormatReader.setHints(hints); - } - - /** - * Instead of calling setHints(null), which would allow new formats like ITF to sneak in, we - * explicitly set which formats are available. - */ - private void setDecodeAllMode() { - Hashtable hints = new Hashtable(3); - Vector vector = new Vector(); - 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.QR_CODE); - hints.put(DecodeHintType.POSSIBLE_FORMATS, vector); - mMultiFormatReader.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. @@ -151,31 +115,29 @@ final class DecodeThread extends Thread { * @param height The height of the preview frame. */ private void decode(byte[] data, int width, int height) { - Date startDate = new Date(); - boolean success; + long start = System.currentTimeMillis(); Result rawResult = null; - YUVMonochromeBitmapSource source = new YUVMonochromeBitmapSource(data, width, height, - CameraManager.get().getFramingRect()); + PlanarYUVLuminanceSource source = CameraManager.get().buildLuminanceSource(data, width, height); + BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source)); try { - rawResult = mMultiFormatReader.decodeWithState(source); - success = true; - } catch (ReaderException e) { - success = false; + rawResult = multiFormatReader.decodeWithState(bitmap); + } catch (ReaderException re) { + // continue + } finally { + multiFormatReader.reset(); } - Date endDate = new Date(); - if (success) { - Message message = Message.obtain(mActivity.mHandler, R.id.decode_succeeded, rawResult); - message.arg1 = (int) (endDate.getTime() - startDate.getTime()); + 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.renderToBitmap()); + bundle.putParcelable(BARCODE_BITMAP, source.renderCroppedGreyscaleBitmap()); message.setData(bundle); message.sendToTarget(); } else { - Message message = Message.obtain(mActivity.mHandler, R.id.decode_failed); - message.arg1 = (int) (endDate.getTime() - startDate.getTime()); + Message message = Message.obtain(activity.getHandler(), R.id.decode_failed); message.sendToTarget(); } } - }