faster auto focus, increased (default) video resolution if available

Author: ajungg

build.gradle

@@ -24,7 +24,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.9.3'
+        sdkVersion='0.9.4'
         versionCode=1
 
         compileSdkVersion=28

ui/src/main/java/io/snabble/sdk/ui/scanner/BarcodeScannerView.java

@@ -80,7 +80,6 @@ public class BarcodeScannerView extends FrameLayout implements TextureView.Surfa
     private boolean startRequested;
 
     private List<BarcodeFormat> supportedBarcodeFormats = new ArrayList<>();
-    private boolean manualAutoFocus;
     private int surfaceWidth;
     private int surfaceHeight;
     private TextureView textureView;
@@ -367,10 +366,6 @@ private void startIfRequested() {
         camera.setPreviewCallbackWithBuffer(this);
         camera.addCallbackBuffer(backBuffer);
 
-        if (manualAutoFocus) {
-            scheduleAutoFocus();
-        }
-
         detectionRect.left = 0;
         detectionRect.top = 0;
         detectionRect.right = previewSize.width;
@@ -389,6 +384,7 @@ public void run() {
             }
         });
 
+        scheduleAutoFocus();
         showError(false);
 
         if (isPaused) {
@@ -430,10 +426,7 @@ private void chooseFrameRate(Camera.Parameters parameters) {
     private void chooseFocusMode(Camera.Parameters parameters) {
         List<String> supportedFocusModes = parameters.getSupportedFocusModes();
         if (supportedFocusModes != null) {
-            if (supportedFocusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO)) {
-                parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO);
-            } else if (supportedFocusModes.contains(Camera.Parameters.FOCUS_MODE_AUTO)) {
-                manualAutoFocus = true;
+            if (supportedFocusModes.contains(Camera.Parameters.FOCUS_MODE_AUTO)) {
                 parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_AUTO);
             }
         }
@@ -507,18 +500,15 @@ private void scheduleAutoFocus() {
             public void run() {
                 if (running) {
                     try {
-                        camera.autoFocus(new Camera.AutoFocusCallback() {
-                            @Override
-                            public void onAutoFocus(boolean success, Camera camera) {
-                                scheduleAutoFocus();
-                            }
-                        });
+                        camera.autoFocus(null);
                     } catch (RuntimeException e) {
-                        // ignore, happens mostly when calling autoFocus while its still focussing
+                        //ignore, happens mostly when calling autoFocus while its still focussing
                     }
+
+                    scheduleAutoFocus();
                 }
             }
-        }, 2000);
+        }, 1000);
     }
 
     private void setupZXing() {
@@ -654,7 +644,6 @@ public void onPreviewFrame(byte[] data, final Camera camera) {
             nextDetectionTimeMs = SystemClock.elapsedRealtime() + detectionDelayMs;
 
             barcodeProcessingHandler.post(new Runnable() {
-                @SuppressWarnings("SuspiciousNameCombination")
                 @Override
                 public void run() {
                     if (!isAttachedToWindow || !decodeEnabled) {
@@ -976,10 +965,10 @@ private Camera.Size getOptimalPreviewSize() {
         Camera.Size optimalSizeForWidth = null;
         Camera.Size optimalSizeForHeight = null;
 
-        // we are using 1280x720 as our base resolution, as its available on most devices and provides
+        // we are using 1920x1080 as our base resolution, as its available on most devices and provides
         // a good balance between quality and performance
-        int targetWidth = 1280;
-        int targetHeight = 720;
+        int targetWidth = 1920;
+        int targetHeight = 1080;
 
         float minDiffX = Float.MAX_VALUE;
         float minDiffY = Float.MIN_VALUE;