diff options
Diffstat (limited to 'tests/camera/src/android/hardware/camera2/cts/RecordingTest.java')
| -rw-r--r-- | tests/camera/src/android/hardware/camera2/cts/RecordingTest.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/camera/src/android/hardware/camera2/cts/RecordingTest.java b/tests/camera/src/android/hardware/camera2/cts/RecordingTest.java index df85f466b9e..49614f2260c 100644 --- a/tests/camera/src/android/hardware/camera2/cts/RecordingTest.java +++ b/tests/camera/src/android/hardware/camera2/cts/RecordingTest.java @@ -1218,6 +1218,10 @@ public class RecordingTest extends Camera2SurfaceViewTestCase { previewFrameRate = previewRateMap.get(captureRate); Log.v(TAG, "previewFrameRate: " + previewFrameRate + " captureRate: " + captureRate); + + Range<Integer> previewfpsRange = + new Range<Integer>(previewFrameRate, captureRate); + // Skip the test if the highest recording FPS supported by CamcorderProfile if (fpsRange.getUpper() > getFpsFromHighSpeedProfileForSize(size)) { Log.w(TAG, "high speed recording " + size + "@" + captureRate + "fps" @@ -1230,7 +1234,7 @@ public class RecordingTest extends Camera2SurfaceViewTestCase { // prepare preview surface by using video size. updatePreviewSurfaceWithVideo(size, captureRate); - startConstrainedPreview(fpsRange, previewResultListener); + startConstrainedPreview(previewfpsRange, previewResultListener); mOutMediaFileName = mDebugFileNameBase + "/test_cslowMo_video_" + captureRate + "fps_" + id + "_" + size.toString() + ".mp4"; @@ -1278,7 +1282,7 @@ public class RecordingTest extends Camera2SurfaceViewTestCase { // Stop recording and preview stopRecording(/*useMediaRecorder*/true); - startConstrainedPreview(fpsRange, previewResultListener); + startConstrainedPreview(previewfpsRange, previewResultListener); // Convert number of frames camera produced into the duration in unit of ms. float frameDurationMs = 1000.0f / videoFrameRate; |