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 supported frame rate

n8fr86e6789ccb981
diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/motion/Preview.java b/src/main/java/info/guardianproject/phoneypot/sensors/motion/Preview.java
index 83b6c75..6ea8489 100644
--- a/src/main/java/info/guardianproject/phoneypot/sensors/motion/Preview.java
+++ b/src/main/java/info/guardianproject/phoneypot/sensors/motion/Preview.java
@@ -188,11 +188,12 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
if (camera != null) {
final Camera.Parameters parameters = camera.getParameters();
List<Size> sizes = parameters.getSupportedPictureSizes();
- int w = 640;
- int h = 480;
+ int w = 1024;
+ int h = 768;
+
for (Size s : sizes) {
Log.i("SurfaceView", "width: " + s.width + " height: " + s.height);
- if (s.width <= 640) {
+ if (s.width <= w) {
w = s.width;
h = s.height;
Log.i("SurfaceView", "selected width: " + w + " selected height: " + h);
@@ -202,20 +203,10 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
parameters.setPictureSize(w, h);
parameters.setPreviewSize(w,h);
- parameters.setPreviewFpsRange(15000,30000);
-
-// /List<int[]> fpsRange = parameters.getSupportedPreviewFpsRange();
- //
- // parameters.setPreviewFpsRange(fpsRange.get(fpsRange.size()-1)[1],fpsRange.get(fpsRange.size()-1)[1]);
-
- /**
- if (parameters.isAutoWhiteBalanceLockSupported())
- parameters.setAutoWhiteBalanceLock(true);
-
- if (parameters.isAutoExposureLockSupported())
- parameters.setAutoExposureLock(true);
- **/
+ //parameters.setPreviewFpsRange(15000,30000);
+ List<int[]> fpsRange = parameters.getSupportedPreviewFpsRange();
+ parameters.setPreviewFpsRange(fpsRange.get(fpsRange.size()-1)[1],fpsRange.get(fpsRange.size()-1)[1]);
/*
* If the flash is needed