aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-04-12 21:27:38 +0200
committerChristian Schneppe <christian@pix-art.de>2018-04-12 21:27:38 +0200
commitffbbc9fdfc09991344c29387dfb92a9e124063a6 (patch)
tree271ea208e7e7cbacfc6a0e451c3db8edd0e287e9 /src/main/java/de/pixart/messenger/ui
parente70f3d5a51b896adc431f38a824edea70eec766e (diff)
Improved QR code recognition when screen and camera orientation don't match
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui')
-rw-r--r--src/main/java/de/pixart/messenger/ui/service/CameraManager.java42
1 files changed, 29 insertions, 13 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/service/CameraManager.java b/src/main/java/de/pixart/messenger/ui/service/CameraManager.java
index 1c232928f..4e58d88cf 100644
--- a/src/main/java/de/pixart/messenger/ui/service/CameraManager.java
+++ b/src/main/java/de/pixart/messenger/ui/service/CameraManager.java
@@ -84,22 +84,38 @@ public final class CameraManager {
camera.setPreviewTexture(textureView.getSurfaceTexture());
- final Camera.Parameters parameters = camera.getParameters();
-
- cameraResolution = findBestPreviewSizeValue(parameters, textureView.getWidth(), textureView.getHeight());
-
final int width = textureView.getWidth();
final int height = textureView.getHeight();
+ final Camera.Parameters parameters = camera.getParameters();
+
+ cameraResolution = findBestPreviewSizeValue(parameters, width, height);
+
final int rawSize = Math.min(width * 2 / 3, height * 2 / 3);
final int frameSize = Math.max(MIN_FRAME_SIZE, Math.min(MAX_FRAME_SIZE, rawSize));
final int leftOffset = (width - frameSize) / 2;
final int topOffset = (height - frameSize) / 2;
frame = new Rect(leftOffset, topOffset, leftOffset + frameSize, topOffset + frameSize);
- framePreview = new RectF(frame.left * cameraResolution.width / width,
- frame.top * cameraResolution.height / height, frame.right * cameraResolution.width / width,
- frame.bottom * cameraResolution.height / height);
+
+ float widthFactor;
+ float heightFactor;
+ Rect orientedFrame;
+ boolean isTexturePortrait = width < height;
+ boolean isCameraPortrait = cameraResolution.width < cameraResolution.height;
+ if (isTexturePortrait == isCameraPortrait) {
+ widthFactor = (float)cameraResolution.width / width;
+ heightFactor = (float)cameraResolution.height / height;
+ orientedFrame = new Rect(frame);
+ } else {
+ widthFactor = (float)cameraResolution.width / height;
+ heightFactor = (float)cameraResolution.height / width;
+ // Swap X and Y coordinates to flip frame to the same orientation as cameraResolution
+ orientedFrame = new Rect(frame.top, frame.left, frame.bottom, frame.right);
+ }
+
+ framePreview = new RectF(orientedFrame.left * widthFactor, orientedFrame.top * heightFactor,
+ orientedFrame.right * widthFactor, orientedFrame.bottom * heightFactor);
final String savedParameters = parameters == null ? null : parameters.flatten();
@@ -244,7 +260,7 @@ public final class CameraManager {
camera.setParameters(parameters);
}
- public void requestPreviewFrame(final android.hardware.Camera.PreviewCallback callback) {
+ public void requestPreviewFrame(final Camera.PreviewCallback callback) {
try {
camera.setOneShotPreviewCallback(callback);
} catch (final RuntimeException x) {
@@ -258,6 +274,11 @@ public final class CameraManager {
(int) framePreview.height(), false);
}
+ public void setTorch(final boolean enabled) {
+ if (enabled != getTorchEnabled(camera))
+ setTorchEnabled(camera, enabled);
+ }
+
private static boolean getTorchEnabled(final Camera camera) {
final Camera.Parameters parameters = camera.getParameters();
if (parameters != null) {
@@ -297,9 +318,4 @@ public final class CameraManager {
return null;
}
-
- public void setTorch(final boolean enabled) {
- if (enabled != getTorchEnabled(camera))
- setTorchEnabled(camera, enabled);
- }
} \ No newline at end of file