mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Discovered that our 1D Readers were being reallocated for every row scanned - yikes! I made them reusable across both rows and different scans. This saved 26 ms on the worst case rejection. We can now consistently reject any 240x240 image on Android in 150 ms or less, checking all 7 formats.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@661 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin 2008-11-01 02:31:05 +00:00
parent b3b945efcc
commit a8b57c466d
3 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/src/com/google/zxing/MultiFormatReader.java
View file

@ -62,7 +62,8 @@ public final class MultiFormatReader implements Reader {
}
/**
* Decode an image using the state set up by calling setHints() previously.
* Decode an image using the state set up by calling setHints() previously. Continuous scan
* clients will get a <b>large</b> speed increase by using this instead of decode().
*
* @param image The pixel data to decode
* @return The contents of the image
@ -99,7 +100,7 @@ public final class MultiFormatReader implements Reader {
possibleFormats.contains(BarcodeFormat.CODE_128);
// Put 1D readers upfront in "normal" mode
if (addOneDReader && !tryHarder) {
readers.addElement(new MultiFormatOneDReader());
readers.addElement(new MultiFormatOneDReader(hints));
}
if (possibleFormats.contains(BarcodeFormat.QR_CODE)) {
readers.addElement(new QRCodeReader());
@ -110,24 +111,25 @@ public final class MultiFormatReader implements Reader {
//}
// At end in "try harder" mode
if (addOneDReader && tryHarder) {
readers.addElement(new MultiFormatOneDReader());
readers.addElement(new MultiFormatOneDReader(hints));
}
}
if (readers.isEmpty()) {
if (!tryHarder) {
readers.addElement(new MultiFormatOneDReader());
readers.addElement(new MultiFormatOneDReader(hints));
}
readers.addElement(new QRCodeReader());
// TODO re-enable once Data Matrix is ready
// readers.addElement(new DataMatrixReader());
if (tryHarder) {
readers.addElement(new MultiFormatOneDReader());
readers.addElement(new MultiFormatOneDReader(hints));
}
}
}
private Result decodeInternal(MonochromeBitmapSource image) throws ReaderException {
for (int i = 0; i < readers.size(); i++) {
int size = readers.size();
for (int i = 0; i < size; i++) {
Reader reader = (Reader) readers.elementAt(i);
try {
return reader.decode(image, hints);

14
core/src/com/google/zxing/oned/MultiFormatOneDReader.java
View file

@ -31,16 +31,17 @@ import java.util.Vector;
*/
public final class MultiFormatOneDReader extends AbstractOneDReader {
public Result decodeRow(int rowNumber, BitArray row, Hashtable hints) throws ReaderException {
private Vector readers;
public MultiFormatOneDReader(Hashtable hints) {
Vector possibleFormats = hints == null ? null : (Vector) hints.get(DecodeHintType.POSSIBLE_FORMATS);
Vector readers = new Vector();
readers = new Vector();
if (possibleFormats != null) {
if (possibleFormats.contains(BarcodeFormat.EAN_13) ||
possibleFormats.contains(BarcodeFormat.UPC_A) ||
possibleFormats.contains(BarcodeFormat.EAN_8) ||
possibleFormats.contains(BarcodeFormat.UPC_E)) {
readers.addElement(new MultiFormatUPCEANReader());
readers.addElement(new MultiFormatUPCEANReader(hints));
}
if (possibleFormats.contains(BarcodeFormat.CODE_39)) {
readers.addElement(new Code39Reader());
@ -50,12 +51,15 @@ public final class MultiFormatOneDReader extends AbstractOneDReader {
}
}
if (readers.isEmpty()) {
readers.addElement(new MultiFormatUPCEANReader());
readers.addElement(new MultiFormatUPCEANReader(hints));
readers.addElement(new Code39Reader());
readers.addElement(new Code128Reader());
}
}
for (int i = 0; i < readers.size(); i++) {
public Result decodeRow(int rowNumber, BitArray row, Hashtable hints) throws ReaderException {
int size = readers.size();
for (int i = 0; i < size; i++) {
OneDReader reader = (OneDReader) readers.elementAt(i);
try {
return reader.decodeRow(rowNumber, row, hints);

11
core/src/com/google/zxing/oned/MultiFormatUPCEANReader.java
View file

@ -34,9 +34,11 @@ import java.util.Vector;
*/
public final class MultiFormatUPCEANReader extends AbstractOneDReader {
public Result decodeRow(int rowNumber, BitArray row, Hashtable hints) throws ReaderException {
private Vector readers;
public MultiFormatUPCEANReader(Hashtable hints) {
Vector possibleFormats = hints == null ? null : (Vector) hints.get(DecodeHintType.POSSIBLE_FORMATS);
Vector readers = new Vector();
readers = new Vector();
if (possibleFormats != null) {
if (possibleFormats.contains(BarcodeFormat.EAN_13)) {
readers.addElement(new EAN13Reader());
@ -56,10 +58,13 @@ public final class MultiFormatUPCEANReader extends AbstractOneDReader {
readers.addElement(new EAN8Reader());
readers.addElement(new UPCEReader());
}
}
public Result decodeRow(int rowNumber, BitArray row, Hashtable hints) throws ReaderException {
// Compute this location once and reuse it on multiple implementations
int[] startGuardPattern = AbstractUPCEANReader.findStartGuardPattern(row);
for (int i = 0; i < readers.size(); i++) {
int size = readers.size();
for (int i = 0; i < size; i++) {
UPCEANReader reader = (UPCEANReader) readers.elementAt(i);
Result result;
try {