diff options
| author | Emilian Peev <epeev@google.com> | 2022-07-19 20:45:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-07-19 20:45:02 +0000 |
| commit | 3087e766b007fd85a1a3d643df8d49dc513ce854 (patch) | |
| tree | 6fb09e8bd0479ba147ce1e5054b72be827d33ce8 | |
| parent | 5828477f5e325e2f216de7ad5896bcb699801836 (diff) | |
| parent | e10861ffd94ca09816ffe94159a30b35e2601b61 (diff) | |
| download | cts-3087e766b007fd85a1a3d643df8d49dc513ce854.tar.gz | |
DO NOT MERGE Camera: Clamp slow motion video frame rates am: e10861ffd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/19295724
Change-Id: I88a222bf924bb303836ab02afea0d45ffee20e47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/camera/src/android/hardware/camera2/cts/RecordingTest.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tests/camera/src/android/hardware/camera2/cts/RecordingTest.java b/tests/camera/src/android/hardware/camera2/cts/RecordingTest.java index 3c88a3a445c..c9c28eac4bf 100644 --- a/tests/camera/src/android/hardware/camera2/cts/RecordingTest.java +++ b/tests/camera/src/android/hardware/camera2/cts/RecordingTest.java @@ -1234,8 +1234,13 @@ public class RecordingTest extends Camera2SurfaceViewTestCase { mOutMediaFileName = mDebugFileNameBase + "/test_cslowMo_video_" + captureRate + "fps_" + id + "_" + size.toString() + ".mp4"; - Log.v(TAG, "previewFrameRate:" + previewFrameRate); - prepareRecording(size, previewFrameRate, captureRate); + + // b/239101664 It appears that video frame rates higher than 30 fps may not + // trigger slow motion recording consistently. + int videoFrameRate = previewFrameRate > VIDEO_FRAME_RATE ? + VIDEO_FRAME_RATE : previewFrameRate; + Log.v(TAG, "videoFrameRate:" + videoFrameRate); + prepareRecording(size, videoFrameRate, captureRate); SystemClock.sleep(PREVIEW_DURATION_MS); @@ -1243,7 +1248,7 @@ public class RecordingTest extends Camera2SurfaceViewTestCase { SimpleCaptureCallback resultListener = new SimpleCaptureCallback(); // Start recording - startSlowMotionRecording(/*useMediaRecorder*/true, previewFrameRate, + startSlowMotionRecording(/*useMediaRecorder*/true, videoFrameRate, captureRate, fpsRange, resultListener, /*useHighSpeedSession*/true); @@ -1256,7 +1261,7 @@ public class RecordingTest extends Camera2SurfaceViewTestCase { startConstrainedPreview(fpsRange, previewResultListener); // Convert number of frames camera produced into the duration in unit of ms. - float frameDurationMs = 1000.0f / previewFrameRate; + float frameDurationMs = 1000.0f / videoFrameRate; float durationMs = resultListener.getTotalNumFrames() * frameDurationMs; // Validation. |