Skip to content

王雷 / detection

Go to a project
Commit 02018e6a by wanglei
Options

format

1 parent 82562f90
Inline Side-by-side
Showing with 54 additions and 60 deletions
app/src/main/java/com/agenew/detection/MainActivity.java
...@@ -129,16 +129,13 @@ public class MainActivity extends CameraActivity implements OnImageAvailableList ...@@ -129,16 +129,13 @@ public class MainActivity extends CameraActivity implements OnImageAvailableList
cropToFrameTransform = new Matrix(); cropToFrameTransform = new Matrix();
frameToCropTransform.invert(cropToFrameTransform); frameToCropTransform.invert(cropToFrameTransform);
trackingOverlay = (OverlayView) findViewById(R.id.tracking_overlay); trackingOverlay = findViewById(R.id.tracking_overlay);
trackingOverlay.addCallback(new DrawCallback() { trackingOverlay.addCallback(canvas -> {
@Override tracker.draw(canvas);
public void drawCallback(final Canvas canvas) { if (isDebug()) {
tracker.draw(canvas); tracker.drawDebug(canvas);
if (isDebug()) { }
tracker.drawDebug(canvas); });
}
}
});
tracker.setFrameConfiguration(previewWidth, previewHeight, sensorOrientation); tracker.setFrameConfiguration(previewWidth, previewHeight, sensorOrientation);
} }
...@@ -232,56 +229,53 @@ public class MainActivity extends CameraActivity implements OnImageAvailableList ...@@ -232,56 +229,53 @@ public class MainActivity extends CameraActivity implements OnImageAvailableList
ImageUtils.saveBitmap(croppedBitmap); ImageUtils.saveBitmap(croppedBitmap);
} }
runInBackground(new Runnable() { runInBackground(() -> {
@Override LOGGER.i("Running detection on image " + currTimestamp);
public void run() { final long startTime = SystemClock.uptimeMillis();
LOGGER.i("Running detection on image " + currTimestamp); final List<Classifier.Recognition> results = detector.recognizeImage(croppedBitmap);
final long startTime = SystemClock.uptimeMillis(); lastProcessingTimeMs = SystemClock.uptimeMillis() - startTime;
final List<Classifier.Recognition> results = detector.recognizeImage(croppedBitmap);
lastProcessingTimeMs = SystemClock.uptimeMillis() - startTime; Log.e("CHECK", "run: " + results.size());
Log.e("CHECK", "run: " + results.size()); cropCopyBitmap = Bitmap.createBitmap(croppedBitmap);
final Canvas canvas1 = new Canvas(cropCopyBitmap);
cropCopyBitmap = Bitmap.createBitmap(croppedBitmap); final Paint paint = new Paint();
final Canvas canvas = new Canvas(cropCopyBitmap); paint.setColor(Color.RED);
final Paint paint = new Paint(); paint.setStyle(Style.STROKE);
paint.setColor(Color.RED); paint.setStrokeWidth(2.0f);
paint.setStyle(Style.STROKE);
paint.setStrokeWidth(2.0f); float minimumConfidence = MINIMUM_CONFIDENCE_TF_OD_API;
switch (MODE) {
float minimumConfidence = MINIMUM_CONFIDENCE_TF_OD_API; case TF_OD_API:
switch (MODE) { minimumConfidence = MINIMUM_CONFIDENCE_TF_OD_API;
case TF_OD_API: break;
minimumConfidence = MINIMUM_CONFIDENCE_TF_OD_API; }
break;
} final List<Classifier.Recognition> mappedRecognitions = new LinkedList<>();
final List<Classifier.Recognition> mappedRecognitions = new LinkedList<>(); for (final Classifier.Recognition result : results) {
final RectF location = result.getLocation();
for (final Classifier.Recognition result : results) { if (location != null && result.getConfidence() >= minimumConfidence) {
final RectF location = result.getLocation(); canvas1.drawRect(location, paint);
if (location != null && result.getConfidence() >= minimumConfidence) {
canvas.drawRect(location, paint); cropToFrameTransform.mapRect(location);
cropToFrameTransform.mapRect(location); result.setLocation(location);
mappedRecognitions.add(result);
result.setLocation(location); }
mappedRecognitions.add(result); }
}
} tracker.trackResults(mappedRecognitions, currTimestamp);
trackingOverlay.postInvalidate();
tracker.trackResults(mappedRecognitions, currTimestamp);
trackingOverlay.postInvalidate(); computingDetection = false;
computingDetection = false; runOnUiThread(() -> {
showFrameInfo(previewWidth + "x" + previewHeight);
runOnUiThread(() -> { showCropInfo(cropCopyBitmap.getWidth() + "x" + cropCopyBitmap.getHeight());
showFrameInfo(previewWidth + "x" + previewHeight); showInference(lastProcessingTimeMs + "ms");
showCropInfo(cropCopyBitmap.getWidth() + "x" + cropCopyBitmap.getHeight()); });
showInference(lastProcessingTimeMs + "ms"); });
});
}
});
} }
@Override @Override
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!