Skip to content

armgit / haven

Public Imported from GitHub
0

Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors

Set the "best" valid preview size and fpsrange cameraPreferences.

fattirea18856cb4fb8
diff --git a/src/main/java/org/havenapp/main/sensors/motion/Preview.java b/src/main/java/org/havenapp/main/sensors/motion/Preview.java
index 950ea80..485db27 100644
--- a/src/main/java/org/havenapp/main/sensors/motion/Preview.java
+++ b/src/main/java/org/havenapp/main/sensors/motion/Preview.java
@@ -183,17 +183,36 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
final Camera.Parameters parameters = camera.getParameters();
try {
- List<Size> sizesPreviews = parameters.getSupportedPreviewSizes();
- parameters.setPreviewSize(sizesPreviews.get(4).width, sizesPreviews.get(4).height);
- }
- catch (Exception e){
- Log.w("Camera","Error setting camera preview size",e);
- }
+ List<Size> sizesPreviews = parameters.getSupportedPreviewSizes();
- List<int[]> fpsRange = parameters.getSupportedPreviewFpsRange();
- try {
- parameters.setPreviewFpsRange(fpsRange.get(fpsRange.size() - 1)[1], fpsRange.get(fpsRange.size() - 1)[1]);
- }
+ Size bestSize = sizesPreviews.get(0);
+
+ for (int i = 1; i < sizesPreviews.size(); i++) {
+ if ((sizesPreviews.get(i).width * sizesPreviews.get(i).height) >
+ (bestSize.width * bestSize.height)) {
+ bestSize = sizesPreviews.get(i);
+ }
+ }
+
+ parameters.setPreviewSize(bestSize.width, bestSize.height);
+
+ } catch (Exception e) {
+ Log.w("Camera", "Error setting camera preview size", e);
+ }
+
+ try {
+ List<int[]> ranges = parameters.getSupportedPreviewFpsRange();
+ int[] bestRange = ranges.get(0);
+ for (int i = 1; i < ranges.size(); i++) {
+ if (ranges.get(i)[1] >
+ bestRange[1]) {
+ bestRange[0] = ranges.get(i)[0];
+ bestRange[1] = ranges.get(i)[1];
+
+ }
+ }
+ parameters.setPreviewFpsRange(bestRange[0], bestRange[1]);
+ }
catch (Exception e) {
Log.w("Camera","Error setting frames per second",e);
}