commit 38b4762a29420e7cced9742923dce09ce1862406
author Lopez Esparza, Ricardo <ricardo.lopez.esparza@intel.com> Mon Dec 14 16:31:37 2015 -0600
committer Lopez Esparza, Ricardo <ricardo.lopez.esparza@intel.com> Mon Dec 14 16:36:37 2015 -0600
tree 86c0784e3a652d30780cf6b7250003c5f1572a93
parent 6ad6500daf9ad4d66fa168e3483a8208d07a925f

Change minDuration check in Camera2SurfaceView

In order to return the correct size in getMaxPreviewSizeForFpsRange,
restrict the minDuration matching against frameDurationRange.

Change-Id: I644d27131615a52740bfea656ab9a9374ec2427e
Signed-off-by: Per Persson <per.persson@intel.com>
Signed-off-by: Lopez Esparza, Ricardo <ricardo.lopez.esparza@intel.com>

tests/camera/src/android/hardware/camera2/cts/testcases/Camera2SurfaceViewTestCase.java

diff --git a/tests/camera/src/android/hardware/camera2/cts/testcases/Camera2SurfaceViewTestCase.java b/tests/camera/src/android/hardware/camera2/cts/testcases/Camera2SurfaceViewTestCase.java
index c136b67..b7287ae 100644
--- a/tests/camera/src/android/hardware/camera2/cts/testcases/Camera2SurfaceViewTestCase.java
+++ b/tests/camera/src/android/hardware/camera2/cts/testcases/Camera2SurfaceViewTestCase.java
@@ -81,6 +81,7 @@
     protected static final float FRAME_DURATION_ERROR_MARGIN = 0.005f; // 0.5 percent error margin.
     protected static final int NUM_RESULTS_WAIT_TIMEOUT = 100;
     protected static final int NUM_FRAMES_WAITED_FOR_UNKNOWN_LATENCY = 8;
+    protected static final int MIN_FRAME_DURATION_ERROR_MARGIN = 100; // ns
 
     protected Context mContext;
     protected CameraManager mCameraManager;
@@ -694,7 +695,7 @@
                 }
                 continue;
             }
-            if (minDuration <= frameDurationRange[0]) {
+            if (minDuration <= (frameDurationRange[0] + MIN_FRAME_DURATION_ERROR_MARGIN)) {
                 return size;
             }
         }