Merge branch 'develop'

RedApparat · Jul 16, 2017 · 42339f8 · 42339f8
2 parents 8d5b16c + 43029af
commit 42339f8
Show file tree

Hide file tree

Showing 15 changed files with 222 additions and 94 deletions.
diff --git a/README.md b/README.md
@@ -51,6 +51,7 @@ Fotoapparat
     .into(cameraView)           // view which will draw the camera preview
     .previewScaleType(ScaleType.CENTER_CROP)  // we want the preview to fill the view  
     .photoSize(biggestSize())   // we want to have the biggest photo possible
+    .previewScaleType(centerCropped())  // we want the preview to fill the view  
     .lensPosition(back())       // we want back camera
     .focusMode(firstAvailable(  // (optional) use the first focus mode which is supported by device
             continuousFocus(),

diff --git a/fotoapparat/src/main/java/io/fotoapparat/Fotoapparat.java b/fotoapparat/src/main/java/io/fotoapparat/Fotoapparat.java
@@ -96,6 +96,7 @@ static Fotoapparat create(FotoapparatBuilder builder) {
         StartCameraRoutine startCameraRoutine = new StartCameraRoutine(
                 cameraDevice,
                 builder.renderer,
+                builder.scaleType,
                 builder.lensPositionSelector,
                 screenOrientationProvider,
                 initialParametersProvider,

diff --git a/fotoapparat/src/main/java/io/fotoapparat/FotoapparatBuilder.java b/fotoapparat/src/main/java/io/fotoapparat/FotoapparatBuilder.java
@@ -11,6 +11,7 @@
 import io.fotoapparat.parameter.Flash;
 import io.fotoapparat.parameter.FocusMode;
 import io.fotoapparat.parameter.LensPosition;
+import io.fotoapparat.parameter.ScaleType;
 import io.fotoapparat.parameter.Size;
 import io.fotoapparat.parameter.selector.FlashSelectors;
 import io.fotoapparat.parameter.selector.SelectorFunction;
@@ -51,6 +52,8 @@ public class FotoapparatBuilder {
     );
     SelectorFunction<Flash> flashSelector = FlashSelectors.off();
 
+    ScaleType scaleType = ScaleType.CENTER_CROP;
+
     FrameProcessor frameProcessor = null;
 
     Logger logger = Loggers.none();
@@ -85,6 +88,14 @@ public FotoapparatBuilder previewSize(@NonNull SelectorFunction<Size> selector)
         return this;
     }
 
+    /**
+     * @param scaleType of preview inside the view.
+     */
+    public FotoapparatBuilder previewScaleType(ScaleType scaleType) {
+        this.scaleType = scaleType;
+        return this;
+    }
+
     /**
      * @param selector selects focus mode from list of available modes.
      */

diff --git a/fotoapparat/src/main/java/io/fotoapparat/hardware/v1/capabilities/CapabilitiesFactory.java b/fotoapparat/src/main/java/io/fotoapparat/hardware/v1/capabilities/CapabilitiesFactory.java
@@ -84,7 +84,6 @@ private Set<FocusMode> extractFocusModes(Camera.Parameters parameters) {
         }
 
         result.add(FocusMode.FIXED);
-
         return result;
     }
 

diff --git a/fotoapparat/src/main/java/io/fotoapparat/hardware/v2/capabilities/CapabilitiesFactory.java b/fotoapparat/src/main/java/io/fotoapparat/hardware/v2/capabilities/CapabilitiesFactory.java
@@ -23,78 +23,78 @@
 @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
 public class CapabilitiesFactory implements CapabilitiesOperator {
 
-	private final CameraConnection cameraConnection;
-
-	public CapabilitiesFactory(CameraConnection cameraConnection) {
-		this.cameraConnection = cameraConnection;
-	}
-
-	@Override
-	public Capabilities getCapabilities() {
-		return new Capabilities(
-				availableJpegSizes(),
-				availablePreviewSizes(),
-				availableFocusModes(),
-				availableFlashModes()
-		);
-	}
-
-	@SuppressWarnings("ConstantConditions")
-	private Set<Size> availableJpegSizes() {
-		return characteristics().getJpegOutputSizes();
-	}
-
-	@SuppressWarnings("ConstantConditions")
-	private Set<Size> availablePreviewSizes() {
-		HashSet<Size> filteredOutputSizes = new HashSet<>();
-		for (Size outputSize : characteristics().getSurfaceOutputSizes()) {
-			if (outputSize.width <= PreviewSizeInfo.MAX_PREVIEW_WIDTH && outputSize.height <= PreviewSizeInfo.MAX_PREVIEW_HEIGHT) {
-				filteredOutputSizes.add(outputSize);
-			}
-		}
-
-		return filteredOutputSizes;
-	}
-
-	@SuppressWarnings("ConstantConditions")
-	private Set<FocusMode> availableFocusModes() {
-		Set<FocusMode> focusModes = new HashSet<>();
-		for (int afMode : characteristics().autoFocusModes()) {
-			focusModes.add(FocusConverter.afModeToFocus(afMode));
-		}
-
-		return focusModes;
-	}
-
-	@SuppressWarnings("ConstantConditions")
-	private Set<Flash> availableFlashModes() {
-		if (characteristics().isFlashAvailable()) {
-			return availableFlashUnitModes();
-		}
-		return Collections.singleton(Flash.OFF);
-
-	}
-
-	@SuppressWarnings("ConstantConditions")
-	private Set<Flash> availableFlashUnitModes() {
-		Set<Flash> flashes = new HashSet<>();
-		flashes.add(Flash.OFF);
-		flashes.add(Flash.TORCH);
-
-		int[] autoExposureModes = characteristics().autoExposureModes();
-
-		for (int autoExposureMode : autoExposureModes) {
-			Flash flash = exposureModeToFlash(autoExposureMode);
-			if (flash != null) {
-				flashes.add(flash);
-			}
-		}
-
-		return flashes;
-	}
-
-	private Characteristics characteristics() {
-		return cameraConnection.getCharacteristics();
-	}
+    private final CameraConnection cameraConnection;
+
+    public CapabilitiesFactory(CameraConnection cameraConnection) {
+        this.cameraConnection = cameraConnection;
+    }
+
+    @Override
+    public Capabilities getCapabilities() {
+        return new Capabilities(
+                availableJpegSizes(),
+                availablePreviewSizes(),
+                availableFocusModes(),
+                availableFlashModes()
+        );
+    }
+
+    @SuppressWarnings("ConstantConditions")
+    private Set<Size> availableJpegSizes() {
+        return characteristics().getJpegOutputSizes();
+    }
+
+    @SuppressWarnings("ConstantConditions")
+    private Set<Size> availablePreviewSizes() {
+        HashSet<Size> filteredOutputSizes = new HashSet<>();
+        for (Size outputSize : characteristics().getSurfaceOutputSizes()) {
+            if (outputSize.width <= PreviewSizeInfo.MAX_PREVIEW_WIDTH && outputSize.height <= PreviewSizeInfo.MAX_PREVIEW_HEIGHT) {
+                filteredOutputSizes.add(outputSize);
+            }
+        }
+
+        return filteredOutputSizes;
+    }
+
+    @SuppressWarnings("ConstantConditions")
+    private Set<FocusMode> availableFocusModes() {
+        Set<FocusMode> focusModes = new HashSet<>();
+        for (int afMode : characteristics().autoFocusModes()) {
+            focusModes.add(FocusConverter.afModeToFocus(afMode));
+        }
+
+        return focusModes;
+    }
+
+    @SuppressWarnings("ConstantConditions")
+    private Set<Flash> availableFlashModes() {
+        if (characteristics().isFlashAvailable()) {
+            return availableFlashUnitModes();
+        }
+        return Collections.singleton(Flash.OFF);
+
+    }
+
+    @SuppressWarnings("ConstantConditions")
+    private Set<Flash> availableFlashUnitModes() {
+        Set<Flash> flashes = new HashSet<>();
+        flashes.add(Flash.OFF);
+        flashes.add(Flash.TORCH);
+
+        int[] autoExposureModes = characteristics().autoExposureModes();
+
+        for (int autoExposureMode : autoExposureModes) {
+            Flash flash = exposureModeToFlash(autoExposureMode);
+            if (flash != null) {
+                flashes.add(flash);
+            }
+        }
+
+        return flashes;
+    }
+
+    private Characteristics characteristics() {
+        return cameraConnection.getCharacteristics();
+    }
 
 }
diff --git a/fotoapparat/src/main/java/io/fotoapparat/parameter/RendererParameters.java b/fotoapparat/src/main/java/io/fotoapparat/parameter/RendererParameters.java
@@ -33,7 +33,6 @@ public boolean equals(Object o) {
         RendererParameters that = (RendererParameters) o;
 
         return frameRotation == that.frameRotation && (previewSize != null ? previewSize.equals(that.previewSize) : that.previewSize == null);
-
     }
 
     @Override

diff --git a/fotoapparat/src/main/java/io/fotoapparat/parameter/ScaleType.java b/fotoapparat/src/main/java/io/fotoapparat/parameter/ScaleType.java
@@ -0,0 +1,20 @@
+package io.fotoapparat.parameter;
+
+/**
+ * The scale type of the preview relatively to the view.
+ */
+public enum ScaleType {
+
+    /**
+     * The preview will be scaled so as its one dimensions will be equal and the other one equal or
+     * larger than the corresponding dimension of the view
+     */
+    CENTER_CROP,
+
+    /**
+     * The preview will be scaled so as its one dimensions will be equal and the other one equal or
+     * smaller than the corresponding dimension of the view
+     */
+    CENTER_INSIDE
+
+}
diff --git a/fotoapparat/src/main/java/io/fotoapparat/routine/StartCameraRoutine.java b/fotoapparat/src/main/java/io/fotoapparat/routine/StartCameraRoutine.java
@@ -5,6 +5,7 @@
 import io.fotoapparat.hardware.CameraException;
 import io.fotoapparat.hardware.orientation.ScreenOrientationProvider;
 import io.fotoapparat.parameter.LensPosition;
+import io.fotoapparat.parameter.ScaleType;
 import io.fotoapparat.parameter.provider.InitialParametersProvider;
 import io.fotoapparat.parameter.selector.SelectorFunction;
 import io.fotoapparat.view.CameraRenderer;
@@ -16,19 +17,22 @@ public class StartCameraRoutine implements Runnable {
 
     private final CameraDevice cameraDevice;
     private final CameraRenderer cameraRenderer;
+    private final ScaleType scaleType;
     private final SelectorFunction<LensPosition> lensPositionSelector;
     private final ScreenOrientationProvider screenOrientationProvider;
     private final InitialParametersProvider initialParametersProvider;
     private final CameraErrorCallback cameraErrorCallback;
 
     public StartCameraRoutine(CameraDevice cameraDevice,
                               CameraRenderer cameraRenderer,
+                              ScaleType scaleType,
                               SelectorFunction<LensPosition> lensPositionSelector,
                               ScreenOrientationProvider screenOrientationProvider,
                               InitialParametersProvider initialParametersProvider,
                               CameraErrorCallback cameraErrorCallback) {
         this.cameraDevice = cameraDevice;
         this.cameraRenderer = cameraRenderer;
+        this.scaleType = scaleType;
         this.lensPositionSelector = lensPositionSelector;
         this.screenOrientationProvider = screenOrientationProvider;
         this.initialParametersProvider = initialParametersProvider;
@@ -56,8 +60,8 @@ private void tryToStartCamera() {
         cameraDevice.setDisplayOrientation(
                 screenOrientationProvider.getScreenRotation()
         );
+        cameraRenderer.setScaleType(scaleType);
         cameraRenderer.attachCamera(cameraDevice);
         cameraDevice.startPreview();
     }
-
 }
diff --git a/fotoapparat/src/main/java/io/fotoapparat/view/CameraRenderer.java b/fotoapparat/src/main/java/io/fotoapparat/view/CameraRenderer.java
@@ -1,12 +1,19 @@
 package io.fotoapparat.view;
 
 import io.fotoapparat.hardware.CameraDevice;
+import io.fotoapparat.parameter.ScaleType;
 
 /**
  * Renders the stream from {@link io.fotoapparat.Fotoapparat}.
  */
 public interface CameraRenderer {
 
+    /**
+     * Sets the scale type of the preview to the renderer. This method will be called from camera
+     * thread, so it is safe to perform blocking operations here.
+     */
+    void setScaleType(ScaleType scaleType);
+
     /**
      * Attaches renderer to camera, so that it will display the preview when camera is started. This
      * method will be called from camera thread, so it is safe to perform blocking operations here.

diff --git a/fotoapparat/src/main/java/io/fotoapparat/view/CameraView.java b/fotoapparat/src/main/java/io/fotoapparat/view/CameraView.java
@@ -11,6 +11,7 @@
 import android.widget.FrameLayout;
 
 import io.fotoapparat.hardware.CameraDevice;
+import io.fotoapparat.parameter.ScaleType;
 
 /**
  * Displays stream from camera.
@@ -55,6 +56,11 @@ private void init() {
         addView(rendererView);
     }
 
+    @Override
+    public void setScaleType(ScaleType scaleType) {
+        rendererView.setScaleType(scaleType);
+    }
+
     @Override
     public void attachCamera(CameraDevice camera) {
         rendererView.attachCamera(camera);

diff --git a/fotoapparat/src/main/java/io/fotoapparat/view/TextureRendererView.java b/fotoapparat/src/main/java/io/fotoapparat/view/TextureRendererView.java
@@ -16,6 +16,7 @@
 
 import io.fotoapparat.hardware.CameraDevice;
 import io.fotoapparat.parameter.RendererParameters;
+import io.fotoapparat.parameter.ScaleType;
 import io.fotoapparat.parameter.Size;
 
 /**
@@ -29,6 +30,7 @@ class TextureRendererView extends FrameLayout implements CameraRenderer {
     private TextureView textureView;
 
     private Size previewSize = null;
+    private ScaleType scaleType;
 
     public TextureRendererView(@NonNull Context context) {
         super(context);
@@ -74,6 +76,11 @@ private void tryToInitializeSurfaceTexture(TextureView textureView) {
         }
     }
 
+    @Override
+    public void setScaleType(ScaleType scaleType) {
+        this.scaleType = scaleType;
+    }
+
     @Override
     public void attachCamera(CameraDevice camera) {
         awaitSurfaceTexture();
@@ -82,7 +89,7 @@ public void attachCamera(CameraDevice camera) {
         camera.setDisplaySurface(textureView);
     }
 
-    private void updateLayout(CameraDevice camera) {
+    private void updateLayout(final CameraDevice camera) {
         final Size previewSize = toPreviewSize(
                 camera.getRendererParameters()
         );
@@ -117,11 +124,39 @@ private void awaitSurfaceTexture() {
 
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        if (previewSize == null) {
+        if (previewSize == null || scaleType == null) {
             super.onLayout(changed, left, top, right, bottom);
             return;
         }
 
+        if (scaleType == ScaleType.CENTER_INSIDE) {
+            centerInside(previewSize);
+        } else {
+            centerCrop(previewSize);
+        }
+    }
+
+    private void centerInside(Size previewSize) {
+        final float scale = Math.min(
+                getMeasuredWidth() / (float) previewSize.width,
+                getMeasuredHeight() / (float) previewSize.height
+        );
+
+        final int width = (int) (previewSize.width * scale);
+        final int height = (int) (previewSize.height * scale);
+
+        final int extraX = Math.max(0, getMeasuredWidth() - width);
+        final int extraY = Math.max(0, getMeasuredHeight() - height);
+
+        getChildAt(0).layout(
+                extraX / 2,
+                extraY / 2,
+                width + (extraX / 2),
+                height + (extraY / 2)
+        );
+    }
+
+    private void centerCrop(Size previewSize) {
         final float scale = Math.max(
                 getMeasuredWidth() / (float) previewSize.width,
                 getMeasuredHeight() / (float) previewSize.height
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             result.add(FocusMode.FIXED);
             return result;
         }
@@ Expand Down @@